Accepting request 266355 from home:nemysis:branches:network

Please accept these changes.

OBS-URL: https://build.opensuse.org/request/show/266355
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=67

dnsmasq-2.71.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d8c64f66a396442e01b639df3ea6b4e02ba88cbe206c80be8de68b6841634c4
-size 641092

dnsmasq-2.72.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:635f1b47417d17cf32e45cfcfd0213ac39fd09918479a25373ba9b2ce4adc05d
+size 654739

dnsmasq-rpmlintrc

@@ -0,0 +1,6 @@
+# This are example scripts
+addFilter("doc-file-dependency")
+# This is correct symlink after installation
+addFilter("dangling-symlink")
+# This is correct user
+addFilter("non-standard-uid")

dnsmasq.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Thu Dec 25 06:32:18 UTC 2014 - nemysis@gmx.ch
+
+- Remove from spec group_and_isc.patch, forgotten in previous commit
+
+-------------------------------------------------------------------
+Wed Dec 24 22:29:52 UTC 2014 - nemysis@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
+
+
 -------------------------------------------------------------------
 Sun Nov  9 09:30:07 UTC 2014 - seife+obs@b1-systems.com
 

dnsmasq.spec

@@ -20,20 +20,21 @@ Name:           dnsmasq
 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 @@ Utilities that use the standard DHCP protocol to query/remove a DHCP
 server's leases.
 
 %prep
-%setup -q -n dnsmasq-%{version}
+%setup -q -n %{name}-%{version}
-%patch1 -p1
+
+# 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 to "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
 
 %build
 echo "#define HAVE_DBUS" >> src/config.h
@@ -130,7 +145,7 @@ rm -rf contrib/MacOSX-launchd
 %find_lang %{name} --with-man
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dnsmasq.conf.example contrib dbus
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
@@ -148,7 +163,7 @@ rm -rf contrib/MacOSX-launchd
 %dir %attr(0750,tftp,tftp) /srv/tftpboot
 
 %files utils
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/dhcp_*
 %{_mandir}/man1/dhcp_*
 

group_and_isc.patch

@@ -1,64 +0,0 @@
----
- Makefile      |    4 ++--
- man/dnsmasq.8 |    1 +
- src/config.h  |    6 +++---
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-Index: dnsmasq-2.71/Makefile
-===================================================================
---- dnsmasq-2.71.orig/Makefile
-+++ dnsmasq-2.71/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
-@@ -150,7 +150,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)
-Index: dnsmasq-2.71/man/dnsmasq.8
-===================================================================
---- dnsmasq-2.71.orig/man/dnsmasq.8
-+++ dnsmasq-2.71/man/dnsmasq.8
-@@ -135,6 +135,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.
-Index: dnsmasq-2.71/src/config.h
-===================================================================
---- dnsmasq-2.71.orig/src/config.h
-+++ dnsmasq-2.71/src/config.h
-@@ -25,7 +25,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. */
-@@ -36,8 +36,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"