OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dnsmasq?expand=0&rev=12

2008-09-13 01:47:51 +00:00 · 2008-09-13 01:47:51 +00:00 · ff460d5e8e
commit ff460d5e8e
parent c07afa9dab
6 changed files with 52 additions and 10 deletions
--- a/chuser.diff
+++ b/chuser.diff
@ -6,6 +6,6 @@
 #define DEFLEASE 3600 /* default lease time, 1 hour */
 -#define CHUSER "nobody"
 +#define CHUSER "dnsmasq"
- #define CHGRP "dialout"
+ #define CHGRP "nogroup"
 #define DHCP_SERVER_PORT 67
 #define DHCP_CLIENT_PORT 68
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Sep 13 00:51:49 CEST 2008 - mrueckert@suse.de
+
+- fix manpage.diff to actually apply
+- mark files below /etc as config
+- do not install README.SUSE in %install as %doc will clean the 
+  directory anyway.
+
+-------------------------------------------------------------------
+Fri Sep 12 15:10:55 CEST 2008 - ug@suse.de
+
+- user dnsmasq moved to group nogroup (bnc#401648)
+- added README.SUSE
+- added warning to init script when /etc/ppp is in use
+  since it's not readable anymore
+
 -------------------------------------------------------------------
 Tue Aug 19 10:41:48 CEST 2008 - ug@suse.de

--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@ -21,7 +21,7 @@
 Name:           dnsmasq
 Summary:        Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
 Version:        2.45
-Release:        2
+Release:        9
 License:        GPL v2 or later
 Group:          Productivity/Networking/DNS/Servers
 Provides:       dns_daemon
@ -32,6 +32,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        vendor-files.tar.bz2
 Patch1:         group_and_isc.diff 	
 Patch2:         chuser.diff
+Patch3:         manpage.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -55,6 +56,7 @@ Authors:
 %setup -T -D -a1 -n dnsmasq-%{version}
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0

 %build
 mv po/no.po po/nb.po
@ -94,20 +96,30 @@ install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/syscon

 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib
+%doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE
 %config(noreplace) /%{_sysconfdir}/dnsmasq.conf
 %{_sysconfdir}/init.d/dnsmasq
 %{_sbindir}/rcdnsmasq
 %{_sbindir}/dnsmasq
-%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dns
-%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
-%{_sysconfdir}/slp.reg.d/
-%attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
+%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
 %{_mandir}/fr/man8/dnsmasq.8.gz
 %{_mandir}/es/man8/dnsmasq.8.gz

 %changelog
+* Sat Sep 13 2008 mrueckert@suse.de
+- fix manpage.diff to actually apply
+- mark files below /etc as config
+- do not install README.SUSE in %%install as %%doc will clean the
+  directory anyway.
+* Fri Sep 12 2008 ug@suse.de
+- user dnsmasq moved to group nogroup (bnc#401648)
+- added README.SUSE
+- added warning to init script when /etc/ppp is in use
+  since it's not readable anymore
 * Tue Aug 19 2008 ug@suse.de
 - init script fixed
 * Mon Aug 11 2008 ug@suse.de
--- a/group_and_isc.diff
+++ b/group_and_isc.diff
@ -16,7 +16,7 @@
 #define DEFLEASE 3600 /* default lease time, 1 hour */
 #define CHUSER "nobody"
 -#define CHGRP "dip"
-+#define CHGRP "dialout"
+#define CHGRP "nogroup"
 #define DHCP_SERVER_PORT 67
 #define DHCP_CLIENT_PORT 68
 
--- a/manpage.diff
+++ b/manpage.diff
@ -0,0 +1,14 @@
+Index: man/dnsmasq.8
+===================================================================
+--- man/dnsmasq.8.orig	2008-09-13 00:44:42.000000000 +0200
+++ man/dnsmasq.8	2008-09-13 00:46:11.903791756 +0200
+@@ -106,8 +106,7 @@ can be over-ridden with this switch.
+ .TP
+ .B \-g, --group=<groupname> 
+ Specify the group which dnsmasq will run
+-as. The defaults to "dialout", 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/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae2065f36f3bd069e5ba6cdceb13ac396fe8e822bace756baf58f05a2e259abd
-size 1475
+oid sha256:6723f3b4330a1100cd1e462646d17a0167765cb018bcf846421611d638d74d72
+size 1804