rpms/dnsmasq/devel dnsmasq.init, NONE, 1.1 dnsmasq.spec, 1.42, 1.43 dnsmasq-2.33-initscript.patch, 1.2, NONE dnsmasq-configuration.patch, 1.5, NONE

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6427

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq.init 
Removed Files:
	dnsmasq-2.33-initscript.patch dnsmasq-configuration.patch 
Log Message:
some improvement in dnsmasq initscript



--- NEW FILE dnsmasq.init ---
#!/bin/sh
#
# Startup script for the DNS caching server
#
# chkconfig: - 49 50
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

dnsmasq=/usr/sbin/dnsmasq
[ -f $dnsmasq ] || exit 0

DOMAIN_SUFFIX=`dnsdomainname`
if [ ! -z "${DOMAIN_SUFFIX}" ]; then
  OPTIONS="-s $DOMAIN_SUFFIX"
fi

RETVAL=0

# See how we were called.
case "$1" in
  start)
        echo -n "Starting dnsmasq: "
        daemon $dnsmasq $OPTIONS
	RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
        ;;
  stop)
        if test "x`pidof dnsmasq`" != x; then
            echo -n "Shutting down dnsmasq: "
            killproc dnsmasq
        fi
	RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
        ;;
  status)
	status dnsmasq
	RETVAL=$?
	;;
  reload)
	echo -n "Reloading dnsmasq: "
	killproc dnsmasq -HUP
	RETVAL=$?
	echo
	;;
  restart)
	$0 stop
	$0 start
	RETVAL=$?
	;;
  condrestart)
	    if test "x`/sbin/pidof dnsmasq`" != x; then
		$0 stop
		$0 start
		RETVAL=$?
	    fi
	    ;;
  *)
        echo "Usage: $0 {start|stop|restart|reload|condrestart|status}"
        exit 1
esac

exit $RETVAL



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- dnsmasq.spec	5 Oct 2009 10:26:35 -0000	1.42
+++ dnsmasq.spec	17 Oct 2009 23:08:16 -0000	1.43
@@ -11,26 +11,25 @@
 
 Name:           dnsmasq
 Version:        2.48
-Release:        4%{?extraversion}%{?dist}
+Release:        5%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPLv2 or GPLv3
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
-Patch0:         %{name}-2.33-initscript.patch
-Patch1:         %{name}-configuration.patch
+Source1:        %{name}.init
 Patch2:         %{name}-2.48-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
 BuildRequires:  pkgconfig
 
-Requires(post):  /sbin/chkconfig
-Requires(post):  /sbin/service
-Requires(post):  /bin/sed /bin/grep
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post):  chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+Requires(post):  initscripts
 
 %description
 Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. 
@@ -45,8 +44,18 @@ machines.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1
-%patch1 -p1
+
+# use /var/lib/dnsmasq instead of /var/lib/misc
+for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
+    sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
+done
+
+#enable dbus
+sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+
+#enable /etc/dnsmasq.d fix bz 526703
+sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
+
 %patch2 -p1
 
 %build
@@ -56,7 +65,7 @@ make %{?_smp_mflags}
 %install
 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} \
+mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
         $RPM_BUILD_ROOT%{_mandir}/man8 \
         $RPM_BUILD_ROOT%{_var}/lib/dnsmasq \
         $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
@@ -64,7 +73,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
 install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
-install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
+install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
 install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 %clean
@@ -111,6 +120,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.48-5
+- move initscript from patch to a plain text file
+- drop (dnsmasq-configuration.patch) and use sed instead
+- enable /etc/dnsmasq.d fix bz 526703
+- change requires to package name instead of file
+
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
 - Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
 


--- dnsmasq-2.33-initscript.patch DELETED ---


--- dnsmasq-configuration.patch DELETED ---