rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3

Tue May 2 15:51:01 UTC 2006

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13870/devel

Modified Files:
	dnsmasq-2.30-initscript.patch dnsmasq.spec 
Log Message:

Fixed bug #190379
Moved options from init script to sysconfig file


dnsmasq-2.30-initscript.patch:

Index: dnsmasq-2.30-initscript.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- dnsmasq-2.30-initscript.patch	27 Apr 2006 15:16:45 -0000	1.1
+++ dnsmasq-2.30-initscript.patch	2 May 2006 15:51:01 -0000	1.2
@@ -1,6 +1,6 @@
 diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
---- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
-+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
+--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-05-02 09:35:27.000000000 -0500
++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-05-02 09:48:47.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  # Startup script for the DNS caching server
@@ -10,3 +10,58 @@
  # description: This script starts your DNS caching server
  # processname: dnsmasq
  # pidfile: /var/run/dnsmasq.pid
+@@ -19,19 +19,10 @@
+ dnsmasq=/usr/sbin/dnsmasq
+ [ -f $dnsmasq ] || exit 0
+ 
+-# change this line if you want dnsmasq to serve an MX record for 
+-# the host it is running on. 
+-MAILHOSTNAME=""
+-# change this line if you want dns to get its upstream servers from
+-# somewhere other that /etc/resolv.conf 
+-RESOLV_CONF=""
+-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from
+-# a dhcpd's lease file
+-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
+-DOMAIN_SUFFIX=`dnsdomainname`
+-
+-OPTIONS=""
++# source /etc/sysconfig/dnsmasq if it exists
++[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq
+ 
++# apply options from /etc/sysconfig/dnsmasq if they're set
+ if [ ! -z "${MAILHOSTNAME}" ]; then
+   OPTIONS="$OPTIONS -m $MAILHOSTNAME"
+ fi
+@@ -72,7 +63,13 @@
+ 	status dnsmasq
+ 	RETVAL=$?
+ 	;;
+-  restart|reload)
++  reload)
++	echo -n "Reloading dnsmasq: "
++	killproc dnsmasq -HUP
++	RETVAL=$?
++	echo
++	;;
++  restart)
+ 	$0 stop
+ 	$0 start
+ 	RETVAL=$?
+diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig
+--- dnsmasq-2.30/rpm/dnsmasq.sysconfig	1969-12-31 18:00:00.000000000 -0600
++++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig	2006-05-02 09:49:42.000000000 -0500
+@@ -0,0 +1,13 @@
++# change this line if you want dnsmasq to serve an MX record for
++# the host it is running on.
++MAILHOSTNAME=""
++# change this line if you want dns to get its upstream servers from
++# somewhere other that /etc/resolv.conf
++RESOLV_CONF=""
++# change this if you want dnsmasq to cache any "hostname" or "client-hostname" 
++# from a dhcpd's lease file
++# (deprecated!)
++#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
++DOMAIN_SUFFIX=`dnsdomainname`
++# other options?
++OPTIONS=""


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq.spec	27 Apr 2006 15:06:50 -0000	1.2
+++ dnsmasq.spec	2 May 2006 15:51:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -9,6 +9,7 @@
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch
 Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch
+Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{dist}" != ".fc3"
@@ -36,6 +37,7 @@
 %patch0 -p1
 %if "%{dist}" != ".fc3"
 %patch1 -p1
+%patch2 -p1
 %endif
 
 %build
@@ -46,9 +48,13 @@
 rm -rf $RPM_BUILD_ROOT
 # normally i'd do 'make install'...it's a bit messy, though
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
-	$RPM_BUILD_ROOT%{_mandir}/man8
+	$RPM_BUILD_ROOT%{_mandir}/man8 \
+	$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+	$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
+install rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq
+install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
 install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
 install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
@@ -73,13 +79,20 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
-%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 %{_initrddir}/dnsmasq
 %{_sbindir}/dnsmasq
 %{_mandir}/man8/dnsmasq*
 
 
 %changelog
+* Tue May  2 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-4
+- Moved options out of init script and into /etc/sysconfig/dnsmasq
+- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379
+- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball
+
 * Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
 - Split initscript & enable-dbus patches, conditionalized dbus for FC3


