From aa950b365890131567d4bf8e81f5e221f27c7f20 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Tue, 2 May 2006 15:51:01 +0000 Subject: [PATCH] Fixed bug #190379 Moved options from init script to sysconfig file --- dnsmasq-2.30-initscript.patch | 59 +++++++++++++++++++++++++++++++++-- dnsmasq.spec | 19 +++++++++-- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dnsmasq-2.30-initscript.patch b/dnsmasq-2.30-initscript.patch index 9c45a2b..fff027e 100644 --- a/dnsmasq-2.30-initscript.patch +++ b/dnsmasq-2.30-initscript.patch @@ -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 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh # 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="" diff --git a/dnsmasq.spec b/dnsmasq.spec index e535838..81c9ce2 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -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 @@ URL: http://www.thekelleys.org.uk/dnsmasq/ 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 @@ machines. %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,13 @@ make %{?_smp_mflags} 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 @@ fi %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 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 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