Uwe Gansert 2012-03-06 09:48:01 +00:00 committed by Git OBS Bridge
parent dd13a63b48
commit 79157fa819
3 changed files with 6 additions and 21 deletions

View File

@ -30,7 +30,6 @@ 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
BuildRequires: libidn
@ -53,7 +52,6 @@ booting of diskless machines.
%setup -n dnsmasq-%{version}
%setup -T -D -a1 -n dnsmasq-%{version}
%patch1 -p0
%patch3 -p0
echo "#define HAVE_DBUS" >> src/config.h
%build

View File

@ -1,16 +1,17 @@
--- man/dnsmasq.8
+++ man/dnsmasq.8 2012/03/06 09:37:36
@@ -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 "nogroup", 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:36:38
+++ src/config.h 2012/03/06 09:46:26
@@ -34,8 +34,8 @@
#define ETHERSFILE "/etc/ethers"
#define RUNFILE "/var/run/dnsmasq.pid"

View File

@ -1,14 +0,0 @@
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.