Search results for "dnsmasq" - Fedora Mailing-Lists

rpms/dnsmasq/FC-3 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-3 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- 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 dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- 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 + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dnsmasq.spec 2 May 2006 16:48:07 -0000 1.8 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist}.1 +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript... Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu... -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-confi... BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -56,7 +54,7 @@ %if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -79,7 +77,7 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%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" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf @@ -90,8 +88,10 @@ %changelog -* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.2.fc3.1 -- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) +* Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs * Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.2 - More upstream-recommended cleanups :) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:40 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED ---

17 years, 11 months

rpms/dnsmasq/F-11 dnsmasq.init, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.23, 1.24 dnsmasq.spec, 1.38, 1.39 sources, 1.23, 1.24 dnsmasq-2.33-enable-dbus.patch, 1.1, NONE dnsmasq-2.33-initscript.patch, 1.1, NONE dnsmasq-2.35-conf-dir.patch, 1.1, NONE dnsmasq-2.46-tftp-server-vulnerabilities.patch, 1.1, NONE dnsmasq-configuration.patch, 1.3, NONE dnsmasq-newglibc.patch, 1.1, NONE

by Itamar Reis Peixoto

Author: itamarjp Update of /cvs/pkgs/rpms/dnsmasq/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2649/F-11 Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq.init import.log Removed Files: dnsmasq-2.33-enable-dbus.patch dnsmasq-2.33-initscript.patch dnsmasq-2.35-conf-dir.patch dnsmasq-2.46-tftp-server-vulnerabilities.patch dnsmasq-configuration.patch dnsmasq-newglibc.patch Log Message: - new version 2.52 --- 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 pidfile=${PIDFILE-/var/run/dnsmasq.pid} lockfile=${LOCKFILE-/var/lock/subsys/dnsmasq} RETVAL=0 # See how we were called. case "$1" in start) echo -n "Starting dnsmasq: " daemon $dnsmasq $OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch ${lockfile} ;; stop) echo -n "Shutting down dnsmasq: " killproc -p ${pidfile} ${dnsmasq} RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile} ;; status) status dnsmasq RETVAL=$? ;; reload) echo -n "Reloading dnsmasq: " killproc -p ${pidfile} ${dnsmasq} -HUP RETVAL=$? echo ;; restart) $0 stop $0 start RETVAL=$? ;; condrestart) if test "x`pidfileofproc dnsmasq`" != x; then $0 stop $0 start RETVAL=$? fi ;; *) echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE import.log --- dnsmasq-2_52-1_fc13:F-11:dnsmasq-2.52-1.fc13.src.rpm:1264530262 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-11/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- .cvsignore 29 Dec 2008 01:39:59 -0000 1.23 +++ .cvsignore 26 Jan 2010 18:43:30 -0000 1.24 @@ -1 +1 @@ -dnsmasq-2.46.tar.gz +dnsmasq-2.52.tar.lzma Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-11/dnsmasq.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- dnsmasq.spec 5 Oct 2009 10:26:46 -0000 1.38 +++ dnsmasq.spec 26 Jan 2010 18:43:30 -0000 1.39 @@ -10,27 +10,25 @@ %endif Name: dnsmasq -Version: 2.46 -Release: 3%{?extraversion}%{?dist} +Version: 2.52 +Release: 1%{?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}%{?ex... -Patch0: %{name}-2.33-initscript.patch -Patch1: %{name}-configuration.patch -Patch2: %{name}-2.46-tftp-server-vulnerabilities.patch +Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex... +Source1: %{name}.init 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,9 +43,18 @@ machines. %prep %setup -q -n %{name}-%{version}%{?extraversion} -%patch0 -p1 -%patch1 -p1 -%patch2 -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 + %build make %{?_smp_mflags} @@ -56,7 +63,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 +71,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,9 +118,37 @@ fi %changelog -* Mon Oct 5 2009 Mark McLoughlin <markmc(a)redhat.com> - 2.46-3 +* Tue Jan 26 2010 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.52-1 +- New Version 2.52 +- fix condrestart() in initscript bz 547605 +- fix sed to enable DBUS(the '*' need some escaping) bz 553161 + +* Sun Nov 22 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-2 +- fix bz 512664 + +* Sat Oct 17 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-1 +- 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 +- new version 2.51 + +* Mon Oct 5 2009 Mark McLoughlin <markmc(a)redhat.com> - 2.48-4 - Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958) +* Wed Aug 12 2009 Ville Skyttä <ville.skytta(a)iki.fi> - 2.48-3 +- Use lzma compressed upstream tarball. + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.48-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jun 10 2009 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.48-1 +- Bugfix/feature enhancement update +- Fixing BZ#494094 + +* Fri May 29 2009 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.47-1 +- Bugfix/feature enhancement update + * Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.46-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-11/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- sources 29 Dec 2008 01:39:59 -0000 1.23 +++ sources 26 Jan 2010 18:43:31 -0000 1.24 @@ -1 +1 @@ -79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz +2d156f322564fdd71ad238040cd607ac dnsmasq-2.52.tar.lzma --- dnsmasq-2.33-enable-dbus.patch DELETED --- --- dnsmasq-2.33-initscript.patch DELETED --- --- dnsmasq-2.35-conf-dir.patch DELETED --- --- dnsmasq-2.46-tftp-server-vulnerabilities.patch DELETED --- --- dnsmasq-configuration.patch DELETED --- --- dnsmasq-newglibc.patch DELETED ---

14 years, 3 months

rpms/dnsmasq/F-12 dnsmasq.init, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.26, 1.27 dnsmasq.spec, 1.42, 1.43 sources, 1.26, 1.27 dnsmasq-2.33-initscript.patch, 1.2, NONE dnsmasq-2.48-tftp-server-vulnerabilities.patch, 1.1, NONE dnsmasq-configuration.patch, 1.5, NONE

by Itamar Reis Peixoto

Author: itamarjp Update of /cvs/pkgs/rpms/dnsmasq/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6208/F-12 Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq.init import.log Removed Files: dnsmasq-2.33-initscript.patch dnsmasq-2.48-tftp-server-vulnerabilities.patch dnsmasq-configuration.patch Log Message: new version 2.51 --- 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 --- NEW FILE import.log --- dnsmasq-2_51-1_fc12:F-12:dnsmasq-2.51-1.fc12.src.rpm:1258616775 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- .cvsignore 12 Aug 2009 17:05:49 -0000 1.26 +++ .cvsignore 19 Nov 2009 07:47:15 -0000 1.27 @@ -1 +1 @@ -dnsmasq-2.48.tar.lzma +dnsmasq-2.51.tar.lzma Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/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:40 -0000 1.42 +++ dnsmasq.spec 19 Nov 2009 07:47:16 -0000 1.43 @@ -10,27 +10,25 @@ %endif Name: dnsmasq -Version: 2.48 -Release: 4%{?extraversion}%{?dist} +Version: 2.51 +Release: 1%{?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}%{?ex... -Patch0: %{name}-2.33-initscript.patch -Patch1: %{name}-configuration.patch -Patch2: %{name}-2.48-tftp-server-vulnerabilities.patch +Source1: %{name}.init 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,9 +43,18 @@ machines. %prep %setup -q -n %{name}-%{version}%{?extraversion} -%patch0 -p1 -%patch1 -p1 -%patch2 -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 + %build make %{?_smp_mflags} @@ -56,7 +63,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 +71,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 +118,13 @@ fi %changelog +* Sat Oct 17 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-1 +- 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 +- new version 2.51 + * Mon Oct 5 2009 Mark McLoughlin <markmc(a)redhat.com> - 2.48-4 - Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 12 Aug 2009 17:05:49 -0000 1.26 +++ sources 19 Nov 2009 07:47:16 -0000 1.27 @@ -1 +1 @@ -014eae223140ec283b4301165db0509a dnsmasq-2.48.tar.lzma +0f048f3fd1f3888876867809d162cd89 dnsmasq-2.51.tar.lzma --- dnsmasq-2.33-initscript.patch DELETED --- --- dnsmasq-2.48-tftp-server-vulnerabilities.patch DELETED --- --- dnsmasq-configuration.patch DELETED ---

14 years, 5 months

rpms/dnsmasq/devel dnsmasq-2.32-enable-dbus.patch, NONE, 1.1 dnsmasq-2.32-initscript.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dnsmasq.spec, 1.6, 1.7 sources, 1.3, 1.4 dnsmasq-2.31-enable-dbus.patch, 1.1, NONE dnsmasq-2.31-initscript.patch, 1.1, NONE

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11673/devel Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch Removed Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Log Message: Update to 2.32 dnsmasq-2.32-enable-dbus.patch: --- NEW FILE dnsmasq-2.32-enable-dbus.patch --- 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 dnsmasq-2.32-initscript.patch: --- NEW FILE dnsmasq-2.32-initscript.patch --- 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 + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 May 2006 17:05:42 -0000 1.3 +++ .cvsignore 12 Jun 2006 14:30:20 -0000 1.4 @@ -1,2 +1,3 @@ dnsmasq-2.30.tar.gz dnsmasq-2.31.tar.gz +dnsmasq-2.32.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dnsmasq.spec 8 May 2006 15:51:19 -0000 1.6 +++ dnsmasq.spec 12 Jun 2006 14:30:20 -0000 1.7 @@ -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 @@ Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu... 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 @@ %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ $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 @@ %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 @@ %changelog +* Mon Jun 12 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-1 +- Update from upstream +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2006 15:51:19 -0000 1.3 +++ sources 12 Jun 2006 14:30:20 -0000 1.4 @@ -1 +1 @@ -26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz +d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz --- dnsmasq-2.31-enable-dbus.patch DELETED --- --- dnsmasq-2.31-initscript.patch DELETED ---

17 years, 10 months

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

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Log Message: More upstream-recommended cleanups :) 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:19:59 -0000 1.3 @@ -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-05-02 09:35:27.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500 +--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,7 +10,7 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid -@@ -19,19 +19,10 @@ +@@ -19,33 +19,9 @@ dnsmasq=/usr/sbin/dnsmasq [ -f $dnsmasq ] || exit 0 @@ -23,17 +23,29 @@ -# 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` + 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" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" fi -@@ -72,7 +63,13 @@ + + RETVAL=0 +@@ -72,7 +48,13 @@ status dnsmasq RETVAL=$? ;; @@ -48,20 +60,3 @@ $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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3 +++ dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -34,10 +34,10 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %if "%{dist}" != ".fc3" -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %endif %build @@ -53,7 +53,6 @@ $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/ @@ -80,7 +79,6 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %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 @@ -88,6 +86,11 @@ %changelog +* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.1 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + * Tue May 2 2006 Patrick "Jima" Laughton <jima(a)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

17 years, 12 months

rpms/dnsmasq/FC-5 dnsmasq-2.32-enable-dbus.patch, NONE, 1.1 dnsmasq-2.32-initscript.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dnsmasq.spec, 1.4, 1.5 sources, 1.3, 1.4 dnsmasq-2.31-enable-dbus.patch, 1.1, NONE dnsmasq-2.31-initscript.patch, 1.1, NONE

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360/FC-5 Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch Removed Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Log Message: Update to 2.32 dnsmasq-2.32-enable-dbus.patch: --- NEW FILE dnsmasq-2.32-enable-dbus.patch --- 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 dnsmasq-2.32-initscript.patch: --- NEW FILE dnsmasq-2.32-initscript.patch --- 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 + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 16:51:25 -0000 1.2 +++ .cvsignore 12 Jun 2006 15:01:16 -0000 1.3 @@ -1 +1,2 @@ dnsmasq-2.30.tar.gz +dnsmasq-2.32.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnsmasq.spec 8 May 2006 17:05:41 -0000 1.4 +++ dnsmasq.spec 12 Jun 2006 15:01:16 -0000 1.5 @@ -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 @@ Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu... 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 @@ %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ $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 @@ %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 @@ %changelog +* Mon Jun 12 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-1 +- Update from upstream +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2006 17:05:41 -0000 1.3 +++ sources 12 Jun 2006 15:01:16 -0000 1.4 @@ -1 +1 @@ -26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz +d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz --- dnsmasq-2.31-enable-dbus.patch DELETED --- --- dnsmasq-2.31-initscript.patch DELETED ---

17 years, 10 months

rpms/dnsmasq/FC-4 dnsmasq-2.32-enable-dbus.patch, NONE, 1.1 dnsmasq-2.32-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.4, 1.5 sources, 1.3, 1.4 dnsmasq-2.31-enable-dbus.patch, 1.1, NONE dnsmasq-2.31-initscript.patch, 1.1, NONE

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360/FC-4 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch Removed Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Log Message: Update to 2.32 dnsmasq-2.32-enable-dbus.patch: --- NEW FILE dnsmasq-2.32-enable-dbus.patch --- 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 dnsmasq-2.32-initscript.patch: --- NEW FILE dnsmasq-2.32-initscript.patch --- 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 + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnsmasq.spec 8 May 2006 17:05:40 -0000 1.4 +++ dnsmasq.spec 12 Jun 2006 15:01:14 -0000 1.5 @@ -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 @@ Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu... 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 @@ %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ $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 @@ %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 @@ %changelog +* Mon Jun 12 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-1 +- Update from upstream +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2006 17:05:40 -0000 1.3 +++ sources 12 Jun 2006 15:01:14 -0000 1.4 @@ -1 +1 @@ -26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz +d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz --- dnsmasq-2.31-enable-dbus.patch DELETED --- --- dnsmasq-2.31-initscript.patch DELETED ---

17 years, 10 months

rpms/dnsmasq/devel dnsmasq-2.33-enable-dbus.patch, NONE, 1.1 dnsmasq-2.33-initscript.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 dnsmasq.spec, 1.9, 1.10 sources, 1.4, 1.5 dnsmasq-2.32-enable-dbus.patch, 1.1, NONE dnsmasq-2.32-initscript.patch, 1.1, NONE

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6962/devel Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq-2.33-enable-dbus.patch dnsmasq-2.33-initscript.patch Removed Files: dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch Log Message: Update dnsmasq-2.33-enable-dbus.patch: --- NEW FILE dnsmasq-2.33-enable-dbus.patch --- diff -urN dnsmasq-2.33/src/config.h dnsmasq-2.33-patched/src/config.h --- dnsmasq-2.33/src/config.h 2006-08-04 06:02:36.000000000 -0500 +++ dnsmasq-2.33-patched/src/config.h 2006-08-15 15:14:19.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 dnsmasq-2.33-initscript.patch: --- NEW FILE dnsmasq-2.33-initscript.patch --- diff -urN dnsmasq-2.33/rpm/dnsmasq.init dnsmasq-2.33-patched/rpm/dnsmasq.init --- dnsmasq-2.33/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.33-patched/rpm/dnsmasq.init 2006-08-15 15:12:17.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 + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jun 2006 14:30:20 -0000 1.4 +++ .cvsignore 15 Aug 2006 20:35:02 -0000 1.5 @@ -1,3 +1 @@ -dnsmasq-2.30.tar.gz -dnsmasq-2.31.tar.gz -dnsmasq-2.32.tar.gz +dnsmasq-2.33.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dnsmasq.spec 22 Jul 2006 14:20:16 -0000 1.9 +++ dnsmasq.spec 15 Aug 2006 20:35:02 -0000 1.10 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.32 -Release: 3%{?dist} +Version: 2.33 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -15,9 +15,9 @@ BuildRequires: dbus-devel %endif -BuildRequires: pkgconfig +BuildRequires: pkgconfig -Requires(post): /sbin/chkconfig +Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -48,9 +48,9 @@ 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%{_sysconfdir}/sysconfig \ - $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d + $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 %if "%fedora" > "3" || "%aurora" > "2" @@ -90,6 +90,9 @@ %changelog +* Tue Aug 15 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.33-1 +- Update + * Sat Jul 22 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-3 - Added pkgconfig BuildReq due to reduced buildroot Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jun 2006 14:30:20 -0000 1.4 +++ sources 15 Aug 2006 20:35:02 -0000 1.5 @@ -1 +1 @@ -d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz +45696461b6e6bc929273b1191ca50447 dnsmasq-2.33.tar.gz --- dnsmasq-2.32-enable-dbus.patch DELETED --- --- dnsmasq-2.32-initscript.patch DELETED ---

17 years, 8 months

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

by 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}%{?ex... -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(a)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(a)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 ---

14 years, 6 months

rpms/dnsmasq/FC-3 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.6, 1.7

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-3 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="uk.org.thekelleys.dnsmasq"/> + <allow send_destination="uk.org.thekelleys.dnsmasq"/> + <allow send_interface="uk.org.thekelleys.dnsmasq"/> + </policy> + <policy context="default"> + <deny own="uk.org.thekelleys.dnsmasq"/> + <deny send_destination="uk.org.thekelleys.dnsmasq"/> + <deny send_interface="uk.org.thekelleys.dnsmasq"/> + </policy> +</busconfig> + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/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:54:51 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:48 -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-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + 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="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dnsmasq.spec 27 Apr 2006 15:54:51 -0000 1.6 +++ dnsmasq.spec 2 May 2006 16:37:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?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... Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu... +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-confi... 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,12 @@ 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 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 +78,24 @@ %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}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)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(a)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

17 years, 12 months

Search results for query "dnsmasq"