patches fixed
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=36
This commit is contained in:
parent
dd13a63b48
commit
79157fa819
@ -30,7 +30,6 @@ Source: %{name}-%{version}.tar.bz2
|
|||||||
Source1: vendor-files.tar.bz2
|
Source1: vendor-files.tar.bz2
|
||||||
Source2: dnsmasq.service
|
Source2: dnsmasq.service
|
||||||
Patch1: group_and_isc.diff
|
Patch1: group_and_isc.diff
|
||||||
Patch3: manpage.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: libidn
|
BuildRequires: libidn
|
||||||
@ -53,7 +52,6 @@ booting of diskless machines.
|
|||||||
%setup -n dnsmasq-%{version}
|
%setup -n dnsmasq-%{version}
|
||||||
%setup -T -D -a1 -n dnsmasq-%{version}
|
%setup -T -D -a1 -n dnsmasq-%{version}
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
%patch3 -p0
|
|
||||||
echo "#define HAVE_DBUS" >> src/config.h
|
echo "#define HAVE_DBUS" >> src/config.h
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -1,16 +1,17 @@
|
|||||||
--- man/dnsmasq.8
|
--- man/dnsmasq.8
|
||||||
+++ man/dnsmasq.8 2012/03/06 09:37:36
|
+++ man/dnsmasq.8 2012/03/06 09:46:44
|
||||||
@@ -118,7 +118,7 @@
|
@@ -118,8 +118,7 @@
|
||||||
.TP
|
.TP
|
||||||
.B \-g, --group=<groupname>
|
.B \-g, --group=<groupname>
|
||||||
Specify the group which dnsmasq will run
|
Specify the group which dnsmasq will run
|
||||||
-as. The defaults to "dip", if available, to facilitate access to
|
-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
|
.TP
|
||||||
.B \-v, --version
|
.B \-v, --version
|
||||||
|
Print the version number.
|
||||||
--- src/config.h
|
--- 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 @@
|
@@ -34,8 +34,8 @@
|
||||||
#define ETHERSFILE "/etc/ethers"
|
#define ETHERSFILE "/etc/ethers"
|
||||||
#define RUNFILE "/var/run/dnsmasq.pid"
|
#define RUNFILE "/var/run/dnsmasq.pid"
|
||||||
|
14
manpage.diff
14
manpage.diff
@ -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.
|
|
Loading…
x
Reference in New Issue
Block a user