diff --git a/.cvsignore b/.cvsignore index b8c0589..f9b86f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ dnsmasq-2.30.tar.gz dnsmasq-2.31.tar.gz +dnsmasq-2.32.tar.gz diff --git a/dnsmasq-2.31-enable-dbus.patch b/dnsmasq-2.31-enable-dbus.patch deleted file mode 100644 index 75d5aa2..0000000 --- a/dnsmasq-2.31-enable-dbus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h ---- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 -+++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 -@@ -169,7 +169,7 @@ - /* platform independent options- uncomment to enable */ - /* #define HAVE_BROKEN_RTC */ - /* #define HAVE_ISC_READER */ --/* #define HAVE_DBUS */ -+#define HAVE_DBUS - - #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) - # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC diff --git a/dnsmasq-2.31-initscript.patch b/dnsmasq-2.31-initscript.patch deleted file mode 100644 index bad5547..0000000 --- a/dnsmasq-2.31-initscript.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init ---- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 -+++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 -@@ -0,0 +1,75 @@ -+#!/bin/sh -+# -+# Startup script for the DNS caching server -+# -+# chkconfig: - 99 01 -+# 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 -+ diff --git a/dnsmasq-2.32-enable-dbus.patch b/dnsmasq-2.32-enable-dbus.patch new file mode 100644 index 0000000..2eea4f3 --- /dev/null +++ b/dnsmasq-2.32-enable-dbus.patch @@ -0,0 +1,12 @@ +diff -urN dnsmasq-2.32/src/config.h dnsmasq-2.32-patched/src/config.h +--- dnsmasq-2.32/src/config.h 2006-06-09 14:52:06.000000000 -0500 ++++ dnsmasq-2.32-patched/src/config.h 2006-06-12 09:07:08.000000000 -0500 +@@ -156,7 +156,7 @@ + /* platform independent options- uncomment to enable */ + /* #define HAVE_BROKEN_RTC */ + /* #define HAVE_ISC_READER */ +-/* #define HAVE_DBUS */ ++#define HAVE_DBUS + + #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) + # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC diff --git a/dnsmasq-2.32-initscript.patch b/dnsmasq-2.32-initscript.patch new file mode 100644 index 0000000..0ffe130 --- /dev/null +++ b/dnsmasq-2.32-initscript.patch @@ -0,0 +1,79 @@ +diff -urN dnsmasq-2.32/rpm/dnsmasq.init dnsmasq-2.32-patched/rpm/dnsmasq.init +--- dnsmasq-2.32/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 ++++ dnsmasq-2.32-patched/rpm/dnsmasq.init 2006-06-12 09:06:09.000000000 -0500 +@@ -0,0 +1,75 @@ ++#!/bin/sh ++# ++# Startup script for the DNS caching server ++# ++# chkconfig: - 99 01 ++# 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 ++ diff --git a/dnsmasq.spec b/dnsmasq.spec index a008033..4f14e59 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.31 +Version: 2.32 Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -11,7 +11,7 @@ Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-i Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" BuildRequires: dbus-devel %endif @@ -34,7 +34,7 @@ machines. %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ $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 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq @@ -79,7 +79,7 @@ fi %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif %{_initrddir}/dnsmasq @@ -88,6 +88,10 @@ fi %changelog +* Mon Jun 12 2006 Patrick "Jima" Laughton 2.32-1 +- Update from upstream +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) diff --git a/sources b/sources index 1f2f23f..f4c2441 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz +d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz