subject:"commit dnsmasq for openSUSE\:Factory"

commit dnsmasq for openSUSE:Factory

2020-08-03 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2020-08-03 14:13:03

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.3592 (New)


Package is "dnsmasq"

Mon Aug  3 14:13:03 2020 rev:78 rq:823748 version:2.82

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2020-06-04 
17:49:32.483714030 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.3592/dnsmasq.changes
2020-08-03 14:13:49.360405026 +0200
@@ -1,0 +2,18 @@
+Tue Jul 28 08:00:51 UTC 2020 - Martin Rey 
+
+- Update to 2.82:
+  * Improve behaviour in the face of network interfaces which come
+and go and change index.
+  * Convert hard startup failure on NETLINK_NO_ENOBUFS under
+qemu-user to a warning.
+  * Allow IPv6 addresses ofthe form [:::1.2.3.4] in
+--dhcp-option.
+  * Fix crash under heavy TCP connection load introduced in 2.81.
+  * Change default lease time for DHCPv6 to one day.
+  * Alter calculation of preferred and valid times in router
+advertisements, so that these do not have a floor applied of
+the lease time in the dhcp-range if this is not explicitly
+specified and is merely the default.
+- Reformat spec file with spec-cleaner
+
+---

Old:

  dnsmasq-2.81.tar.xz
  dnsmasq-2.81.tar.xz.asc

New:

  dnsmasq-2.82.tar.xz
  dnsmasq-2.82.tar.xz.asc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.tuL7cC/_old  2020-08-03 14:13:50.924406594 +0200
+++ /var/tmp/diff_new_pack.tuL7cC/_new  2020-08-03 14:13:50.928406599 +0200
@@ -21,14 +21,12 @@
 %else
 %bcond_without tftp_user_package
 %endif
-
 Name:   dnsmasq
+Version:2.82
+Release:0
 Summary:DNS Forwarder and DHCP Server
 License:GPL-2.0-only OR GPL-3.0-only
 Group:  Productivity/Networking/DNS/Servers
-Version:2.81
-Release:0
-Provides:   dns_daemon
 URL:http://www.thekelleys.org.uk/dnsmasq/
 Source0:http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
 Source1:
http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
@@ -38,20 +36,20 @@
 Source5:rc.dnsmasq-suse
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
 BuildRequires:  libidn2-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  lua-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 BuildRequires:  pkgconfig(systemd)
 Requires(pre):  group(nogroup)
+Provides:   dns_daemon
 %if %{with tftp_user_package}
 Requires(pre):  user(tftp)
 %else
-Requires(pre):  /usr/sbin/useradd
+Requires(pre):  %{_sbindir}/useradd
 %endif
 
 %description
@@ -83,7 +81,7 @@
 dos2unix contrib/systemd/dbus_activation
 
 # SED-FIX-UPSTREAM -- Fix paths
-sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|;
+sed -i -e 's|\(PREFIX *= *\)%{_prefix}/local|\1/usr|;
   s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
Makefile
 
@@ -101,31 +99,31 @@
src/config.h
 
 # Fix trust-anchor.conf location and include /etc/dnsmasq.d/*.conf by default
-sed -i -e '/trust-anchors.conf/c\#conf-file=/etc/dnsmasq.d/trust-anchors.conf' 
\
+sed -i -e 
'/trust-anchors.conf/c\#conf-file=%{_sysconfdir}/dnsmasq.d/trust-anchors.conf' \
-e '/conf-dir=.*conf/s/^\#//' \
dnsmasq.conf.example
 
 %build
 mv po/no.po po/nb.po
-export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie"
+export CFLAGS="%{optflags} -std=gnu99 -fPIC -DPIC -fpie"
 export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 # the dnsmasq make system hashes the configuration flags, so we have to supply 
the
 # same flags for make and make install, else everything gets recompiled
 %define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC 
-DHAVE_LUASCRIPT"
-make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" 
COPTS=%{_copts}
+%make_build AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" 
COPTS=%{_copts}
 
 %pre
 %if %{without tftp_user_package}
-if ! /usr/bin/getent group tftp >/dev/null; then
+if ! %{_bindir}/getent group tftp >/dev/null; then
 %{_sbindir}/groupadd -r tftp
 fi
-if ! /usr/bin/getent passwd tftp >/dev/null; then
+if ! %{_bindir}/getent passwd tftp >/dev/null; then
 %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \
 -r -s /bin/false tftp
 fi
 %endif
-if ! /usr/bin/getent passwd dnsmasq >/dev/null; then
-/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "dnsmasq" -g 
nogroup -G tftp dnsmasq
+if !

commit dnsmasq for openSUSE:Factory

2020-06-04 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2020-06-04 17:49:02

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.3606 (New)


Package is "dnsmasq"

Thu Jun  4 17:49:02 2020 rev:77 rq:807964 version:2.81

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-12-07 
15:12:18.487822013 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.3606/dnsmasq.changes
2020-06-04 17:49:32.483714030 +0200
@@ -1,0 +2,41 @@
+Tue May  5 11:26:55 UTC 2020 - Paolo Stivanin 
+
+- Update to 2.81:
+  *Improve cache behaviour for TCP connections
+  *Remove the NO_FORK compile-time option, and support for uclinux
+  *Fix line-counting when reading /etc/hosts and friends
+  *Fix bug in DNS non-terminal code, added in 2.80, which could
+   sometimes cause a NODATA rather than an NXDOMAIN reply.
+  *Support TCP-fastopen (RFC-7413) on both incoming and
+   outgoing TCP connections, if supported and enabled in the OS.
+  *Improve kernel-capability manipulation code under Linux
+  *Add --shared-network config. This enables allocation of addresses
+   by the DHCP server in subnets where the server (or relay) does not
+   have an interface on the network in that subnet. Many thanks to
+   kamp.de for sponsoring this feature.
+  *Fix broken contrib/lease_tools/dhcp_lease_time.c. A packet
+   validation check got borked in commit 2b38e382 and release 2.80.
+   Thanks to Tomasz Szajner for spotting this.
+  *Fix compilation against nettle version 3.5 and later.
+  *Fix spurious DNSSEC validation failures when the auth section
+   of a reply contains unsigned RRs from a signed zone,
+   with the exception that NSEC and NSEC3 RRs must always be signed.
+Thanks to Tore Anderson for spotting and diagnosing the bug.
+  *Add --dhcp-ignore-clid. This disables reading of DHCP client
+   identifier option (option 61), so clients are only identified by
+   MAC addresses.
+  *Fix a bug which stopped --dhcp-name-match from working when a hostname
+   is supplied in --dhcp-host. Thanks to James Feeney for spotting this.
+  *Fix bug which caused very rarely caused zero-length DHCPv6 packets.
+   Thanks to Dereck Higgins for spotting this.
+  *Add --tftp-single-port option.
+  *Enhance --conf-dir to load files in a deterministic order
+  * Add filtering by tag of --dhcp-host directives
+  * Remove DSA signature verification from DNSSEC, as specified in
+   RFC 8624
+  *Add --script-on-renewal option.
+- Remove Fix-build-with-libnettle-3.5.patch
+- Remove 0001-fix-build-after-y2038-changes-in-glibc.patch
+- Remove dnsmasq-CVE-2019-14834.patch
+
+---

Old:

  0001-fix-build-after-y2038-changes-in-glibc.patch
  Fix-build-with-libnettle-3.5.patch
  dnsmasq-2.80.tar.xz
  dnsmasq-2.80.tar.xz.asc
  dnsmasq-CVE-2019-14834.patch

New:

  dnsmasq-2.81.tar.xz
  dnsmasq-2.81.tar.xz.asc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.qTRUat/_old  2020-06-04 17:49:34.775720720 +0200
+++ /var/tmp/diff_new_pack.qTRUat/_new  2020-06-04 17:49:34.779720733 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 Summary:DNS Forwarder and DHCP Server
 License:GPL-2.0-only OR GPL-3.0-only
 Group:  Productivity/Networking/DNS/Servers
-Version:2.80
+Version:2.81
 Release:0
 Provides:   dns_daemon
 URL:http://www.thekelleys.org.uk/dnsmasq/
@@ -38,10 +38,6 @@
 Source5:rc.dnsmasq-suse
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
-Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
-# PATCH-FIX-UPSTREAM -- 
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e
-Patch2: Fix-build-with-libnettle-3.5.patch
-Patch3: dnsmasq-CVE-2019-14834.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -78,9 +74,6 @@
 %prep
 %setup -q
 %patch0
-%patch1 -p1
-%patch2 -p1
-%patch3
 
 # Remove the executable bit from python example files to
 # avoid unwanted automatic dependencies

++ dnsmasq-2.80.tar.xz -> dnsmasq-2.81.tar.xz ++
 41082 lines of diff (skipped)

commit dnsmasq for openSUSE:Factory

2019-12-07 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-12-07 15:11:48

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.4691 (New)


Package is "dnsmasq"

Sat Dec  7 15:11:48 2019 rev:76 rq:752812 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-11-20 
13:43:05.640277891 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.4691/dnsmasq.changes
2019-12-07 15:12:18.487822013 +0100
@@ -1,0 +2,5 @@
+Sat Nov 30 12:15:42 UTC 2019 - Dominique Leuenberger 
+
+- Remove redundant %else without meaning (if/else/else/endif?)
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.YDSGmu/_old  2019-12-07 15:12:20.767821691 +0100
+++ /var/tmp/diff_new_pack.YDSGmu/_new  2019-12-07 15:12:20.767821691 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 Version:2.80
 Release:0
 Provides:   dns_daemon
-Url:http://www.thekelleys.org.uk/dnsmasq/
+URL:http://www.thekelleys.org.uk/dnsmasq/
 Source0:http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
 Source1:
http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
 Source2:%{name}.keyring
@@ -56,7 +56,6 @@
 Requires(pre):  user(tftp)
 %else
 Requires(pre):  /usr/sbin/useradd
-%else
 %endif
 
 %description

commit dnsmasq for openSUSE:Factory

2019-11-20 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-11-20 13:42:47

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.26869 (New)


Package is "dnsmasq"

Wed Nov 20 13:42:47 2019 rev:75 rq:748378 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-09-11 
10:21:34.503501965 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.26869/dnsmasq.changes   
2019-11-20 13:43:05.640277891 +0100
@@ -1,0 +2,9 @@
+Wed Nov 13 10:46:21 UTC 2019 - Reinhard Max 
+
+- bsc#1154849, CVE-2019-14834, dnsmasq-CVE-2019-14834.patch:
+  memory leak in the create_helper() function in /src/helper.c
+- bsc#1143454: Require user(tftp) instead of creating it ourselves.
+- Package contrib/lease-tools/dhcp_release6.
+- bsc#1152539: include config files from /etc/dnsmasq.d/*.conf .
+
+---

New:

  dnsmasq-CVE-2019-14834.patch



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.iWa64P/_old  2019-11-20 13:43:14.096275307 +0100
+++ /var/tmp/diff_new_pack.iWa64P/_new  2019-11-20 13:43:14.100275307 +0100
@@ -16,6 +16,12 @@
 #
 
 
+%if 0%{?suse_version} < 1550
+%bcond_with tftp_user_package
+%else
+%bcond_without tftp_user_package
+%endif
+
 Name:   dnsmasq
 Summary:DNS Forwarder and DHCP Server
 License:GPL-2.0-only OR GPL-3.0-only
@@ -35,6 +41,7 @@
 Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
 # PATCH-FIX-UPSTREAM -- 
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e
 Patch2: Fix-build-with-libnettle-3.5.patch
+Patch3: dnsmasq-CVE-2019-14834.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -45,7 +52,12 @@
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 BuildRequires:  pkgconfig(systemd)
 Requires(pre):  group(nogroup)
+%if %{with tftp_user_package}
+Requires(pre):  user(tftp)
+%else
 Requires(pre):  /usr/sbin/useradd
+%else
+%endif
 
 %description
 Dnsmasq provides network infrastructure for small networks: DNS,
@@ -69,6 +81,7 @@
 %patch0
 %patch1 -p1
 %patch2 -p1
+%patch3
 
 # Remove the executable bit from python example files to
 # avoid unwanted automatic dependencies
@@ -86,7 +99,7 @@
 sed -i -e 's|lua5.2|lua5.3|' Makefile
 
 # SED-FIX-UPSTREAM -- Fix man page
-sed -i -e 's|The defaults to "dip",|The default is "nogroup",|' \
+sed -i -e 's|The default is "dip",|The default is "nogroup",|' \
man/dnsmasq.8
 
 # SED-FIX-UPSTREAM -- Fix cachesize, group and user
@@ -95,8 +108,9 @@
   s|CHGRP "dip"|CHGRP "nogroup"|' \
src/config.h
 
-# Fix trust-anchor.conf location
+# Fix trust-anchor.conf location and include /etc/dnsmasq.d/*.conf by default
 sed -i -e '/trust-anchors.conf/c\#conf-file=/etc/dnsmasq.d/trust-anchors.conf' 
\
+   -e '/conf-dir=.*conf/s/^\#//' \
dnsmasq.conf.example
 
 %build
@@ -107,9 +121,9 @@
 # same flags for make and make install, else everything gets recompiled
 %define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC 
-DHAVE_LUASCRIPT"
 make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" 
COPTS=%{_copts}
-make -C contrib/lease-tools %{?_smp_mflags}
 
 %pre
+%if %{without tftp_user_package}
 if ! /usr/bin/getent group tftp >/dev/null; then
 %{_sbindir}/groupadd -r tftp
 fi
@@ -117,6 +131,7 @@
 %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \
 -r -s /bin/false tftp
 fi
+%endif
 if ! /usr/bin/getent passwd dnsmasq >/dev/null; then
 /usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "dnsmasq" -g 
nogroup -G tftp dnsmasq
 fi
@@ -149,18 +164,23 @@
 install -d 755 %{buildroot}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf %{buildroot}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
+%if %{without tftp_user_package}
 install -d -m 0755 %{buildroot}/srv/tftpboot
+%endif
 ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcdnsmasq
 install -d -m 755 %{buildroot}/%{_sysconfdir}/dnsmasq.d
 install -m 644 trust-anchors.conf 
%{buildroot}/%{_sysconfdir}/dnsmasq.d/trust-anchors.conf
 
 # utils subpackage
 mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_mandir}/man1
+make -C contrib/lease-tools %{?_smp_mflags}
 install -m 755 contrib/lease-tools/dhcp_release 
%{buildroot}/%{_bindir}/dhcp_release
 install -m 644 contrib/lease-tools/dhcp_release.1 
%{buildroot}/%{_mandir}/man1/dhcp_release.1
+install -m 755 contrib/lease-tools/dhcp_release6 
%{buildroot}/%{_bindir}/dhcp_release6
+install -m 644

commit dnsmasq for openSUSE:Factory

2019-09-11 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-09-11 10:21:32

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.7948 (New)


Package is "dnsmasq"

Wed Sep 11 10:21:32 2019 rev:74 rq:728482 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-07-31 
14:14:18.750867508 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.7948/dnsmasq.changes
2019-09-11 10:21:34.503501965 +0200
@@ -1,0 +2,5 @@
+Wed Sep  4 18:47:39 UTC 2019 - Stefan Brüns 
+
+- Add Fix-build-with-libnettle-3.5.patch
+
+---

New:

  Fix-build-with-libnettle-3.5.patch



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.9PmgzH/_old  2019-09-11 10:21:35.567501833 +0200
+++ /var/tmp/diff_new_pack.9PmgzH/_new  2019-09-11 10:21:35.567501833 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,7 +23,6 @@
 Version:2.80
 Release:0
 Provides:   dns_daemon
-PreReq: /usr/sbin/useradd /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
 Source0:http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
 Source1:
http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
@@ -34,6 +33,8 @@
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
 Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
+# PATCH-FIX-UPSTREAM -- 
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e
+Patch2: Fix-build-with-libnettle-3.5.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -42,11 +43,9 @@
 BuildRequires:  lua-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
-Requires(pre):  group(nogroup)
-%if 0%{?suse_version} >= 1210
 BuildRequires:  pkgconfig(systemd)
-%endif
 Requires(pre):  group(nogroup)
+Requires(pre):  /usr/sbin/useradd
 
 %description
 Dnsmasq provides network infrastructure for small networks: DNS,
@@ -69,6 +68,7 @@
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
 
 # Remove the executable bit from python example files to
 # avoid unwanted automatic dependencies
@@ -82,7 +82,7 @@
   s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
Makefile
 
-# use lua5.3 instead of lua5.3
+# use lua5.3 instead of lua5.2
 sed -i -e 's|lua5.2|lua5.3|' Makefile
 
 # SED-FIX-UPSTREAM -- Fix man page
@@ -170,7 +170,6 @@
 %find_lang %{name} --with-man
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %license COPYING COPYING-v3
 %doc CHANGELOG FAQ doc.html setup.html dnsmasq.conf.example contrib dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
@@ -187,7 +186,6 @@
 %dir %attr(0755,tftp,tftp) /srv/tftpboot
 
 %files utils
-%defattr(-,root,root,-)
 %{_bindir}/dhcp_*
 %{_mandir}/man1/dhcp_*
 

++ Fix-build-with-libnettle-3.5.patch ++
From: Vladislav Grishenko 
Date: Wed, 26 Jun 2019 15:27:11 + (+0500)
Subject: Fix build with libnettle 3.5
X-Git-Url: 
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5

Fix build with libnettle 3.5
---

diff --git a/src/crypto.c b/src/crypto.c
index ebb871e..fecc64a 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata 
*key_data, unsigned int key_len
   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
   static mpz_t x, y;
   static struct dsa_signature *sig_struct;
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
+#define nettle_get_secp_256r1() (_secp_256r1)
+#define nettle_get_secp_384r1() (_secp_384r1)
+#endif
   
   if (!sig_struct)
 {
@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, 
unsigned int key_len
  if (!(key_256 = whine_malloc(sizeof(struct ecc_point
return 0;
  
- nettle_ecc_point_init(key_256, _secp_256r1);
+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
}
   
   key = key_256;
@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, 
unsigned int key_len
  if (!(key_384 = whine_malloc(sizeof(struct ecc_point
return 0;
  
- nettle_ecc_point_init(key_384, _secp_384r1);
+

commit dnsmasq for openSUSE:Factory

2019-07-31 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-07-31 14:14:17

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.4126 (New)


Package is "dnsmasq"

Wed Jul 31 14:14:17 2019 rev:73 rq:718597 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-07-22 
12:17:33.795708995 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.4126/dnsmasq.changes
2019-07-31 14:14:18.750867508 +0200
@@ -1,0 +2,8 @@
+Tue Jul 23 13:52:05 UTC 2019 - matthias.gerst...@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
+---

Old:

  SuSEFirewall.dnsmasq-dhcp
  SuSEFirewall.dnsmasq-dns



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.JnqK6x/_old  2019-07-31 14:14:19.326867080 +0200
+++ /var/tmp/diff_new_pack.JnqK6x/_new  2019-07-31 14:14:19.326867080 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -31,8 +31,6 @@
 Source3:dnsmasq.reg
 Source4:dnsmasq.service
 Source5:rc.dnsmasq-suse
-Source6:SuSEFirewall.dnsmasq-dhcp
-Source7:SuSEFirewall.dnsmasq-dns
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
 Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
@@ -146,11 +144,8 @@
 %install
 make install-i18n DESTDIR=%{buildroot} PREFIX=/usr AWK=gawk COPTS=%{_copts}
 install -d -m 755 %{buildroot}/%{_sysconfdir}/slp.reg.d
-install -d -m 755 
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install -m 644 dnsmasq.conf.example %{buildroot}/%{_sysconfdir}/dnsmasq.conf
 install -m 644 %SOURCE3 %{buildroot}/%{_sysconfdir}/slp.reg.d/
-install -m 644 %SOURCE7 
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-install -m 644 %SOURCE6 
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 %{buildroot}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf %{buildroot}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
@@ -181,8 +176,6 @@
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
 %{_sbindir}/rcdnsmasq
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 %dir %{_sysconfdir}/slp.reg.d/
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz

commit dnsmasq for openSUSE:Factory

2019-07-22 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-07-22 12:17:32

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.4126 (New)


Package is "dnsmasq"

Mon Jul 22 12:17:32 2019 rev:72 rq:714386 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-06-26 
16:00:09.639313285 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.4126/dnsmasq.changes
2019-07-22 12:17:33.795708995 +0200
@@ -1,0 +2,5 @@
+Wed Jul 10 06:28:36 UTC 2019 - Jiri Slaby 
+
+- add 0001-fix-build-after-y2038-changes-in-glibc.patch
+
+---

New:

  0001-fix-build-after-y2038-changes-in-glibc.patch



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.CJGes7/_old  2019-07-22 12:17:34.527708796 +0200
+++ /var/tmp/diff_new_pack.CJGes7/_new  2019-07-22 12:17:34.531708795 +0200
@@ -35,6 +35,7 @@
 Source7:SuSEFirewall.dnsmasq-dns
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
+Patch1: 0001-fix-build-after-y2038-changes-in-glibc.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -69,6 +70,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 
 # Remove the executable bit from python example files to
 # avoid unwanted automatic dependencies

++ 0001-fix-build-after-y2038-changes-in-glibc.patch ++
From: Jiri Slaby 
Date: Wed, 10 Jul 2019 08:19:06 +0200
Subject: fix build after y2038 changes in glibc
Patch-mainline: submitted on 2019/07/10

SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now.

Signed-off-by: Jiri Slaby 
---
 src/dnsmasq.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index ff3204a..3ef04ad 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -137,6 +137,7 @@ typedef unsigned long long u64;
 #endif
 
 #if defined(HAVE_LINUX_NETWORK)
+#include 
 #include 
 /* There doesn't seem to be a universally-available 
userspace header for these. */
-- 
2.21.0

commit dnsmasq for openSUSE:Factory

2019-06-26 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-06-26 16:00:08

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.4615 (New)


Package is "dnsmasq"

Wed Jun 26 16:00:08 2019 rev:71 rq:709322 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-02-28 
21:24:23.841913158 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.4615/dnsmasq.changes
2019-06-26 16:00:09.639313285 +0200
@@ -1,0 +2,6 @@
+Tue Jun 11 12:31:25 UTC 2019 - Dominique Leuenberger 
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+  shortcut the build queues by allowing usage of systemd-mini
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.Gx0zCF/_old  2019-06-26 16:00:10.671314617 +0200
+++ /var/tmp/diff_new_pack.Gx0zCF/_new  2019-06-26 16:00:10.675314622 +0200
@@ -45,7 +45,7 @@
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 Requires(pre):  group(nogroup)
 %if 0%{?suse_version} >= 1210
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 %endif
 Requires(pre):  group(nogroup)

commit dnsmasq for openSUSE:Factory

2019-02-28 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-02-28 21:24:22

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.28833 (New)


Package is "dnsmasq"

Thu Feb 28 21:24:22 2019 rev:70 rq:678217 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2019-01-26 
22:21:24.878904281 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.28833/dnsmasq.changes   
2019-02-28 21:24:23.841913158 +0100
@@ -1,0 +2,12 @@
+Fri Feb 22 07:10:51 UTC 2019 - Franck Bui 
+
+- Drop use of $FIRST_ARG in .spec
+
+  The use of $FIRST_ARG was probably required because of the
+  %service_* rpm macros were playing tricks with the shell positional
+  parameters. This is bad practice and error prones so let's assume
+  that no macros should do that anymore and hence it's safe to assume
+  that positional parameters remains unchanged after any rpm macro
+  call.
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.AXYc3u/_old  2019-02-28 21:24:24.729912861 +0100
+++ /var/tmp/diff_new_pack.AXYc3u/_new  2019-02-28 21:24:24.733912860 +0100
@@ -136,7 +136,7 @@
 %postun
 %service_del_postun %{name}.service
 # reload dbus after uninstall, our policies are gone again
-if [ ${FIRST_ARG:-$1} -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \
+if [ $1 -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \
  -a -x /usr/bin/systemctl ]; then
 /usr/bin/systemctl reload dbus.service 2>/dev/null || :
 fi

commit dnsmasq for openSUSE:Factory

2019-01-26 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2019-01-26 22:21:24

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new.28833 (New)


Package is "dnsmasq"

Sat Jan 26 22:21:24 2019 rev:69 rq:668717 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2018-11-06 
13:52:40.204392921 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new.28833/dnsmasq.changes   
2019-01-26 22:21:24.878904281 +0100
@@ -1,0 +2,5 @@
+Wed Jan 23 23:03:22 UTC 2019 - Cristian Rodríguez 
+
+- libidn should not be used anymore, switch to libidn2
+
+---
@@ -23 +28 @@
-- enabled lua scripting interface 
+- enabled lua scripting interface (FATE#327143).



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.N77xXD/_old  2019-01-26 22:21:25.610903688 +0100
+++ /var/tmp/diff_new_pack.N77xXD/_new  2019-01-26 22:21:25.610903688 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
-BuildRequires:  libidn-devel
+BuildRequires:  libidn2-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  lua-devel
 BuildRequires:  pkg-config
@@ -105,7 +105,7 @@
 export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 # the dnsmasq make system hashes the configuration flags, so we have to supply 
the
 # same flags for make and make install, else everything gets recompiled
-%define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC 
-DHAVE_LUASCRIPT"
+%define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC 
-DHAVE_LUASCRIPT"
 make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" 
COPTS=%{_copts}
 make -C contrib/lease-tools %{?_smp_mflags}

commit dnsmasq for openSUSE:Factory

2018-11-06 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2018-11-06 13:52:36

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Tue Nov  6 13:52:36 2018 rev:68 rq:643674 version:2.80

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2018-09-04 
22:47:02.343121652 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2018-11-06 
13:52:40.204392921 +0100
@@ -1,0 +2,24 @@
+Mon Oct 22 08:29:46 UTC 2018 - Jan Engelhardt 
+
+- Ensure neutrality of descriptions. / Replace description with
+  new upstream description.
+- Do not hide failures from user/group additions.
+- Replace old $RPM_* shell vars by macros.
+
+---
+Sun Oct 21 22:17:10 UTC 2018 - s...@suspend.net
+
+- Updated to dnsmasq 2.80
+  * Add support for RFC 4039 DHCP rapid commit
+  * Alter the default for dnssec-check-unsigned
+  * Fix DHCP when --no-ping and --dhcp-sequential-ip are set
+  * Allow zone transfer in authoritative mode if auth-peer is specified
+  * FIx missing fatal errors with some malformed options
+  * Fix crash on startup with a --synth-domain which has no prefix
+
+---
+Fri Oct 19 15:01:00 UTC 2018 - cg...@suse.com
+
+- enabled lua scripting interface 
+
+---

Old:

  dnsmasq-2.78.tar.xz
  dnsmasq-2.78.tar.xz.asc

New:

  dnsmasq-2.80.tar.xz
  dnsmasq-2.80.tar.xz.asc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.5Lvfme/_old  2018-11-06 13:52:40.788392127 +0100
+++ /var/tmp/diff_new_pack.5Lvfme/_new  2018-11-06 13:52:40.792392121 +0100
@@ -12,15 +12,15 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   dnsmasq
-Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
+Summary:DNS Forwarder and DHCP Server
 License:GPL-2.0-only OR GPL-3.0-only
 Group:  Productivity/Networking/DNS/Servers
-Version:2.78
+Version:2.80
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd /bin/mkdir
@@ -40,22 +40,23 @@
 BuildRequires:  dos2unix
 BuildRequires:  libidn-devel
 BuildRequires:  libnettle-devel
+BuildRequires:  lua-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 Requires(pre):  group(nogroup)
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
+Requires(pre):  group(nogroup)
 
 %description
-Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
-server. It is designed to provide DNS and, optionally, DHCP, to a small
-network. It can serve the names of local machines that are not in the
-global DNS. The DHCP server integrates with the DNS server and allows
-machines with DHCP-allocated addresses to appear in DNS with names
-configured either in each host or in a central configuration file.
-Dnsmasq supports static and dynamic DHCP leases and BOOTP for network
-booting of diskless machines.
+Dnsmasq provides network infrastructure for small networks: DNS,
+DHCP, router advertisement and network boot.
+
+The DNS subsystem supprots forwarding of all query types, and caching
+of common record types, DNSSEC included. The DHCP subsystem supports
+DHCPv4, DHCPv6, BOOTP and PXE. RA can be used stand-alone or in
+conjunction with DHCPv6.
 
 %package utils
 Summary:Utilities for manipulating DHCP server leases
@@ -71,7 +72,7 @@
 
 # Remove the executable bit from python example files to
 # avoid unwanted automatic dependencies
-find contrib -name *.py -exec chmod a-x '{}' \;
+find contrib -name *.py -exec chmod a-x '{}' +
 
 # Some docs have the DOS line ends
 dos2unix contrib/systemd/dbus_activation
@@ -81,6 +82,9 @@
   s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
Makefile
 
+# use lua5.3 instead of lua5.3
+sed -i -e 's|lua5.2|lua5.3|' Makefile
+
 # SED-FIX-UPSTREAM -- Fix man page
 sed -i -e 's|The defaults to "dip",|The default is "nogroup",|' \
man/dnsmasq.8
@@ -101,20 +105,20 @@
 export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 # the dnsmasq make system hashes the configuration flags, so we have to supply 
the
 # same flags for make and make install, else everything gets recompiled
-%define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC"
+%define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC

commit dnsmasq for openSUSE:Factory

2018-09-04 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2018-09-04 22:47:01

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Tue Sep  4 22:47:01 2018 rev:67 rq:632188 version:2.78

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2018-07-25 
16:05:29.573014352 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2018-09-04 
22:47:02.343121652 +0200
@@ -1,0 +2,5 @@
+Wed Aug 29 16:22:13 UTC 2018 - dmuel...@suse.com
+
+- add missing prereq on the group to be created (bsc#1106446)
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.v4D52Y/_old  2018-09-04 22:47:02.991123884 +0200
+++ /var/tmp/diff_new_pack.v4D52Y/_new  2018-09-04 22:47:02.995123897 +0200
@@ -42,6 +42,7 @@
 BuildRequires:  libnettle-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
+Requires(pre):  group(nogroup)
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif

commit dnsmasq for openSUSE:Factory

2018-07-25 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2018-07-25 16:05:09

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Wed Jul 25 16:05:09 2018 rev:66 rq:623240 version:2.78

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2017-12-08 
21:47:42.798230005 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2018-07-25 
16:05:29.573014352 +0200
@@ -1,0 +2,8 @@
+Mon Jul 16 10:15:54 CEST 2018 - ku...@suse.de
+
+- Don't require systemd explicit, fix spec file to handle both
+  cases correct. In containers we don't have systemd.
+- Adjust pre/post install for transactional updates.
+- Use %license instead of %doc [bsc#1082318]
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.pwV6Vi/_old  2018-07-25 16:05:30.037015284 +0200
+++ /var/tmp/diff_new_pack.pwV6Vi/_new  2018-07-25 16:05:30.037015284 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:   dnsmasq
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
-License:GPL-2.0 or GPL-3.0
+License:GPL-2.0-only OR GPL-3.0-only
 Group:  Productivity/Networking/DNS/Servers
 Version:2.78
 Release:0
@@ -45,7 +45,6 @@
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
-%{?systemd_requires}
 
 %description
 Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
@@ -122,7 +121,9 @@
 %post
 %service_add_post %{name}.service
 # reload dbus after install or upgrade to apply new policies
-/usr/bin/systemctl reload dbus.service 2>/dev/null || :
+if [ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemctl ]; then
+/usr/bin/systemctl reload dbus.service 2>/dev/null || :
+fi
 
 %preun
 %service_del_preun %{name}.service
@@ -130,7 +131,8 @@
 %postun
 %service_del_postun %{name}.service
 # reload dbus after uninstall, our policies are gone again
-if [ ${FIRST_ARG:-$1} -eq 0 ]; then
+if [ ${FIRST_ARG:-$1} -eq 0 -a -z "${TRANSACTIONAL_UPDATE}" \
+ -a -x /usr/bin/systemctl ]; then
 /usr/bin/systemctl reload dbus.service 2>/dev/null || :
 fi
 
@@ -167,7 +169,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dnsmasq.conf.example 
contrib dbus
+%license COPYING COPYING-v3
+%doc CHANGELOG FAQ doc.html setup.html dnsmasq.conf.example contrib dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
 %{_sbindir}/rcdnsmasq

commit dnsmasq for openSUSE:Factory

2017-12-08 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2017-12-08 21:47:30

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Fri Dec  8 21:47:30 2017 rev:65 rq:548087 version:2.78

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2017-10-05 
11:53:23.494132963 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2017-12-08 
21:47:42.798230005 +0100
@@ -1,0 +2,27 @@
+Mon Dec  4 13:39:32 UTC 2017 - idon...@suse.com
+
+- Update keyring 
+
+---
+Fri Dec  1 14:50:09 UTC 2017 - cbosdon...@suse.com
+
+- Get rid of python dependency due to examples. (fate#323526)
+
+---
+Mon Oct  2 14:09:59 UTC 2017 - m...@suse.com
+
+- Security update to version 2.78:
+  * bsc#1060354, CVE-2017-14491: 2 byte heap based overflow.
+  * bsc#1060355, CVE-2017-14492: heap based overflow.
+  * bsc#1060360, CVE-2017-14493: stack based overflow.
+  * bsc#1060361, CVE-2017-14494: DHCP - info leak.
+  * bsc#1060362, CVE-2017-14495: DNS - OOM DoS.
+  * bsc#1060364, CVE-2017-14496: DNS - DoS Integer underflow.
+  * Fix DHCP relaying, broken in 2.76 and 2.77.
+  * For other changes, see
+http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
+- Obsoleted patches:
+  * Fix-crash-introduced-in-2675f2061525bc954be14988d643.patch
+  * Handle-binding-upstream-servers-to-an-interface.patch
+
+---

Old:

  Fix-crash-introduced-in-2675f2061525bc954be14988d643.patch
  Handle-binding-upstream-servers-to-an-interface.patch
  dnsmasq-2.76.tar.xz
  dnsmasq-2.76.tar.xz.asc

New:

  dnsmasq-2.78.tar.xz
  dnsmasq-2.78.tar.xz.asc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.za5t5o/_old  2017-12-08 21:47:43.626194389 +0100
+++ /var/tmp/diff_new_pack.za5t5o/_new  2017-12-08 21:47:43.630194217 +0100
@@ -20,7 +20,7 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0 or GPL-3.0
 Group:  Productivity/Networking/DNS/Servers
-Version:2.76
+Version:2.78
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd /bin/mkdir
@@ -35,8 +35,6 @@
 Source7:SuSEFirewall.dnsmasq-dns
 Source8:%{name}-rpmlintrc
 Patch0: dnsmasq-groups.patch
-Patch10:Handle-binding-upstream-servers-to-an-interface.patch
-Patch11:Fix-crash-introduced-in-2675f2061525bc954be14988d643.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -70,8 +68,10 @@
 %prep
 %setup -q
 %patch0
-%patch10 -p1
-%patch11 -p1
+
+# Remove the executable bit from python example files to
+# avoid unwanted automatic dependencies
+find contrib -name *.py -exec chmod a-x '{}' \;
 
 # Some docs have the DOS line ends
 dos2unix contrib/systemd/dbus_activation

++ dnsmasq-2.76.tar.xz -> dnsmasq-2.78.tar.xz ++
 35240 lines of diff (skipped)

++ dnsmasq-groups.patch ++
--- /var/tmp/diff_new_pack.za5t5o/_old  2017-12-08 21:47:43.938180969 +0100
+++ /var/tmp/diff_new_pack.za5t5o/_new  2017-12-08 21:47:43.942180796 +0100
@@ -1,13 +1,13 @@
 --- src/dnsmasq.c.orig
 +++ src/dnsmasq.c
-@@ -557,11 +557,10 @@ int main (int argc, char **argv)
+@@ -581,11 +581,10 @@ int main (int argc, char **argv)
if (!option_bool(OPT_DEBUG) && getuid() == 0)   
  {
int bad_capabilities = 0;
 -  gid_t dummy;

--  /* remove all supplimentary groups */
-+  /* set the supplimentary groups of the daemon user */
+-  /* remove all supplementary groups */
++  /* set the supplementary groups of the daemon user */
if (gp && 
 -(setgroups(0, ) == -1 ||
 +(initgroups(daemon->username, gp->gr_gid) == -1 ||

++ dnsmasq.keyring ++
--- /var/tmp/diff_new_pack.za5t5o/_old  2017-12-08 21:47:43.970179592 +0100
+++ /var/tmp/diff_new_pack.za5t5o/_new  2017-12-08 21:47:43.970179592 +0100
@@ -1,33 +1,116 @@
 -BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v2
 
-mQGiBEdAp6gRBACnOax2ntWEcx7Fw4OMXOJrGmfFcHUVkoe+hpRaFlfENvhffPdM
-8qELIlc6xvQRUfnHViIYYTYNbKd4+8QRQMP9lZwKP0ckDA7/2WW7oig/6MNGGYu+
-VmngF+l0KU5gyib8NYeyiBjdJOcBrx3+q9S0U+BhyxmrvHgxJub4n/sJiwCgq/oH
-n2b7cKdqzuK1+B5TaRKExk8D/RoZYGRDvSJpMzJyyED77CAH946I+oVbNLyYMMy/
-LxaA/x0nBQ9Mu0bAVvUHF+lG++kKNAd7vcveGPKCoXVuPOx/LtdOgMma/ipEGHWt
-mzgHRoNIYweffwMhEP929woWJ2KXrH0P0imel7aOLHYl7w6hybdaQ9tBExMlMj6r
-1+4DA/9LduhBW1MWxttDUhex0iXQPx6vFwqai+yjtueyhC3Y5ZGe8JBdWLXzoD3v

commit dnsmasq for openSUSE:Factory

2017-10-05 Thread root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2017-10-05 11:53:17

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Thu Oct  5 11:53:17 2017 rev:64 rq:525886 version:2.76

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2017-01-11 
12:01:13.419249623 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2017-10-05 
11:53:23.494132963 +0200
@@ -1,0 +2,10 @@
+Tue Sep 12 08:29:59 UTC 2017 - tchva...@suse.com
+
+- Fix /srv/tftpboot permissions wrt bsc#940608
+
+---
+Fri Aug 18 11:16:03 UTC 2017 - dmuel...@suse.com
+
+- reload system dbus to pick up policy change on install (bsc#1054429)
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.wsgYnp/_old  2017-10-05 11:53:24.889936565 +0200
+++ /var/tmp/diff_new_pack.wsgYnp/_new  2017-10-05 11:53:24.893936003 +0200
@@ -121,12 +121,18 @@
 
 %post
 %service_add_post %{name}.service
+# reload dbus after install or upgrade to apply new policies
+/usr/bin/systemctl reload dbus.service 2>/dev/null || :
 
 %preun
 %service_del_preun %{name}.service
 
 %postun
 %service_del_postun %{name}.service
+# reload dbus after uninstall, our policies are gone again
+if [ ${FIRST_ARG:-$1} -eq 0 ]; then
+/usr/bin/systemctl reload dbus.service 2>/dev/null || :
+fi
 
 %install
 make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk COPTS=%{_copts}
@@ -139,7 +145,7 @@
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
-install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
+install -d -m 0755 ${RPM_BUILD_ROOT}/srv/tftpboot
 ln -sf %{_sbindir}/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d
 install -m 644 trust-anchors.conf 
${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d/trust-anchors.conf
@@ -175,7 +181,7 @@
 %dir %{_sysconfdir}/dnsmasq.d
 %config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf
 
-%dir %attr(0750,tftp,tftp) /srv/tftpboot
+%dir %attr(0755,tftp,tftp) /srv/tftpboot
 
 %files utils
 %defattr(-,root,root,-)

commit dnsmasq for openSUSE:Factory

2016-08-06 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2016-08-06 20:35:45

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2016-06-29 
15:04:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2016-08-06 
20:35:47.0 +0200
@@ -1,0 +2,36 @@
+Wed Aug  3 13:46:06 UTC 2016 - m...@suse.com
+
+- Update to 2.76:
+
+  * Include 0.0.0.0/8 in DNS rebind checks.
+  * Enhance --add-subnet to allow arbitrary subnet addresses.
+  * Respect the --no-resolv flag in inotify code. Fixes bug
+which caused dnsmasq to fail to start if a resolv-file
+was a dangling symbolic link, even of --no-resolv set.
+  * Fix crash when an A or  record is defined locally,
+in a hosts file, and an upstream server sends a reply
+that the same name is empty (CVE-2015-8899, bsc#983273).
+  * Fix failure to correctly calculate cache-size when reading a
+hosts-file fails.
+  * Fix wrong answer to simple name query when --domain-needed
+set, but no upstream servers configured.
+  * Return REFUSED when running out of forwarding table slots,
+not SERVFAIL.
+  * Add --max-port configuration.
+  * Add --script-arp and two new functions for the dhcp-script.
+  * Extend --add-mac to allow a new encoding of the MAC address
+as base64, by configurting --add-mac=base64
+  * Add --add-cpe-id option.
+
+  * Don't crash with divide-by-zero if an IPv6 dhcp-range is
+declared as a whole /64.
+(ie xx::0 to xx:::::)
+  * Add support for a TTL parameter in --host-record and --cname.
+  * Add --dhcp-ttl option.
+  * Add --tftp-mtu option.
+  * Check return-code of inet_pton() when parsing dhcp-option.
+  * Fix wrong value for EDNS UDP packet size when using
+--servers-file to define upstream DNS servers.
+  * Add dhcp_release6 to contrib/lease-tools.
+
+---

Old:

  dnsmasq-2.75.tar.xz
  dnsmasq-2.75.tar.xz.asc

New:

  dnsmasq-2.76.tar.xz
  dnsmasq-2.76.tar.xz.asc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.pzHhe9/_old  2016-08-06 20:35:48.0 +0200
+++ /var/tmp/diff_new_pack.pzHhe9/_new  2016-08-06 20:35:48.0 +0200
@@ -20,7 +20,7 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0 or GPL-3.0
 Group:  Productivity/Networking/DNS/Servers
-Version:2.75
+Version:2.76
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd /bin/mkdir
@@ -99,7 +99,7 @@
 # same flags for make and make install, else everything gets recompiled
 %define _copts   "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC"
 make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" 
COPTS=%{_copts}
-make -C contrib/wrt %{?_smp_mflags}
+make -C contrib/lease-tools %{?_smp_mflags}
 
 %pre
 if ! /usr/bin/getent group tftp >/dev/null; then
@@ -142,11 +142,11 @@
 
 # utils subpackage
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 contrib/wrt/dhcp_release 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_release
-install -m 644 contrib/wrt/dhcp_release.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_release.1
-install -m 755 contrib/wrt/dhcp_lease_time 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_lease_time
-install -m 644 contrib/wrt/dhcp_lease_time.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_lease_time.1
-rm contrib/wrt/{dhcp_release,dhcp_lease_time}
+install -m 755 contrib/lease-tools/dhcp_release 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_release
+install -m 644 contrib/lease-tools/dhcp_release.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_release.1
+install -m 755 contrib/lease-tools/dhcp_lease_time 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_lease_time
+install -m 644 contrib/lease-tools/dhcp_lease_time.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_lease_time.1
+rm contrib/lease-tools/{dhcp_release,dhcp_lease_time}
 rm -rf contrib/Suse
 rm -rf contrib/Solaris10
 rm -rf contrib/dnsmasq_MacOSX-pre10.4

++ dnsmasq-2.75.tar.xz -> dnsmasq-2.76.tar.xz ++
 33292 lines of diff (skipped)

commit dnsmasq for openSUSE:Factory

2016-06-29 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2016-06-29 15:04:14

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2016-03-09 
15:15:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2016-06-29 
15:04:15.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 16 12:39:18 UTC 2016 - m...@suse.com
+
+- dnsmasq-groups.patch: Initialize the supplementary groups of the
+  dnsmasq user (bsc#859298).
+
+---

New:

  dnsmasq-groups.patch



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.hwGzcn/_old  2016-06-29 15:04:16.0 +0200
+++ /var/tmp/diff_new_pack.hwGzcn/_new  2016-06-29 15:04:16.0 +0200
@@ -34,6 +34,7 @@
 Source6:SuSEFirewall.dnsmasq-dhcp
 Source7:SuSEFirewall.dnsmasq-dns
 Source8:%{name}-rpmlintrc
+Patch0: dnsmasq-groups.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -66,6 +67,7 @@
 
 %prep
 %setup -q
+%patch0
 
 # Some docs have the DOS line ends
 dos2unix contrib/systemd/dbus_activation


++ dnsmasq-groups.patch ++
--- src/dnsmasq.c.orig
+++ src/dnsmasq.c
@@ -557,11 +557,10 @@ int main (int argc, char **argv)
   if (!option_bool(OPT_DEBUG) && getuid() == 0)   
 {
   int bad_capabilities = 0;
-  gid_t dummy;
   
-  /* remove all supplimentary groups */
+  /* set the supplimentary groups of the daemon user */
   if (gp && 
- (setgroups(0, ) == -1 ||
+ (initgroups(daemon->username, gp->gr_gid) == -1 ||
   setgid(gp->gr_gid) == -1))
{
  send_event(err_pipe[1], EVENT_GROUP_ERR, errno, daemon->groupname);

commit dnsmasq for openSUSE:Factory

2016-03-09 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2016-03-09 15:15:29

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is "dnsmasq"

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2015-08-27 
08:54:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2016-03-09 
15:15:31.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb  2 21:34:39 UTC 2016 - mplus...@suse.com
+
+- Add gpg signature
+
+---

New:

  dnsmasq-2.75.tar.xz.asc
  dnsmasq.keyring



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.jvb62j/_old  2016-03-09 15:15:32.0 +0100
+++ /var/tmp/diff_new_pack.jvb62j/_new  2016-03-09 15:15:32.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,15 @@
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
-Source: http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
-Source1:dnsmasq.reg
-Source2:dnsmasq.service
-Source3:rc.dnsmasq-suse
-Source4:SuSEFirewall.dnsmasq-dhcp
-Source5:SuSEFirewall.dnsmasq-dns
-Source6:%{name}-rpmlintrc
+Source0:http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
+Source1:
http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
+Source2:%{name}.keyring
+Source3:dnsmasq.reg
+Source4:dnsmasq.service
+Source5:rc.dnsmasq-suse
+Source6:SuSEFirewall.dnsmasq-dhcp
+Source7:SuSEFirewall.dnsmasq-dns
+Source8:%{name}-rpmlintrc
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
@@ -63,7 +65,7 @@
 server's leases.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 # Some docs have the DOS line ends
 dos2unix contrib/systemd/dbus_activation
@@ -125,12 +127,12 @@
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
 install -d -m 755 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
-install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
-install -m 644 %SOURCE5 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-install -m 644 %SOURCE4 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
+install -m 644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
+install -m 644 %SOURCE7 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
+install -m 644 %SOURCE6 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
-install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
+install -D -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 ln -sf %{_sbindir}/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d

commit dnsmasq for openSUSE:Factory

2015-08-27 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2015-08-27 08:54:14

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2015-08-19 
13:41:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-08-27 
08:54:15.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 24 18:10:01 UTC 2015 - stefan.bru...@rwth-aachen.de
+
+- spec file cleanup, get rid of redifinition warnings
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.I3lC1d/_old  2015-08-27 08:54:15.0 +0200
+++ /var/tmp/diff_new_pack.I3lC1d/_new  2015-08-27 08:54:15.0 +0200
@@ -88,14 +88,13 @@
dnsmasq.conf.example
 
 %build
-echo #define HAVE_DBUS  src/config.h
-echo #define HAVE_CONNTRACK  src/config.h
-echo #define HAVE_IDN  src/config.h
-echo #define HAVE_DNSSEC  src/config.h
 mv po/no.po po/nb.po
-export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS 
-DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC
+export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie
 export LDFLAGS=-Wl,-z,relro,-z,now -pie
-make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS
+# the dnsmasq make system hashes the configuration flags, so we have to supply 
the
+# same flags for make and make install, else everything gets recompiled
+%define _copts   -DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC
+make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS 
COPTS=%{_copts}
 make -C contrib/wrt %{?_smp_mflags}
 
 %pre
@@ -122,7 +121,7 @@
 %service_del_postun %{name}.service
 
 %install
-make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk
+make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk COPTS=%{_copts}
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
 install -d -m 755 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf

commit dnsmasq for openSUSE:Factory

2015-08-19 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2015-08-19 13:41:09

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2015-07-05 
17:56:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-08-19 
13:41:10.0 +0200
@@ -1,0 +2,156 @@
+Tue Aug 11 01:41:02 UTC 2015 - stefan.bru...@rwth-aachen.de
+
+- Update to 2.75, announce message:
+Fix reversion on 2.74 which caused 100% CPU use when a 
+dhcp-script is configured. Thanks to Adrian Davey for
+reporting the bug and testing the fix.
+
+- Update to 2.74, announce message:
+Fix reversion in 2.73 where --conf-file would attempt to
+read the default file, rather than no file.
+
+Fix inotify code to handle dangling symlinks better and
+not SEGV in some circumstances.
+
+DNSSEC fix. In the case of a signed CNAME generated by a
+wildcard which pointed to an unsigned domain, the wrong
+status would be logged, and some necessary checks omitted.
+
+- Update to 2.73, announce message:
+Fix crash at startup when an empty suffix is supplied to
+--conf-dir, also trivial memory leak. Thanks to
+Tomas Hozza for spotting this.
+
+Remove floor of 4096 on advertised EDNS0 packet size when
+DNSSEC in use, the original rationale for this has long gone.
+Thanks to Anders Kaseorg for spotting this.
+
+Use inotify for checking on updates to /etc/resolv.conf and
+friends under Linux. This fixes race conditions when the files are
+updated rapidly and saves CPU by noy polling. To build
+a binary that runs on old Linux kernels without inotify,
+use make COPTS=-DNO_INOTIFY
+
+Fix breakage of --domain=domain,subnet,local - only reverse
+queries were intercepted. THis appears to have been broken
+since 2.69. Thanks to Josh Stone for finding the bug.
+
+Eliminate IPv6 privacy addresses and deprecated addresses from
+the answers given by --interface-name. Note that reverse queries
+(ie looking for names, given addresses) are not affected.
+Thanks to Michael Gorbach for the suggestion.
+
+Fix crash in DNSSEC code with long RRs. Thanks to Marco Davids
+for the bug report.
+
+Add --ignore-address option. Ignore replies to A-record
+queries which include the specified address. No error is
+generated, dnsmasq simply continues to listen for another
+reply. This is useful to defeat blocking strategies which
+rely on quickly supplying a forged answer to a DNS
+request for certain domains, before the correct answer can
+arrive. Thanks to Glen Huang for the patch.
+
+Revisit the part of DNSSEC validation which determines if an
+unsigned answer is legit, or is in some part of the DNS
+tree which should be signed. Dnsmasq now works from the
+DNS root downward looking for the limit of signed
+delegations, rather than working bottom up. This is
+both more correct, and less likely to trip over broken
+nameservers in the unsigned parts of the DNS tree
+which don't respond well to DNSSEC queries.
+
+Add --log-queries=extra option, which makes logs easier
+to search automatically.
+
+Add --min-cache-ttl option. I've resisted this for a long
+time, on the grounds that disbelieving TTLs is never a
+good idea, but I've been persuaded that there are
+sometimes reasons to do it. (Step forward, GFW).
+To avoid misuse, there's a hard limit on the TTL
+floor of one hour. Thansk to RinSatsuki for the patch.
+
+Cope with multiple interfaces with the same link-local
+address. (IPv6 addresses are scoped, so this is allowed.)
+Thanks to Cory Benfield for help with this.
+
+Add --dhcp-hostsdir. This allows addition of new host
+configurations to a running dnsmasq instance much more
+cheaply than having dnsmasq re-read all its existing
+configuration each time.
+
+Don't reply to DHCPv6 SOLICIT messages if we're not
+configured to do stateful DHCPv6. Thanks to Win King Wan
+for the patch.
+
+Fix broken DNSSEC validation of ECDSA signatures.
+
+Add --dnssec-timestamp option, which provides an automatic
+way to detect when the system time becomes valid after
+boot on systems without an RTC, whilst allowing DNS
+queries before the clock is valid so that NTP can run.
+Thanks to Kevin Darbyshire-Bryant for developing this idea.
+
+Add --tftp-no-fail option. Thanks to Stefan Tomanek for
+the patch.
+
+Fix crash caused by looking up servers.bind, CHAOS text
+record, when more than about five --servers= lines are
+in the dnsmasq config. This causes

commit dnsmasq for openSUSE:Factory

2015-07-05 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2015-07-05 17:56:36

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2015-04-27 
12:58:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-07-05 
17:56:38.0 +0200
@@ -1,0 +2,7 @@
+Wed Jun 17 01:45:33 UTC 2015 - crrodrig...@opensuse.org
+
+- dnsmasq.service: Order Before=nss-lookup.target  and 
+  Wants=nss-lookup.target as this service may provide
+  name resolution even for the localhost.
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.vN4sqD/_old  2015-07-05 17:56:39.0 +0200
+++ /var/tmp/diff_new_pack.vN4sqD/_new  2015-07-05 17:56:39.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ dnsmasq.service ++
--- /var/tmp/diff_new_pack.vN4sqD/_old  2015-07-05 17:56:39.0 +0200
+++ /var/tmp/diff_new_pack.vN4sqD/_new  2015-07-05 17:56:39.0 +0200
@@ -1,6 +1,8 @@
 [Unit]
 Description=DNS caching server.
 After=network.target
+Wants=nss-lookup.target
+Before=nss-lookup.target
 
 [Service]
 Type=dbus

commit dnsmasq for openSUSE:Factory

2015-04-27 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2015-04-27 12:58:23

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2015-01-07 
09:38:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-04-27 
12:58:24.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 20 12:14:54 UTC 2015 - abergm...@suse.com
+
+- Move trust-anchors.conf into /etc/dnsmasq.d to be AppArmor conform.
+  (bnc#908137)
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.4LPIS7/_old  2015-04-27 12:58:24.0 +0200
+++ /var/tmp/diff_new_pack.4LPIS7/_new  2015-04-27 12:58:24.0 +0200
@@ -83,6 +83,10 @@
   s|CHGRP dip|CHGRP nogroup|' \
src/config.h
 
+# Fix trust-anchor.conf location
+sed -i -e '/trust-anchors.conf/c\#conf-file=/etc/dnsmasq.d/trust-anchors.conf' 
\
+   dnsmasq.conf.example
+
 %build
 echo #define HAVE_DBUS  src/config.h
 echo #define HAVE_CONNTRACK  src/config.h
@@ -130,7 +134,8 @@
 install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 ln -sf %{_sbindir}/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
-install -D -m 0644 trust-anchors.conf 
%{buildroot}%{_datadir}/%{name}/trust-anchors.conf
+install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d
+install -m 644 trust-anchors.conf 
${RPM_BUILD_ROOT}/%{_sysconfdir}/dnsmasq.d/trust-anchors.conf
 
 # utils subpackage
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
@@ -160,8 +165,8 @@
 %{_mandir}/man8/dnsmasq.8.gz
 %config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf
 %{_unitdir}/dnsmasq.service
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/trust-anchors.conf
+%dir %{_sysconfdir}/dnsmasq.d
+%config(noreplace) %{_sysconfdir}/dnsmasq.d/trust-anchors.conf
 
 %dir %attr(0750,tftp,tftp) /srv/tftpboot

commit dnsmasq for openSUSE:Factory

2015-01-07 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2015-01-07 09:38:17

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-12-31 
11:22:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-01-07 
09:38:24.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan  6 09:58:25 UTC 2015 - jsl...@suse.com
+
+- The change from Wed Dec 24 messed group w/ user IDs. Switch them
+  back and be more careful w/ what is changed.
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.7HwCrw/_old  2015-01-07 09:38:24.0 +0100
+++ /var/tmp/diff_new_pack.7HwCrw/_new  2015-01-07 09:38:24.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -69,16 +69,19 @@
 dos2unix contrib/systemd/dbus_activation
 
 # SED-FIX-UPSTREAM -- Fix paths
-sed -i -e 's|/usr/local|/usr|' \
--i -e 's|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' Makefile
+sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|;
+  s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \
+   Makefile
 
 # SED-FIX-UPSTREAM -- Fix man page
-sed -i 's|world readable.|world readable. The defaults are to nogroup|' 
man/dnsmasq.8
+sed -i -e 's|The defaults to dip,|The default is nogroup,|' \
+   man/dnsmasq.8
 
 # SED-FIX-UPSTREAM -- Fix cachesize, group and user
-sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|' \
--i -e 's|nobody|nogroup|' \
--i -e 's|dip|dnsmasq|' src/config.h
+sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|;
+  s|CHUSER nobody|CHUSER dnsmasq|;
+  s|CHGRP dip|CHGRP nogroup|' \
+   src/config.h
 
 %build
 echo #define HAVE_DBUS  src/config.h

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2014-12-31 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-12-31 11:22:15

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-11-13 
09:19:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-12-31 
11:22:25.0 +0100
@@ -1,0 +2,64 @@
+Mon Dec 29 09:37:54 UTC 2014 - dims...@opensuse.org
+
+- Fix symlink of rcFOO to /usr/sbin/service, resolving a dangling
+  symlink lint warning (and remove the same from rpmlintrc).
+
+---
+Thu Dec 25 06:32:18 UTC 2014 - nemy...@gmx.ch
+
+- Remove from spec group_and_isc.patch, forgotten in previous commit
+
+---
+Wed Dec 24 22:29:52 UTC 2014 - nemy...@gmx.ch
+
+- Update to 2.72, announce message:
+
+Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
+
+Add support for ipsets in *BSD, using pf. Thanks to
+Sven Falempim for the patch.
+
+Fix race condition which could lock up dnsmasq when an
+interface goes down and up rapidly. Thanks to Conrad
+Kostecki for helping to chase this down.
+
+Add DBus methods SetFilterWin2KOption and SetBogusPrivOption
+Thanks to the Smoothwall project for the patch.
+
+Fix failure to build against Nettle-3.0. Thanks to Steven
+Barth for spotting this and finding the fix.
+
+When assigning existing DHCP leases to intefaces by comparing
+networks, handle the case that two or more interfaces have the
+same network part, but different prefix lengths (favour the
+longer prefix length.) Thanks to Lung-Pin Chang for the
+patch.
+
+Add a mode which detects and removes DNS forwarding loops, ie
+a query sent to an upstream server returns as a new query to
+dnsmasq, and would therefore be forwarded again, resulting in
+a query which loops many times before being dropped. Upstream
+servers which loop back are disabled and this event is logged.
+Thanks to Smoothwall for their sponsorship of this feature.
+
+Extend --conf-dir to allow filtering of files. So
+--conf-dir=/etc/dnsmasq.d,\*.conf
+will load all the files in /etc/dnsmasq.d which end in .conf
+
+Fix bug when resulted in NXDOMAIN answers instead of NODATA in
+some circumstances.
+
+Fix bug which caused dnsmasq to become unresponsive if it
+failed to send packets due to a network interface disappearing.
+Thanks to Niels Peen for spotting this.
+
+Fix problem with --local-service option on big-endian platforms
+Thanks to Richard Genoud for the patch.
+
+
+- Add dnsmasq-rpmlintrc, for false positive scripts and symlink
+- Add BuildRequires for dos2unix
+- Use sed instead of simple patch group_and_isc.patch
+
+
+---

Old:

  dnsmasq-2.71.tar.gz
  group_and_isc.patch

New:

  dnsmasq-2.72.tar.gz
  dnsmasq-rpmlintrc



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.CJfMJh/_old  2014-12-31 11:22:26.0 +0100
+++ /var/tmp/diff_new_pack.CJfMJh/_new  2014-12-31 11:22:26.0 +0100
@@ -20,20 +20,21 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0 or GPL-3.0
 Group:  Productivity/Networking/DNS/Servers
-Version:2.71
+Version:2.72
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
-Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
+Source: http://www.thekelleys.org.uk/%{name}/%{name}-%{version}.tar.gz
 Source1:dnsmasq.reg
 Source2:dnsmasq.service
 Source3:rc.dnsmasq-suse
 Source4:SuSEFirewall.dnsmasq-dhcp
 Source5:SuSEFirewall.dnsmasq-dns
-Patch1: group_and_isc.patch
+Source6:%{name}-rpmlintrc
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
+BuildRequires:  dos2unix
 BuildRequires:  libidn-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  pkg-config
@@ -62,8 +63,22 @@
 server's leases.
 
 %prep
-%setup -q -n dnsmasq-%{version}
-%patch1 -p1
+%setup -q -n %{name}-%{version}
+
+# Some docs have the DOS line ends
+dos2unix contrib/systemd/dbus_activation
+
+# SED-FIX-UPSTREAM -- Fix paths
+sed -i -e 's|/usr/local|/usr|' \
+-i -e 's|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' Makefile
+
+# SED-FIX-UPSTREAM -- Fix man page
+sed -i 's|world readable.|world readable. The defaults are

commit dnsmasq for openSUSE:Factory

2014-11-13 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-11-13 09:19:36

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-09-01 
16:58:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-11-13 
09:19:41.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov  9 09:30:07 UTC 2014 - seife+...@b1-systems.com
+
+- fix logging, PrivateDevices=yes kills it (bnc#902511, bnc#904537)
+
+---



Other differences:
--
++ dnsmasq.service ++
--- /var/tmp/diff_new_pack.dBcty0/_old  2014-11-13 09:19:43.0 +0100
+++ /var/tmp/diff_new_pack.dBcty0/_new  2014-11-13 09:19:43.0 +0100
@@ -8,7 +8,9 @@
 ExecStartPre=/usr/sbin/dnsmasq --test
 ExecStart=/usr/sbin/dnsmasq --log-async --enable-dbus --keep-in-foreground
 ExecReload=/bin/kill -HUP $MAINPID
-PrivateDevices=yes
+ kills logging, so not enabled
+# PrivateDevices=yes
+
 
 [Install]
 WantedBy=multi-user.target

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2014-09-01 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-09-01 16:58:42

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-08-08 
10:10:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-09-01 
16:58:47.0 +0200
@@ -1,0 +2,15 @@
+Tue Aug 26 14:05:14 CEST 2014 - dste...@suse.cz
+
+- enable DNSSEC
+  - require libnettle
+  - package trust-anchors.conf
+- spec fixes:
+  - define HAVE_ flags on commandline, otherwise 'dnsmasq --version'
+will not correctly reflect the feature status
+
+---
+Fri Aug 22 07:08:36 UTC 2014 - meiss...@suse.com
+
+- actually build with relro and pie. (bnc#893057)
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.Acnj34/_old  2014-09-01 16:58:49.0 +0200
+++ /var/tmp/diff_new_pack.Acnj34/_new  2014-09-01 16:58:49.0 +0200
@@ -35,6 +35,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libnettle-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
 %if 0%{?suse_version} = 1210
@@ -68,10 +69,11 @@
 echo #define HAVE_DBUS  src/config.h
 echo #define HAVE_CONNTRACK  src/config.h
 echo #define HAVE_IDN  src/config.h
+echo #define HAVE_DNSSEC  src/config.h
 mv po/no.po po/nb.po
-export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie
+export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS 
-DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC
 export LDFLAGS=-Wl,-z,relro,-z,now -pie
-make %{?_smp_mflags} AWK=gawk all-i18n
+make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS
 make -C contrib/wrt %{?_smp_mflags}
 
 %pre
@@ -110,6 +112,7 @@
 install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
+install -D -m 0644 trust-anchors.conf 
%{buildroot}%{_datadir}/%{name}/trust-anchors.conf
 
 # utils subpackage
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
@@ -139,6 +142,8 @@
 %{_mandir}/man8/dnsmasq.8.gz
 %config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf
 %{_unitdir}/dnsmasq.service
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/trust-anchors.conf
 
 %dir %attr(0750,tftp,tftp) /srv/tftpboot
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2014-08-08 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-08-08 10:10:13

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-06-19 
13:19:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-08-08 
10:10:16.0 +0200
@@ -1,0 +2,15 @@
+Wed Aug  6 06:48:20 UTC 2014 - vwallfah...@suse.com
+
+- Removed Suse and all other OS/Distribution related subdirs from 
+  contrib, so only the rest gets packaged. The subdirs are not 
+  necessary anymore (bnc#889028).  
+
+---
+Tue Aug  5 08:19:42 UTC 2014 - vwallfah...@suse.com
+
+- Removed README.SUSE file, it was to confusing and not necessary 
(bnc#889972). 
+  Information is already present in the upstream documentation.
+- Split up vendor-files.tar.bz2 into single files
+- Comply with systemd packaging guidlines  
+
+---

Old:

  vendor-files.tar.bz2

New:

  SuSEFirewall.dnsmasq-dhcp
  SuSEFirewall.dnsmasq-dns
  dnsmasq.reg
  rc.dnsmasq-suse



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.TNioFf/_old  2014-08-08 10:10:17.0 +0200
+++ /var/tmp/diff_new_pack.TNioFf/_new  2014-08-08 10:10:17.0 +0200
@@ -26,15 +26,20 @@
 PreReq: /usr/sbin/useradd /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
 Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
-Source1:vendor-files.tar.bz2
+Source1:dnsmasq.reg
 Source2:dnsmasq.service
+Source3:rc.dnsmasq-suse
+Source4:SuSEFirewall.dnsmasq-dhcp
+Source5:SuSEFirewall.dnsmasq-dns
 Patch1: group_and_isc.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  libidn-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
-BuildRequires:  pkgconfig(systemd)
+%if 0%{?suse_version} = 1210
+BuildRequires:  systemd
+%endif
 %{?systemd_requires}
 
 %description
@@ -57,7 +62,6 @@
 
 %prep
 %setup -q -n dnsmasq-%{version}
-%setup -q -T -D -a1 -n dnsmasq-%{version}
 %patch1 -p1
 
 %build
@@ -98,9 +102,9 @@
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
 install -d -m 755 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
-install -m 644 dnsmasq.reg  $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
-install -m 644 SuSEFirewall.dnsmasq-dns 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-install -m 644 SuSEFirewall.dnsmasq-dhcp 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
+install -m 644 %SOURCE5 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
+install -m 644 %SOURCE4 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
@@ -114,12 +118,17 @@
 install -m 755 contrib/wrt/dhcp_lease_time 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_lease_time
 install -m 644 contrib/wrt/dhcp_lease_time.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_lease_time.1
 rm contrib/wrt/{dhcp_release,dhcp_lease_time}
+rm -rf contrib/Suse
+rm -rf contrib/Solaris10
+rm -rf contrib/dnsmasq_MacOSX-pre10.4
+rm -rf contrib/slackware-dnsmasq
+rm -rf contrib/MacOSX-launchd
 
 %find_lang %{name} --with-man
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dnsmasq.conf.example 
contrib README.SUSE dbus
+%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dnsmasq.conf.example 
contrib dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
 %{_sbindir}/rcdnsmasq
@@ -128,11 +137,13 @@
 %dir %{_sysconfdir}/slp.reg.d/
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz
-/etc/dbus-1/system.d/dnsmasq.conf
+%config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf
 %{_unitdir}/dnsmasq.service
+
 %dir %attr(0750,tftp,tftp) /srv/tftpboot
 
 %files utils
+%defattr(-,root,root)
 %{_bindir}/dhcp_*
 %{_mandir}/man1/dhcp_*
 

++ SuSEFirewall.dnsmasq-dhcp ++
# Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
# More may be supported

commit dnsmasq for openSUSE:Factory

2014-06-19 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-06-19 13:19:46

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2014-03-28 
12:10:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-06-19 
13:19:48.0 +0200
@@ -1,0 +2,427 @@
+Thu Jun 12 08:15:29 UTC 2014 - cdenic...@suse.com
+
+- license update: GPL-2.0 or GPL-3.0
+  correct license is dual GPL-2.0 or GPL-3.0; please add COPYING-v3-file to
+  RPM.
+
+---
+Wed Jun 11 15:27:24 UTC 2014 - dmuel...@suse.com
+
+- update to 2.71:
+Subtle change to error handling to help DNSSEC validation 
+when servers fail to provide NODATA answers for 
+non-existent DS records.
+
+Tweak code which removes DNSSEC records from answers when
+not required. Fixes broken answers when additional section
+has real records in it. Thanks to Marco Davids for the bug 
+report.
+
+Fix DNSSEC validation of ANY queries. Thanks to Marco Davids
+for spotting that too.
+
+Fix total DNS failure and 100% CPU use if cachesize set to zero,
+regression introduced in 2.69. Thanks to James Hunt and
+the Ubuntu crowd for assistance in fixing this.
+
+
+Fix crash, introduced in 2.69, on TCP request when dnsmasq
+compiled with DNSSEC support, but running without DNSSEC
+enabled. Thanks to Manish Sing for spotting that one.
+
+Fix regression which broke ipset functionality. Thanks to 
+Wang Jian for the bug report.
+
+
+Implement dynamic interface discovery on *BSD. This allows
+the contructor: syntax to be used in dhcp-range for DHCPv6
+on the BSD platform. Thanks to Matthias Andree for
+valuable research on how to implement this.
+
+Fix infinite loop associated with some --bogus-nxdomain
+configs. Thanks fogobogo for the bug report.
+
+Fix missing RA RDNS option with configuration like
+--dhcp-option=option6:23,[::] Thanks to Tsachi Kimeldorfer
+for spotting the problem.
+
+Add [fd00::] and [fe80::] as special addresses in DHCPv6
+options, analogous to [::]. [fd00::] is replaced with the
+actual ULA of the interface on the machine running
+dnsmasq, [fe80::] with the link-local address. 
+Thanks to Tsachi Kimeldorfer for championing this.
+
+DNSSEC validation and caching. Dnsmasq needs to be
+compiled with this enabled, with 
+
+make dnsmasq COPTS=-DHAVE_DNSSEC
+
+this add dependencies on the nettle crypto library and the 
+gmp maths library. It's possible to have these linked
+statically with
+
+make dnsmasq COPTS='-DHAVE_DNSSEC -DHAVE_DNSSEC_STATIC'
+
+which bloats the dnsmasq binary, but saves the size of 
+the shared libraries which are much bigger.
+
+To enable, DNSSEC, you will need a set of
+trust-anchors. Now that the TLDs are signed, this can be
+the keys for the root zone, and for convenience they are
+included in trust-anchors.conf in the dnsmasq
+distribution. You should of course check that these are
+legitimate and up-to-date. So, adding
+
+conf-file=/path/to/trust-anchors.conf
+dnssec
+
+to your config is all thats needed to get things
+working. The upstream nameservers have to be DNSSEC-capable
+too, of course. Many ISP nameservers aren't, but the
+Google public nameservers (8.8.8.8 and 8.8.4.4) are.
+When DNSSEC is configured, dnsmasq validates any queries 
+for domains which are signed. Query results which are 
+bogus are replaced with SERVFAIL replies, and results 
+which are correctly signed have the AD bit set. In 
+addition, and just as importantly, dnsmasq supplies 
+correct DNSSEC information to clients which are doing 
+their own validation, and caches DNSKEY, DS and RRSIG
+records, which significantly improve the performance of 
+downstream validators. Setting --log-queries will show 
+DNSSEC in action.
+
+If a domain is returned from an upstream nameserver without 
+DNSSEC signature, dnsmasq by default trusts this. This 
+means that for unsigned zone (still the majority) there 
+is effectively no cost for having DNSSEC enabled. Of course
+this allows an attacker to replace a signed record with a 
+false unsigned record. This is addressed by the 
+--dnssec-check-unsigned flag, which instructs dnsmasq
+to prove that an unsigned record is legitimate, by finding  
+a secure proof that the zone containing the record is not
+signed. Doing this has costs (typically one or two extra
+upstream queries). It also has a

commit dnsmasq for openSUSE:Factory

2014-03-28 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2014-03-28 12:10:10

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2013-04-23 
11:30:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-03-28 
12:10:12.0 +0100
@@ -1,0 +2,7 @@
+Wed Mar 26 16:56:34 UTC 2014 - crrodrig...@opensuse.org
+
+- dnsmasq.service: Set PrivateDevices=yes so we run in a 
+  separate namespace with the bare minimum device nodes isolated
+  from the host.
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.UpSwHr/_old  2014-03-28 12:10:12.0 +0100
+++ /var/tmp/diff_new_pack.UpSwHr/_new  2014-03-28 12:10:12.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ dnsmasq.service ++
--- /var/tmp/diff_new_pack.UpSwHr/_old  2014-03-28 12:10:13.0 +0100
+++ /var/tmp/diff_new_pack.UpSwHr/_new  2014-03-28 12:10:13.0 +0100
@@ -8,6 +8,7 @@
 ExecStartPre=/usr/sbin/dnsmasq --test
 ExecStart=/usr/sbin/dnsmasq --log-async --enable-dbus --keep-in-foreground
 ExecReload=/bin/kill -HUP $MAINPID
+PrivateDevices=yes
 
 [Install]
 WantedBy=multi-user.target

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2013-04-23 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2013-04-23 11:30:17

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2013-03-14 
15:36:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2013-04-23 
11:30:19.0 +0200
@@ -1,0 +2,21 @@
+Mon Apr 22 11:34:35 UTC 2013 - meiss...@suse.com
+
+- reintroduced /sbin/rcdnsmasq as /sbin/service link.
+
+---
+Sat Apr 20 05:54:35 UTC 2013 - crrodrig...@opensuse.org
+
+- Do not order after syslog.target which it is neither 
+  required not recommended and currently no longer even exists.
+
+---
+Sat Apr 13 16:04:18 UTC 2013 - co...@suse.com
+
+- sync /srv/tftpboot directory attributes with atftp package
+
+---
+Wed Apr  3 23:09:10 UTC 2013 - crrodrig...@opensuse.org
+
+- remove all sysvinit support 
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.roxsJC/_old  2013-04-23 11:30:21.0 +0200
+++ /var/tmp/diff_new_pack.roxsJC/_new  2013-04-23 11:30:21.0 +0200
@@ -23,7 +23,7 @@
 Version:2.65
 Release:0
 Provides:   dns_daemon
-PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
+PreReq: /usr/sbin/useradd /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
 Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
 Source1:vendor-files.tar.bz2
@@ -31,20 +31,12 @@
 Patch1: group_and_isc.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
-BuildRequires:  libidn
 BuildRequires:  libidn-devel
 BuildRequires:  pkg-config
-BuildRequires:  systemd
 BuildRequires:  pkgconfig(libnetfilter_conntrack)
-
+BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 
-%if %suse_version  1220
-%define _unitdir /usr/lib/systemd
-%else
-%define _unitdir /lib/systemd
-%endif
-
 %description
 Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
 server. It is designed to provide DNS and, optionally, DHCP, to a small
@@ -93,33 +85,27 @@
 %service_add_pre %{name}.service
 
 %post
-%{fillup_and_insserv dnsmasq}
 %service_add_post %{name}.service
 
 %preun
-%stop_on_removal dnsmasq
 %service_del_preun %{name}.service
 
 %postun
-%restart_on_update dnsmasq
-%{insserv_cleanup}
 %service_del_postun %{name}.service
 
 %install
 make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk
-install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
 install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
 install -d -m 755 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
-install -m 755 rc.dnsmasq-suse $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/dnsmasq
-ln -sf ../../etc/init.d/dnsmasq $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf
 install -m 644 dnsmasq.reg  $RPM_BUILD_ROOT/%{_sysconfdir}/slp.reg.d/
 install -m 644 SuSEFirewall.dnsmasq-dns 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
 install -m 644 SuSEFirewall.dnsmasq-dhcp 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
-install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service
+install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
+ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
 
 # utils subpackage
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
@@ -135,17 +121,16 @@
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib 
README.SUSE dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
-%{_sysconfdir}/init.d/dnsmasq
-%{_sbindir}/rcdnsmasq
 %{_sbindir}/dnsmasq
+%{_sbindir}/rcdnsmasq
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 %dir %{_sysconfdir}/slp.reg.d/
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz
 /etc/dbus-1/system.d/dnsmasq.conf
-%{_unitdir}/system/dnsmasq.service
-%dir

commit dnsmasq for openSUSE:Factory

2013-03-14 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2013-03-14 15:19:29

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2013-02-25 
20:33:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2013-03-14 
15:19:55.0 +0100
@@ -1,0 +2,10 @@
+Tue Mar 12 18:09:40 UTC 2013 - vu...@suse.com
+
+- Create a utils subpackage to include DHCP lease management utils
+  (that are living in contrib/wrt):
+  + Explicitly build them in %build and install the files in
+%install.
+  + Summary and description of the new subpackage are taken from
+Fedora.
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.BYMmLx/_old  2013-03-14 15:20:08.0 +0100
+++ /var/tmp/diff_new_pack.BYMmLx/_new  2013-03-14 15:20:08.0 +0100
@@ -55,6 +55,14 @@
 Dnsmasq supports static and dynamic DHCP leases and BOOTP for network
 booting of diskless machines.
 
+%package utils
+Summary:Utilities for manipulating DHCP server leases
+Group:  Productivity/Networking/DNS/Servers
+
+%description utils
+Utilities that use the standard DHCP protocol to query/remove a DHCP
+server's leases.
+
 %prep
 %setup -q -n dnsmasq-%{version}
 %setup -q -T -D -a1 -n dnsmasq-%{version}
@@ -68,6 +76,7 @@
 export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie
 export LDFLAGS=-Wl,-z,relro,-z,now -pie
 make %{?_smp_mflags} AWK=gawk all-i18n
+make -C contrib/wrt %{?_smp_mflags}
 
 %pre
 if ! /usr/bin/getent group tftp /dev/null; then
@@ -111,6 +120,15 @@
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
+
+# utils subpackage
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 contrib/wrt/dhcp_release 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_release
+install -m 644 contrib/wrt/dhcp_release.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_release.1
+install -m 755 contrib/wrt/dhcp_lease_time 
${RPM_BUILD_ROOT}%{_bindir}/dhcp_lease_time
+install -m 644 contrib/wrt/dhcp_lease_time.1 
${RPM_BUILD_ROOT}%{_mandir}/man1/dhcp_lease_time.1
+rm contrib/wrt/{dhcp_release,dhcp_lease_time}
+
 %find_lang %{name} --with-man
 
 %files -f %{name}.lang
@@ -129,4 +147,8 @@
 %{_unitdir}/system/dnsmasq.service
 %dir %attr(0750,root,tftp) /srv/tftpboot
 
+%files utils
+%{_bindir}/dhcp_*
+%{_mandir}/man1/dhcp_*
+
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2013-02-25 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2013-02-25 20:33:58

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-12-17 
09:33:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2013-02-25 
20:33:59.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb 22 12:53:03 UTC 2013 - rmila...@suse.com
+
+- Install dnsmasq.service accordingly (/usr/lib/systemd for 12.3
+  and up or /lib/systemd for older versions).
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.VI2QmT/_old  2013-02-25 20:34:01.0 +0100
+++ /var/tmp/diff_new_pack.VI2QmT/_new  2013-02-25 20:34:01.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,12 @@
 
 %{?systemd_requires}
 
+%if %suse_version  1220
+%define _unitdir /usr/lib/systemd
+%else
+%define _unitdir /lib/systemd
+%endif
+
 %description
 Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
 server. It is designed to provide DNS and, optionally, DHCP, to a small
@@ -103,7 +109,7 @@
 install -m 644 SuSEFirewall.dnsmasq-dhcp 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
-install -D -m 0644 %SOURCE2 %{buildroot}/lib/systemd/system/dnsmasq.service
+install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/system/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
 %find_lang %{name} --with-man
 
@@ -120,7 +126,7 @@
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz
 /etc/dbus-1/system.d/dnsmasq.conf
-/lib/systemd/system/dnsmasq.service
+%{_unitdir}/system/dnsmasq.service
 %dir %attr(0750,root,tftp) /srv/tftpboot
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2012-12-17 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-12-17 09:33:31

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-10-04 
19:36:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-12-17 
09:33:35.0 +0100
@@ -1,0 +2,19 @@
+Fri Dec 14 15:32:27 UTC 2012 - tog...@opensuse.org
+
+- Update to version 2.65. For other changes relating to other
+  versions in between please see the  CHANGELOG
+
+  *  Fix regression which broke forwarding orgf queries sent via
+TCP which are not for A and  and which were directed to
+non-default servers. Thanks to Niax for the bug reportst.
+
+Fix failure to build with DHCP support excluded. Thanks to 
+Gustavo Zacarias for the patch.
+
+Fix nasty regression in 27.64 which completely broke cacheing.
+
+- renamed group_and_isc.diff to group_and_isc.patch rebasinp to -p1
+  level as outlined in the documentation at
+  http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+
+---

Old:

  dnsmasq-2.62.tar.gz
  group_and_isc.diff

New:

  dnsmasq-2.65.tar.gz
  group_and_isc.patch



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.fAa5pn/_old  2012-12-17 09:33:37.0 +0100
+++ /var/tmp/diff_new_pack.fAa5pn/_new  2012-12-17 09:33:37.0 +0100
@@ -20,7 +20,7 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0
 Group:  Productivity/Networking/DNS/Servers
-Version:2.62
+Version:2.65
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
@@ -28,7 +28,7 @@
 Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
 Source1:vendor-files.tar.bz2
 Source2:dnsmasq.service
-Patch1: group_and_isc.diff
+Patch1: group_and_isc.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  libidn
@@ -52,7 +52,7 @@
 %prep
 %setup -q -n dnsmasq-%{version}
 %setup -q -T -D -a1 -n dnsmasq-%{version}
-%patch1 -p0
+%patch1 -p1
 
 %build
 echo #define HAVE_DBUS  src/config.h

++ dnsmasq-2.62.tar.gz - dnsmasq-2.65.tar.gz ++
 5175 lines of diff (skipped)

++ group_and_isc.patch ++
---
 Makefile  |4 ++--
 man/dnsmasq.8 |1 +
 src/config.h  |6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 # Variables you may well want to override.
 
-PREFIX= /usr/local
+PREFIX= /usr
 BINDIR= $(PREFIX)/sbin
 MANDIR= $(PREFIX)/share/man
 LOCALEDIR = $(PREFIX)/share/locale
@@ -127,7 +127,7 @@ $(objs:.o=.c) $(hdrs):
$(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $ 
 
 dnsmasq : .configured $(hdrs) $(objs) 
-   $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) 
+   $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
 
 dnsmasq.pot : $(objs:.o=.c) $(hdrs)
$(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ 
-i $(objs:.o=.c)
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -125,6 +125,7 @@ can be over-ridden with this switch.
 Specify the group which dnsmasq will run
 as. The defaults to dip, if available, to facilitate access to
 /etc/ppp/resolv.conf which is not normally world readable.
+as. The defaults to nogroup
 .TP
 .B \-v, --version
 Print the version number.
--- a/src/config.h
+++ b/src/config.h
@@ -24,7 +24,7 @@
 #define FORWARD_TIME 20 /* or 20 seconds */
 #define RANDOM_SOCKS 64 /* max simultaneous random ports */
 #define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY 
seconds */
-#define CACHESIZ 150 /* default cache size */
+#define CACHESIZ 2000 /* default cache size */
 #define MAXLEASES 1000 /* maximum number of DHCP leases */
 #define PING_WAIT 3 /* wait for ping address-in-use test */
 #define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */
@@ -34,8 +34,8 @@
 #define HOSTSFILE /etc/hosts
 #define ETHERSFILE /etc/ethers
 #define DEFLEASE 3600 /* default lease time, 1 hour */
-#define CHUSER nobody
-#define CHGRP dip
+#define CHUSER dnsmasq
+#define CHGRP nogroup
 #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
 #define LOG_MAX 5 /* log-queue length */
 #define RANDFILE /dev/urandom
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For

commit dnsmasq for openSUSE:Factory

2012-10-04 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-10-04 19:36:50

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-06-28 
15:26:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-10-04 
19:36:52.0 +0200
@@ -1,0 +2,11 @@
+Thu Oct  4 07:32:36 UTC 2012 - cfarr...@suse.com
+
+- license update: GPL-2.0
+  Most of the source code files give a choice of either GPL-2.0 or GPL-3.0
+  (not GPL-2.0+). The website states that the COPYING file in the
+  distribution is the official license - in this case it is GPL-2.0. This
+  is consistent with what Fedora state about the package. Accordingly, I^d
+  be ok with License: GPL-2.0 or License: (GPL-2.0 or GPL-3.0) but not
+  License: GPL-2.0+
+
+---



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.nWRNkS/_old  2012-10-04 19:36:53.0 +0200
+++ /var/tmp/diff_new_pack.nWRNkS/_new  2012-10-04 19:36:53.0 +0200
@@ -18,7 +18,7 @@
 
 Name:   dnsmasq
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
-License:GPL-2.0+
+License:GPL-2.0
 Group:  Productivity/Networking/DNS/Servers
 Version:2.62
 Release:0

++ vendor-files.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/README.SUSE new/README.SUSE
--- old/README.SUSE 2008-09-12 15:05:55.0 +0200
+++ new/README.SUSE 2012-08-03 15:01:30.0 +0200
@@ -7,3 +7,6 @@
 the directory /etc/ppp/ is not readable by dnsmasq on openSUSE
 and SUSE Linux Enterprise Server for security reasons.
 
+If you invent new files and you use apparmor, take care to
+fix your apparmor config too.
+

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2012-06-28 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-06-28 15:26:26

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is u...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-05-07 
22:46:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-06-28 
15:26:28.0 +0200
@@ -1,0 +2,16 @@
+Sun Jun 24 03:51:58 UTC 2012 - crrodrig...@opensuse.org
+
+- Update to version 2.62, misc bugfixes 
+- Fix CFLAGS/LDFLAGS usage
+- fix the small cache size problem in a different way by tweaking
+  the build config instead.
+
+---
+Sat Jun 23 03:53:32 UTC 2012 - crrodrig...@opensuse.org
+
+- The default cache size is way too small (150 entries) use a sane
+  default of 2000 as used in *WRT embeeded routers which is still
+  very conservative for a desktop/server machine.
+- use async logging
+
+---

Old:

  dnsmasq-2.61.tar.gz

New:

  dnsmasq-2.62.tar.gz



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.OR0Vkw/_old  2012-06-28 15:26:30.0 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new  2012-06-28 15:26:30.0 +0200
@@ -20,7 +20,7 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0+
 Group:  Productivity/Networking/DNS/Servers
-Version:2.61
+Version:2.62
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
@@ -35,6 +35,8 @@
 BuildRequires:  libidn-devel
 BuildRequires:  pkg-config
 BuildRequires:  systemd
+BuildRequires:  pkgconfig(libnetfilter_conntrack)
+
 %{?systemd_requires}
 
 %description
@@ -48,14 +50,16 @@
 booting of diskless machines.
 
 %prep
-%setup -n dnsmasq-%{version}
-%setup -T -D -a1 -n dnsmasq-%{version}
+%setup -q -n dnsmasq-%{version}
+%setup -q -T -D -a1 -n dnsmasq-%{version}
 %patch1 -p0
-echo #define HAVE_DBUS  src/config.h
 
 %build
+echo #define HAVE_DBUS  src/config.h
+echo #define HAVE_CONNTRACK  src/config.h
+echo #define HAVE_IDN  src/config.h
 mv po/no.po po/nb.po
-export RPM_OPT_FLAGS=$RPM_OPT_FLAGS -fPIC -DPIC -fpie -fno-strict-aliasing
+export CFLAGS=%optflags -std=gnu99 -fPIC -DPIC -fpie
 export LDFLAGS=-Wl,-z,relro,-z,now -pie
 make %{?_smp_mflags} AWK=gawk all-i18n
 
@@ -101,12 +105,12 @@
 install -m 644 dbus/dnsmasq.conf 
${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %SOURCE2 %{buildroot}/lib/systemd/system/dnsmasq.service
 install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
-%find_lang %{name}
+%find_lang %{name} --with-man
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib 
README.SUSE dbus
-%config(noreplace) /%{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sysconfdir}/init.d/dnsmasq
 %{_sbindir}/rcdnsmasq
 %{_sbindir}/dnsmasq
@@ -115,8 +119,6 @@
 %dir %{_sysconfdir}/slp.reg.d/
 %config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8.gz
-%{_mandir}/fr/man8/dnsmasq.8.gz
-%{_mandir}/es/man8/dnsmasq.8.gz
 /etc/dbus-1/system.d/dnsmasq.conf
 /lib/systemd/system/dnsmasq.service
 %dir %attr(0750,root,tftp) /srv/tftpboot

++ dnsmasq-2.61.tar.gz - dnsmasq-2.62.tar.gz ++
 18936 lines of diff (skipped)

++ dnsmasq.service ++
--- /var/tmp/diff_new_pack.OR0Vkw/_old  2012-06-28 15:26:30.0 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new  2012-06-28 15:26:30.0 +0200
@@ -6,7 +6,7 @@
 Type=dbus
 BusName=uk.org.thekelleys.dnsmasq
 ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq --enable-dbus --keep-in-foreground
+ExecStart=/usr/sbin/dnsmasq --log-async --enable-dbus --keep-in-foreground
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]

++ group_and_isc.diff ++
--- /var/tmp/diff_new_pack.OR0Vkw/_old  2012-06-28 15:26:30.0 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new  2012-06-28 15:26:30.0 +0200
@@ -1,6 +1,6 @@
 man/dnsmasq.8
-+++ man/dnsmasq.8  2012/03/06 09:46:44
-@@ -118,8 +118,7 @@
+--- man/dnsmasq.8.orig
 man/dnsmasq.8
+@@ -118,8 +118,7 @@ can be over-ridden with this switch.
  .TP
  .B \-g, --group=groupname 
  Specify the group which dnsmasq will run
@@ -10,9 +10,18 @@
  .TP
  .B \-v, --version
  Print the version number.
 src/config.h
-+++ src/config.h   2012/03/06 09:46:26
-@@ -34,8 +34,8 @@
+--- src/config.h.orig
 src/config.h
+@@ -24,7 +24,7 @@
+ #define

commit dnsmasq for openSUSE:Factory

2012-05-07 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-05-07 22:44:52

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is u...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-03-08 
19:42:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-05-07 
22:46:56.0 +0200
@@ -1,0 +2,51 @@
+Sun Apr 29 19:16:43 UTC 2012 - pascal.ble...@opensuse.org
+
+- update to 2.61:
+  * add ra-names, ra-stateless and slaac keywords for DHCPv6: dnsmasq can now
+synthesise  records for dual-stack hosts which get IPv6 addresses via
+SLAAC; it is also now possible to use SLAAC and stateless DHCPv6, and to
+tell clients to use SLAAC addresses as well as DHCP ones
+  * add --dhcp-duid to allow DUID-EN uids to be used
+  * explicity send DHCPv6 replies to the correct port, instead of relying on
+clients to send requests with the correct source address, since at least
+one client in the wild gets this wrong
+  * send a preference value of 255 in DHCPv6 replies when --dhcp-authoritative
+is in effect: his tells clients not to wait around for other DHCP servers
+  * better logging of DHCPv6 options
+  * add --host-record
+  * invoke the DHCP script with action tftp when a TFTP file transfer
+completes: the size of the file, address to which it was sent and complete
+pathname are supplied; note that version 2.60 introduced some script
+incompatibilties associated with DHCPv6, and this is a further change; to
+be safe, scripts should ignore unknown actions, and if not IPv6-aware,
+should exit if the environment variable DNSMASQ_IAID is set; the use-case
+for this is to track netboot/install
+  * update contrib/port-forward/dnsmasq-portforward to reflect the above
+  * set the environment variable DNSMASQ_LOG_DHCP when running the script id
+--log-dhcp is in effect, so that script can taylor their logging verbosity
+  * arrange that addresses specified with --listen-address work even if there
+is no interface carrying the address; this is chiefly useful for IPv4
+loopback addresses, where any address in 127.0.0.0/8 is a valid loopback
+address, but normally only 127.0.0.1 appears on the lo interface
+  * fix crash, introduced in 2.60, when a DHCPINFORM is received from a network
+which has no valid dhcp-range
+  * add a new DHCP lease time keyword, deprecated for --dhcp-range: this is
+only valid for IPv6, and sets the preffered lease time for both DHCP and RA
+to zero; the effect is that clients can continue to use the address for
+existing connections, but new connections will use other addresses, if they
+exist; this makes hitless renumbering at least possible
+  * fix bug in address6_available() which caused DHCPv6 lease aquistion to fail
+if more than one dhcp-range in use
+  * provide RDNSS and DNSSL data in router advertisements, using the settings
+provided for DHCP options option6:domain-search and option6:dns-server
+  * don't cache data from non-recursive nameservers, since it may erroneously
+look like a valid CNAME to a non-exitant name
+  * call SO_BINDTODEVICE on the DHCP socket(s) when doing DHCP on exacly one
+interface and --bind-interfaces is set; this makes the OpenStack use-case
+of one dnsmasq per virtual interface work
+  * give correct from-cache answers to explict CNAME queries
+  * add --tftp-lowercase option
+  * ensure that the DBus DhcpLeaseUpdated events are generated when a lease
+goes through INIT_REBOOT state, even if the dhcp-script is not in use
+
+---

Old:

  dnsmasq-2.60.tar.bz2

New:

  dnsmasq-2.61.tar.gz



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.A4WLmI/_old  2012-05-07 22:46:57.0 +0200
+++ /var/tmp/diff_new_pack.A4WLmI/_new  2012-05-07 22:46:57.0 +0200
@@ -16,17 +16,16 @@
 #
 
 
-
 Name:   dnsmasq
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0+
 Group:  Productivity/Networking/DNS/Servers
-Version:2.60
+Version:2.61
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
-Source: %{name}-%{version}.tar.bz2
+Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz
 Source1:vendor-files.tar.bz2
 Source2:dnsmasq.service
 Patch1: group_and_isc.diff

-- 
To

commit dnsmasq for openSUSE:Factory

2012-03-08 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-03-08 19:42:40

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is u...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2012-02-10 
17:12:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-03-08 
19:42:42.0 +0100
@@ -1,0 +2,18 @@
+Tue Mar  6 10:13:09 CET 2012 - u...@suse.de
+
+- some dhcp fixes
+- Add Lua integration
+- Set TOS on DHCP sockets
+- Improve start-up speed when reading large hosts files
+- Fix problem if dnsmasq is started without the stdin
+- Allow the TFP server or boot server in --pxe-service
+- Support DHCPv6. Support is there for the sort of things
+  the existing v4 server does, including tags, options, 
+  static addresses and relay support
+- Support IPv6 router advertisements
+- Fix long-standing wrinkle with --localise-queries that
+  could result in wrong answers when DNS packets arrive
+  via an interface other than the expected one
+- 2.60
+
+---

Old:

  dnsmasq-2.59.tar.bz2
  manpage.diff

New:

  dnsmasq-2.60.tar.bz2



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.5ur4Wi/_old  2012-03-08 19:42:44.0 +0100
+++ /var/tmp/diff_new_pack.5ur4Wi/_new  2012-03-08 19:42:44.0 +0100
@@ -21,7 +21,7 @@
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 License:GPL-2.0+
 Group:  Productivity/Networking/DNS/Servers
-Version:2.59
+Version:2.60
 Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
@@ -30,7 +30,6 @@
 Source1:vendor-files.tar.bz2
 Source2:dnsmasq.service
 Patch1: group_and_isc.diff
-Patch3: manpage.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel
 BuildRequires:  libidn
@@ -53,7 +52,6 @@
 %setup -n dnsmasq-%{version}
 %setup -T -D -a1 -n dnsmasq-%{version}
 %patch1 -p0
-%patch3 -p0
 echo #define HAVE_DBUS  src/config.h
 
 %build

++ dnsmasq-2.59.tar.bz2 - dnsmasq-2.60.tar.bz2 ++
 30867 lines of diff (skipped)

++ group_and_isc.diff ++
--- /var/tmp/diff_new_pack.5ur4Wi/_old  2012-03-08 19:42:44.0 +0100
+++ /var/tmp/diff_new_pack.5ur4Wi/_new  2012-03-08 19:42:44.0 +0100
@@ -1,24 +1,25 @@
 src/config.h
-+++ src/config.h   2011/03/02 08:46:53
-@@ -62,8 +62,8 @@
- #endif
- 
- #define DEFLEASE 3600 /* default lease time, 1 hour */
--#define CHUSER nobody
--#define CHGRP dip
-+#define CHUSER dnsmasq
-+#define CHGRP nogroup
- #define NAMESERVER_PORT 53
- #define DHCP_SERVER_PORT 67
- #define DHCP_CLIENT_PORT 68
 --- man/dnsmasq.8
-+++ man/dnsmasq.8  2011/03/02 08:43:55
-@@ -118,7 +118,7 @@
 man/dnsmasq.8  2012/03/06 09:46:44
+@@ -118,8 +118,7 @@
  .TP
  .B \-g, --group=groupname 
  Specify the group which dnsmasq will run
 -as. The defaults to dip, if available, to facilitate access to
-+as. The defaults to dialout, if available, to facilitate access to
- /etc/ppp/resolv.conf which is not normally world readable.
+-/etc/ppp/resolv.conf which is not normally world readable.
++as. The defaults to nogroup.
  .TP
  .B \-v, --version
+ Print the version number.
+--- src/config.h
 src/config.h   2012/03/06 09:46:26
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER dnsmasq
++#define CHGRP nogroup
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE /dev/urandom

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit dnsmasq for openSUSE:Factory

2012-02-10 Thread h_root

Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory checked 
in at 2012-02-10 17:12:50

Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
 and  /work/SRC/openSUSE:Factory/.dnsmasq.new (New)


Package is dnsmasq, Maintainer is u...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes  2011-10-21 
16:28:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-02-10 
17:12:58.0 +0100
@@ -1,0 +2,39 @@
+Wed Feb  8 16:56:35 CET 2012 - u...@suse.de
+
+- added correct group for tftp
+  (bnc#738905)
+
+---
+Mon Feb  6 22:25:05 UTC 2012 - crrodrig...@opensuse.org
+
+- Use systemd macros correctly 
+- build with PIE and full RELRO.
+
+---
+Thu Jan 19 04:22:44 UTC 2012 - crrodrig...@opensuse.org
+
+- --enable-dbus must be explicit in systemd unit
+- default user is provided in config file or takes defaults on 
+  group_and_isc.diff
+
+---
+Wed Jan 18 21:34:25 UTC 2012 - crrodrig...@opensuse.org
+
+- dnsmasq has dbus support, use it for systemd service. 
+
+---
+Fri Nov 25 13:14:41 CET 2011 - u...@suse.de
+
+- removed systemd config for pre-12.1
+
+---
+Thu Nov 24 20:45:37 UTC 2011 - crrodrig...@opensuse.org
+
+- Must be of type forking and change uid to dnsmasq 
+
+---
+Thu Nov 24 20:19:11 UTC 2011 - crrodrig...@opensuse.org
+
+- Add systemd startup script 
+
+---

New:

  dnsmasq.service



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.ZcAEf1/_old  2012-02-10 17:13:01.0 +0100
+++ /var/tmp/diff_new_pack.ZcAEf1/_new  2012-02-10 17:13:01.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,19 +19,25 @@
 
 Name:   dnsmasq
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
-Version:2.59
-Release:1
-License:GPLv2+
+License:GPL-2.0+
 Group:  Productivity/Networking/DNS/Servers
+Version:2.59
+Release:0
 Provides:   dns_daemon
 PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
 Url:http://www.thekelleys.org.uk/dnsmasq/
 Source: %{name}-%{version}.tar.bz2
 Source1:vendor-files.tar.bz2
+Source2:dnsmasq.service
 Patch1: group_and_isc.diff
 Patch3: manpage.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  dbus-1-devel libidn libidn-devel pkg-config
+BuildRequires:  dbus-1-devel
+BuildRequires:  libidn
+BuildRequires:  libidn-devel
+BuildRequires:  pkg-config
+BuildRequires:  systemd
+%{?systemd_requires}
 
 %description
 Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP
@@ -52,23 +58,36 @@
 
 %build
 mv po/no.po po/nb.po
-export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing 
+export RPM_OPT_FLAGS=$RPM_OPT_FLAGS -fPIC -DPIC -fpie -fno-strict-aliasing
+export LDFLAGS=-Wl,-z,relro,-z,now -pie
 make %{?_smp_mflags} AWK=gawk all-i18n
 
 %pre
+if ! /usr/bin/getent group tftp /dev/null; then
+%{_sbindir}/groupadd -r tftp 2/dev/null || :
+fi
+if ! /usr/bin/getent passwd tftp /dev/null; then
+%{_sbindir}/useradd -c TFTP account -d /srv/tftpboot -G tftp -g tftp \
+  -r -s /bin/false tftp 2/dev/null || :
+fi
 if ! /usr/bin/getent passwd dnsmasq /dev/null; then
-/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c dnsmasq -g 
nogroup dnsmasq || :
+/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c dnsmasq -g 
nogroup -G tftp dnsmasq || :
 fi
 
+%service_add_pre %{name}.service
+
 %post
 %{fillup_and_insserv dnsmasq}
+%service_add_post %{name}.service
 
 %preun
 %stop_on_removal dnsmasq
+%service_del_preun %{name}.service
 
 %postun
 %restart_on_update dnsmasq
 %{insserv_cleanup}
+%service_del_postun %{name}.service
 
 %install
 make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk
@@ -83,6 +102,8 @@
 install -m 644 SuSEFirewall.dnsmasq-dhcp 
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755

commit dnsmasq for openSUSE:Factory

2011-09-01 Thread h_root


Hello community,

here is the log from the commit of package dnsmasq for openSUSE:Factory
checked in at Thu Sep 1 15:07:43 CEST 2011.




--- dnsmasq/dnsmasq.changes 2011-03-02 09:56:26.0 +0100
+++ /mounts/work_src_done/STABLE/dnsmasq/dnsmasq.changes2011-08-26 
21:15:36.0 +0200
@@ -1,0 +2,17 @@
+Fri Aug 26 21:12:04 CEST 2011 - u...@suse.de
+
+- Support scope-ids in IPv6 addresses of nameservers from
+  /etc/resolv.conf and in --server options
+- Fix bug which resulted in truncated files and timeouts for
+  some TFTP transfers
+- Allow the TFTP-server address in --dhcp-boot to be a
+  domain-name which is looked up in /etc/hosts
+- Tweak the behaviour of --domain-needed
+- Add support for Linux conntrack connection marking
+- Don't return NXDOMAIN to an  query if we have CNAME
+  which points to an A record only
+- logging fixes
+- many DHCP fixes and features (see Changelog)
+- update to 2.58 
+
+---

calling whatdependson for head-i586


Old:

  dnsmasq-2.57.tar.bz2

New:

  dnsmasq-2.58.tar.bz2



Other differences:
--
++ dnsmasq.spec ++
--- /var/tmp/diff_new_pack.xAhlq7/_old  2011-09-01 15:07:00.0 +0200
+++ /var/tmp/diff_new_pack.xAhlq7/_new  2011-09-01 15:07:00.0 +0200
@@ -20,7 +20,7 @@
 
 Name:   dnsmasq
 Summary:Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
-Version:2.57
+Version:2.58
 Release:1
 License:GPLv2+
 Group:  Productivity/Networking/DNS/Servers

++ dnsmasq-2.57.tar.bz2 - dnsmasq-2.58.tar.bz2 ++
 19872 lines of diff (skipped)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

39 matches

Mail list logo