Search results for "dnsmasq" - Fedora Mailing-Lists

rpms/dnsmasq/devel .cvsignore, 1.24, 1.25 dnsmasq-2.33-initscript.patch, 1.1, 1.2 dnsmasq-configuration.patch, 1.4, 1.5 dnsmasq.spec, 1.38, 1.39 sources, 1.24, 1.25 dnsmasq-2.33-enable-dbus.patch, 1.1, NONE dnsmasq-2.35-conf-dir.patch, 1.1, NONE dnsmasq-newglibc.patch, 1.1, NONE

by Patrick Laughton

Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16807 Modified Files: .cvsignore dnsmasq-2.33-initscript.patch dnsmasq-configuration.patch dnsmasq.spec sources Removed Files: dnsmasq-2.33-enable-dbus.patch dnsmasq-2.35-conf-dir.patch dnsmasq-newglibc.patch Log Message: * Wed Jun 10 2009 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.48-1 - Bugfix/feature enhancement update - Fixing BZ#494094 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- .cvsignore 29 May 2009 14:08:10 -0000 1.24 +++ .cvsignore 10 Jun 2009 12:36:25 -0000 1.25 @@ -1 +1 @@ -dnsmasq-2.47.tar.gz +dnsmasq-2.48.tar.gz dnsmasq-2.33-initscript.patch: Index: dnsmasq-2.33-initscript.patch =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq-2.33-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- dnsmasq-2.33-initscript.patch 15 Aug 2006 20:35:02 -0000 1.1 +++ dnsmasq-2.33-initscript.patch 10 Jun 2009 12:36:25 -0000 1.2 @@ -6,7 +6,7 @@ diff -urN dnsmasq-2.33/rpm/dnsmasq.init +# +# Startup script for the DNS caching server +# -+# chkconfig: - 99 01 ++# chkconfig: - 49 50 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.pid dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq-configuration.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- dnsmasq-configuration.patch 29 May 2009 14:08:10 -0000 1.4 +++ dnsmasq-configuration.patch 10 Jun 2009 12:36:25 -0000 1.5 @@ -1,7 +1,7 @@ -diff -urN dnsmasq-2.47/dnsmasq.conf.example.orig dnsmasq-2.47/dnsmasq.conf.example ---- dnsmasq-2.47/dnsmasq.conf.example.orig 2009-01-03 14:28:51.000000000 -0600 -+++ dnsmasq-2.47/dnsmasq.conf.example 2009-05-29 08:34:56.000000000 -0500 -@@ -381,7 +381,7 @@ +diff -up dnsmasq-2.48/dnsmasq.conf.example.orig dnsmasq-2.48/dnsmasq.conf.example +--- dnsmasq-2.48/dnsmasq.conf.example.orig 2009-04-04 06:39:29.000000000 -0500 ++++ dnsmasq-2.48/dnsmasq.conf.example 2009-06-10 07:13:33.000000000 -0500 +@@ -410,7 +410,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. @@ -10,10 +10,10 @@ diff -urN dnsmasq-2.47/dnsmasq.conf.exam # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, -diff -urN dnsmasq-2.47/man/dnsmasq.8.orig dnsmasq-2.47/man/dnsmasq.8 ---- dnsmasq-2.47/man/dnsmasq.8.orig 2009-01-28 04:31:53.000000000 -0600 -+++ dnsmasq-2.47/man/dnsmasq.8 2009-05-29 08:34:56.000000000 -0500 -@@ -1189,7 +1189,7 @@ +diff -up dnsmasq-2.48/man/dnsmasq.8.orig dnsmasq-2.48/man/dnsmasq.8 +--- dnsmasq-2.48/man/dnsmasq.8.orig 2009-06-03 15:58:30.000000000 -0500 ++++ dnsmasq-2.48/man/dnsmasq.8 2009-06-10 07:13:33.000000000 -0500 +@@ -1249,7 +1249,7 @@ file needs a 1GHz processor and about 60 .IR /etc/ethers @@ -22,10 +22,10 @@ diff -urN dnsmasq-2.47/man/dnsmasq.8.ori .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.47/man/es/dnsmasq.8.orig dnsmasq-2.47/man/es/dnsmasq.8 ---- dnsmasq-2.47/man/es/dnsmasq.8.orig 2008-11-17 05:48:33.000000000 -0600 -+++ dnsmasq-2.47/man/es/dnsmasq.8 2009-05-29 08:34:56.000000000 -0500 -@@ -1222,7 +1222,7 @@ +diff -up dnsmasq-2.48/man/es/dnsmasq.8.orig dnsmasq-2.48/man/es/dnsmasq.8 +--- dnsmasq-2.48/man/es/dnsmasq.8.orig 2009-03-14 17:28:26.000000000 -0500 ++++ dnsmasq-2.48/man/es/dnsmasq.8 2009-06-10 07:13:33.000000000 -0500 +@@ -1222,7 +1222,7 @@ un CPU de 1GHz y aproximadamente 60MB de .IR /etc/ethers @@ -34,9 +34,9 @@ diff -urN dnsmasq-2.47/man/es/dnsmasq.8. .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.47/src/config.h.orig dnsmasq-2.47/src/config.h ---- dnsmasq-2.47/src/config.h.orig 2009-02-05 06:14:24.000000000 -0600 -+++ dnsmasq-2.47/src/config.h 2009-05-29 08:34:45.000000000 -0500 +diff -up dnsmasq-2.48/src/config.h.orig dnsmasq-2.48/src/config.h +--- dnsmasq-2.48/src/config.h.orig 2009-05-29 04:23:48.000000000 -0500 ++++ dnsmasq-2.48/src/config.h 2009-06-10 07:13:21.000000000 -0500 @@ -45,7 +45,7 @@ # elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases" @@ -46,8 +46,8 @@ diff -urN dnsmasq-2.47/src/config.h.orig # endif #endif -@@ -167,7 +167,7 @@ - /* platform independent options- uncomment to enable */ +@@ -163,7 +163,7 @@ NOTES: + #define HAVE_DHCP #define HAVE_TFTP /* #define HAVE_BROKEN_RTC */ -/* #define HAVE_DBUS */ Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- dnsmasq.spec 29 May 2009 14:08:10 -0000 1.38 +++ dnsmasq.spec 10 Jun 2009 12:36:25 -0000 1.39 @@ -10,7 +10,7 @@ %endif Name: dnsmasq -Version: 2.47 +Version: 2.48 Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -109,6 +109,10 @@ fi %changelog +* 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 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- sources 29 May 2009 14:08:10 -0000 1.24 +++ sources 10 Jun 2009 12:36:25 -0000 1.25 @@ -1 +1 @@ -4524081e56d0b935717d493e8e8d3e11 dnsmasq-2.47.tar.gz +8e12a386831b0b597c8a078f31d3fbd5 dnsmasq-2.48.tar.gz --- dnsmasq-2.33-enable-dbus.patch DELETED --- --- dnsmasq-2.35-conf-dir.patch DELETED --- --- dnsmasq-newglibc.patch DELETED ---

14 years, 10 months

rpms/dnsmasq/devel dnsmasq-configuration.patch, 1.1, 1.2 dnsmasq.spec, 1.33, 1.34

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16085 Modified Files: dnsmasq-configuration.patch dnsmasq.spec Log Message: - Dropped patch for newer glibc (merged upstream) dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq-configuration.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-configuration.patch 4 Dec 2007 15:46:52 -0000 1.1 +++ dnsmasq-configuration.patch 16 Jul 2008 19:28:52 -0000 1.2 @@ -1,28 +1,31 @@ -diff -up dnsmasq-2.41test20/src/config.h.orig dnsmasq-2.41test20/src/config.h ---- dnsmasq-2.41test20/src/config.h.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/src/config.h 2007-12-04 08:21:49.000000000 -0600 -@@ -42,7 +42,7 @@ - #elif defined(__sun__) - # define LEASEFILE "/var/cache/dnsmasq.leases" - #else --# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -+# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" - #endif - #if defined(__FreeBSD__) - # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -182,7 +182,7 @@ NOTES: - #define HAVE_TFTP - /* #define HAVE_BROKEN_RTC */ - /* #define HAVE_ISC_READER */ --/* #define HAVE_DBUS */ -+#define HAVE_DBUS +diff -urN dnsmasq-2.43/contrib/dnslist/dnslist.pl dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl +--- dnsmasq-2.43/contrib/dnslist/dnslist.pl 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl 2008-07-16 14:23:16.000000000 -0500 +@@ -44,7 +44,7 @@ + + # Location of state file. (This is the dnsmasq default.) + # Change with -s <file> +-my $dnsmasq_state_file = '/var/lib/misc/dnsmasq.leases'; ++my $dnsmasq_state_file = '/var/lib/dnsmasq/dnsmasq.leases'; + # Location of template. (Assumed to be in current directory.) + # Change with -t <file> + my $html_template_file = 'dnslist.tt2'; +diff -urN dnsmasq-2.43/dnsmasq.conf.example dnsmasq-2.43-patched/dnsmasq.conf.example +--- dnsmasq-2.43/dnsmasq.conf.example 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/dnsmasq.conf.example 2008-07-16 14:23:29.000000000 -0500 +@@ -351,7 +351,7 @@ + # The DHCP server needs somewhere on disk to keep its lease database. + # This defaults to a sane location, but if you want to change it, use + # the line below. +-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases ++#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases - #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) - # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC -diff -up dnsmasq-2.41test20/man/es/dnsmasq.8.orig dnsmasq-2.41test20/man/es/dnsmasq.8 ---- dnsmasq-2.41test20/man/es/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/man/es/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 -@@ -1075,7 +1075,7 @@ un CPU de 1GHz y aproximadamente 60MB de + # Set the DHCP server to authoritative mode. In this mode it will barge in + # and take over the lease for any client which broadcasts on the network, +diff -urN dnsmasq-2.43/man/dnsmasq.8 dnsmasq-2.43-patched/man/dnsmasq.8 +--- dnsmasq-2.43/man/dnsmasq.8 2008-07-10 10:48:14.000000000 -0500 ++++ dnsmasq-2.43-patched/man/dnsmasq.8 2008-07-16 14:22:35.000000000 -0500 +@@ -1116,7 +1116,7 @@ .IR /etc/ethers @@ -31,10 +34,10 @@ .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.41test20/man/dnsmasq.8.orig dnsmasq-2.41test20/man/dnsmasq.8 ---- dnsmasq-2.41test20/man/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/man/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 -@@ -1070,7 +1070,7 @@ file needs a 1GHz processor and about 60 +diff -urN dnsmasq-2.43/man/es/dnsmasq.8 dnsmasq-2.43-patched/man/es/dnsmasq.8 +--- dnsmasq-2.43/man/es/dnsmasq.8 2008-06-02 13:58:52.000000000 -0500 ++++ dnsmasq-2.43-patched/man/es/dnsmasq.8 2008-07-16 14:22:48.000000000 -0500 +@@ -1145,7 +1145,7 @@ .IR /etc/ethers @@ -43,21 +46,36 @@ .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.41test20/dnsmasq.conf.example.orig dnsmasq-2.41test20/dnsmasq.conf.example ---- dnsmasq-2.41test20/dnsmasq.conf.example.orig 2007-11-27 14:09:01.000000000 -0600 -+++ dnsmasq-2.41test20/dnsmasq.conf.example 2007-12-04 08:44:16.000000000 -0600 -@@ -344,7 +344,7 @@ - # The DHCP server needs somewhere on disk to keep its lease database. - # This defaults to a sane location, but if you want to change it, use - # the line below. --#dhcp-leasefile=/var/lib/misc/dnsmasq.leases -+#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases +diff -urN dnsmasq-2.43/man/fr/dnsmasq.8 dnsmasq-2.43-patched/man/fr/dnsmasq.8 +--- dnsmasq-2.43/man/fr/dnsmasq.8 2008-07-11 03:28:28.000000000 -0500 ++++ dnsmasq-2.43-patched/man/fr/dnsmasq.8 2008-07-16 14:22:54.000000000 -0500 +@@ -1280,7 +1280,7 @@ - # Set the DHCP server to authoritative mode. In this mode it will barge in - # and take over the lease for any client which broadcasts on the network, -@@ -461,4 +461,4 @@ + .IR /etc/ethers + +-.IR /var/lib/misc/dnsmasq.leases ++.IR /var/lib/dnsmasq/dnsmasq.leases + + .IR /var/db/dnsmasq.leases + +diff -urN dnsmasq-2.43/src/config.h dnsmasq-2.43-patched/src/config.h +--- dnsmasq-2.43/src/config.h 2008-07-11 03:44:17.000000000 -0500 ++++ dnsmasq-2.43-patched/src/config.h 2008-07-16 14:21:02.000000000 -0500 +@@ -43,7 +43,7 @@ + #elif defined(__sun__) || defined (__sun) + # define LEASEFILE "/var/cache/dnsmasq.leases" + #else +-# define LEASEFILE "/var/lib/misc/dnsmasq.leases" ++# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" + #endif + #if defined(__FreeBSD__) + # define CONFFILE "/usr/local/etc/dnsmasq.conf" +@@ -167,7 +167,7 @@ + #define HAVE_TFTP + /* #define HAVE_BROKEN_RTC */ + /* #define HAVE_ISC_READER */ +-/* #define HAVE_DBUS */ ++#define HAVE_DBUS - # Include a another lot of configuration options. - #conf-file=/etc/dnsmasq.more.conf --#conf-dir=/etc/dnsmasq.d -+conf-dir=/etc/dnsmasq.d + #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) + # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- dnsmasq.spec 16 Jul 2008 19:11:57 -0000 1.33 +++ dnsmasq.spec 16 Jul 2008 19:28:52 -0000 1.34 @@ -11,7 +11,7 @@ Name: dnsmasq Version: 2.43 -Release: 1%{?extraversion}%{?dist} +Release: 2%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -20,7 +20,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex... Patch0: %{name}-2.33-initscript.patch Patch1: %{name}-configuration.patch -Patch2: %{name}-newglibc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -47,7 +46,6 @@ %setup -q -n %{name}-%{version}%{?extraversion} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build make %{?_smp_mflags} @@ -111,8 +109,9 @@ %changelog -* Wed Jul 16 2008 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.43-1 +* Wed Jul 16 2008 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.43-2 - New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113 +- Dropped patch for newer glibc (merged upstream) * Wed Feb 13 2008 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.8 - Added upstream-authored patch for newer glibc (thanks Simon!)

15 years, 9 months

rpms/dnsmasq/devel .cvsignore, 1.22, 1.23 dnsmasq-configuration.patch, 1.2, 1.3 dnsmasq.spec, 1.35, 1.36 sources, 1.22, 1.23

by Matej Cepl

Author: mcepl Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18706 Modified Files: .cvsignore dnsmasq-configuration.patch dnsmasq.spec sources Log Message: New upstream release. Fixes bug 472394. The main changes in the upstream release: * inclduded support for D-BUS * support DHCP clients in multiple DNS domains * allow for more that one MAC address in a dhcp-host line * many others Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 22 Jul 2008 00:52:10 -0000 1.22 +++ .cvsignore 29 Dec 2008 01:39:59 -0000 1.23 @@ -1 +1 @@ -dnsmasq-2.45.tar.gz +dnsmasq-2.46.tar.gz dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-configuration.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq-configuration.patch 16 Jul 2008 19:28:52 -0000 1.2 +++ dnsmasq-configuration.patch 29 Dec 2008 01:39:59 -0000 1.3 @@ -1,19 +1,7 @@ -diff -urN dnsmasq-2.43/contrib/dnslist/dnslist.pl dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl ---- dnsmasq-2.43/contrib/dnslist/dnslist.pl 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl 2008-07-16 14:23:16.000000000 -0500 -@@ -44,7 +44,7 @@ - - # Location of state file. (This is the dnsmasq default.) - # Change with -s <file> --my $dnsmasq_state_file = '/var/lib/misc/dnsmasq.leases'; -+my $dnsmasq_state_file = '/var/lib/dnsmasq/dnsmasq.leases'; - # Location of template. (Assumed to be in current directory.) - # Change with -t <file> - my $html_template_file = 'dnslist.tt2'; -diff -urN dnsmasq-2.43/dnsmasq.conf.example dnsmasq-2.43-patched/dnsmasq.conf.example ---- dnsmasq-2.43/dnsmasq.conf.example 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/dnsmasq.conf.example 2008-07-16 14:23:29.000000000 -0500 -@@ -351,7 +351,7 @@ +diff -up dnsmasq-2.46/dnsmasq.conf.example.orig dnsmasq-2.46/dnsmasq.conf.example +--- dnsmasq-2.46/dnsmasq.conf.example.orig 2008-10-21 15:41:01.000000000 +0200 ++++ dnsmasq-2.46/dnsmasq.conf.example 2008-12-29 02:14:18.000000000 +0100 +@@ -365,7 +365,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. @@ -22,10 +10,10 @@ # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, -diff -urN dnsmasq-2.43/man/dnsmasq.8 dnsmasq-2.43-patched/man/dnsmasq.8 ---- dnsmasq-2.43/man/dnsmasq.8 2008-07-10 10:48:14.000000000 -0500 -+++ dnsmasq-2.43-patched/man/dnsmasq.8 2008-07-16 14:22:35.000000000 -0500 -@@ -1116,7 +1116,7 @@ +diff -up dnsmasq-2.46/man/dnsmasq.8.orig dnsmasq-2.46/man/dnsmasq.8 +--- dnsmasq-2.46/man/dnsmasq.8.orig 2008-10-23 12:23:57.000000000 +0200 ++++ dnsmasq-2.46/man/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 +@@ -1171,7 +1171,7 @@ file needs a 1GHz processor and about 60 .IR /etc/ethers @@ -34,10 +22,10 @@ .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.43/man/es/dnsmasq.8 dnsmasq-2.43-patched/man/es/dnsmasq.8 ---- dnsmasq-2.43/man/es/dnsmasq.8 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/man/es/dnsmasq.8 2008-07-16 14:22:48.000000000 -0500 -@@ -1145,7 +1145,7 @@ +diff -up dnsmasq-2.46/man/es/dnsmasq.8.orig dnsmasq-2.46/man/es/dnsmasq.8 +--- dnsmasq-2.46/man/es/dnsmasq.8.orig 2008-11-03 12:18:56.000000000 +0100 ++++ dnsmasq-2.46/man/es/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 +@@ -1222,7 +1222,7 @@ un CPU de 1GHz y aproximadamente 60MB de .IR /etc/ethers @@ -46,21 +34,9 @@ .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.43/man/fr/dnsmasq.8 dnsmasq-2.43-patched/man/fr/dnsmasq.8 ---- dnsmasq-2.43/man/fr/dnsmasq.8 2008-07-11 03:28:28.000000000 -0500 -+++ dnsmasq-2.43-patched/man/fr/dnsmasq.8 2008-07-16 14:22:54.000000000 -0500 -@@ -1280,7 +1280,7 @@ - - .IR /etc/ethers - --.IR /var/lib/misc/dnsmasq.leases -+.IR /var/lib/dnsmasq/dnsmasq.leases - - .IR /var/db/dnsmasq.leases - -diff -urN dnsmasq-2.43/src/config.h dnsmasq-2.43-patched/src/config.h ---- dnsmasq-2.43/src/config.h 2008-07-11 03:44:17.000000000 -0500 -+++ dnsmasq-2.43-patched/src/config.h 2008-07-16 14:21:02.000000000 -0500 +diff -up dnsmasq-2.46/src/config.h.orig dnsmasq-2.46/src/config.h +--- dnsmasq-2.46/src/config.h.orig 2008-11-10 22:47:46.000000000 +0100 ++++ dnsmasq-2.46/src/config.h 2008-12-29 02:16:05.000000000 +0100 @@ -43,7 +43,7 @@ #elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases" @@ -70,12 +46,12 @@ #endif #if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -167,7 +167,7 @@ +@@ -159,7 +159,7 @@ NOTES: + /* platform independent options- uncomment to enable */ #define HAVE_TFTP /* #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 + /* Allow TFTP to be disabled with COPTS=-DNO_TFTP */ + #ifdef NO_TFTP Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- dnsmasq.spec 22 Jul 2008 00:52:10 -0000 1.35 +++ dnsmasq.spec 29 Dec 2008 01:39:59 -0000 1.36 @@ -10,7 +10,7 @@ %endif Name: dnsmasq -Version: 2.45 +Version: 2.46 Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -109,6 +109,9 @@ %changelog +* Mon Dec 29 2008 Matěj Cepl <mcepl(a)redhat.com> - 2.45-2 +- rebuilt + * Mon Jul 21 2008 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.45-1 - Upstream release (bugfixes) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Jul 2008 00:52:10 -0000 1.22 +++ sources 29 Dec 2008 01:39:59 -0000 1.23 @@ -1 +1 @@ -b7956e15c9766e05b3eca3ce88fdb616 dnsmasq-2.45.tar.gz +79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz

15 years, 4 months

rpms/dnsmasq/devel .cvsignore, 1.23, 1.24 dnsmasq-configuration.patch, 1.3, 1.4 dnsmasq.spec, 1.37, 1.38 sources, 1.23, 1.24

by Patrick Laughton

Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28103 Modified Files: .cvsignore dnsmasq-configuration.patch dnsmasq.spec sources Log Message: * Fri May 29 2009 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.47-1 - Bugfix/feature enhancement update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.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 29 May 2009 14:08:10 -0000 1.24 @@ -1 +1 @@ -dnsmasq-2.46.tar.gz +dnsmasq-2.47.tar.gz dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq-configuration.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- dnsmasq-configuration.patch 29 Dec 2008 01:39:59 -0000 1.3 +++ dnsmasq-configuration.patch 29 May 2009 14:08:10 -0000 1.4 @@ -1,7 +1,7 @@ -diff -up dnsmasq-2.46/dnsmasq.conf.example.orig dnsmasq-2.46/dnsmasq.conf.example ---- dnsmasq-2.46/dnsmasq.conf.example.orig 2008-10-21 15:41:01.000000000 +0200 -+++ dnsmasq-2.46/dnsmasq.conf.example 2008-12-29 02:14:18.000000000 +0100 -@@ -365,7 +365,7 @@ +diff -urN dnsmasq-2.47/dnsmasq.conf.example.orig dnsmasq-2.47/dnsmasq.conf.example +--- dnsmasq-2.47/dnsmasq.conf.example.orig 2009-01-03 14:28:51.000000000 -0600 ++++ dnsmasq-2.47/dnsmasq.conf.example 2009-05-29 08:34:56.000000000 -0500 +@@ -381,7 +381,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. @@ -10,10 +10,10 @@ diff -up dnsmasq-2.46/dnsmasq.conf.examp # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, -diff -up dnsmasq-2.46/man/dnsmasq.8.orig dnsmasq-2.46/man/dnsmasq.8 ---- dnsmasq-2.46/man/dnsmasq.8.orig 2008-10-23 12:23:57.000000000 +0200 -+++ dnsmasq-2.46/man/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 -@@ -1171,7 +1171,7 @@ file needs a 1GHz processor and about 60 +diff -urN dnsmasq-2.47/man/dnsmasq.8.orig dnsmasq-2.47/man/dnsmasq.8 +--- dnsmasq-2.47/man/dnsmasq.8.orig 2009-01-28 04:31:53.000000000 -0600 ++++ dnsmasq-2.47/man/dnsmasq.8 2009-05-29 08:34:56.000000000 -0500 +@@ -1189,7 +1189,7 @@ .IR /etc/ethers @@ -22,10 +22,10 @@ diff -up dnsmasq-2.46/man/dnsmasq.8.orig .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.46/man/es/dnsmasq.8.orig dnsmasq-2.46/man/es/dnsmasq.8 ---- dnsmasq-2.46/man/es/dnsmasq.8.orig 2008-11-03 12:18:56.000000000 +0100 -+++ dnsmasq-2.46/man/es/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 -@@ -1222,7 +1222,7 @@ un CPU de 1GHz y aproximadamente 60MB de +diff -urN dnsmasq-2.47/man/es/dnsmasq.8.orig dnsmasq-2.47/man/es/dnsmasq.8 +--- dnsmasq-2.47/man/es/dnsmasq.8.orig 2008-11-17 05:48:33.000000000 -0600 ++++ dnsmasq-2.47/man/es/dnsmasq.8 2009-05-29 08:34:56.000000000 -0500 +@@ -1222,7 +1222,7 @@ .IR /etc/ethers @@ -34,19 +34,19 @@ diff -up dnsmasq-2.46/man/es/dnsmasq.8.o .IR /var/db/dnsmasq.leases -diff -up dnsmasq-2.46/src/config.h.orig dnsmasq-2.46/src/config.h ---- dnsmasq-2.46/src/config.h.orig 2008-11-10 22:47:46.000000000 +0100 -+++ dnsmasq-2.46/src/config.h 2008-12-29 02:16:05.000000000 +0100 -@@ -43,7 +43,7 @@ - #elif defined(__sun__) || defined (__sun) - # define LEASEFILE "/var/cache/dnsmasq.leases" - #else --# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -+# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" +diff -urN dnsmasq-2.47/src/config.h.orig dnsmasq-2.47/src/config.h +--- dnsmasq-2.47/src/config.h.orig 2009-02-05 06:14:24.000000000 -0600 ++++ dnsmasq-2.47/src/config.h 2009-05-29 08:34:45.000000000 -0500 +@@ -45,7 +45,7 @@ + # elif defined(__sun__) || defined (__sun) + # define LEASEFILE "/var/cache/dnsmasq.leases" + # else +-# define LEASEFILE "/var/lib/misc/dnsmasq.leases" ++# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" + # endif #endif - #if defined(__FreeBSD__) - # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -159,7 +159,7 @@ NOTES: + +@@ -167,7 +167,7 @@ /* platform independent options- uncomment to enable */ #define HAVE_TFTP /* #define HAVE_BROKEN_RTC */ Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- dnsmasq.spec 24 Feb 2009 12:12:18 -0000 1.37 +++ dnsmasq.spec 29 May 2009 14:08:10 -0000 1.38 @@ -10,8 +10,8 @@ %endif Name: dnsmasq -Version: 2.46 -Release: 2%{?extraversion}%{?dist} +Version: 2.47 +Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -109,6 +109,9 @@ fi %changelog +* 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/devel/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 29 May 2009 14:08:10 -0000 1.24 @@ -1 +1 @@ -79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz +4524081e56d0b935717d493e8e8d3e11 dnsmasq-2.47.tar.gz

14 years, 11 months

rpms/dnsmasq/F-10 .cvsignore, 1.22, 1.23 dnsmasq-configuration.patch, 1.2, 1.3 dnsmasq.spec, 1.35, 1.36 sources, 1.22, 1.23

by Matej Cepl

Author: mcepl Update of /cvs/extras/rpms/dnsmasq/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19593 Modified Files: .cvsignore dnsmasq-configuration.patch dnsmasq.spec sources Log Message: New upstream release. Fixes bug 472394. The main changes in the upstream release: * inclduded support for D-BUS * support DHCP clients in multiple DNS domains * allow for more that one MAC address in a dhcp-host line * many others smaller and related changes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/F-10/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 22 Jul 2008 00:52:10 -0000 1.22 +++ .cvsignore 29 Dec 2008 01:42:34 -0000 1.23 @@ -1 +1 @@ -dnsmasq-2.45.tar.gz +dnsmasq-2.46.tar.gz dnsmasq-configuration.patch: Index: dnsmasq-configuration.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/F-10/dnsmasq-configuration.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq-configuration.patch 16 Jul 2008 19:28:52 -0000 1.2 +++ dnsmasq-configuration.patch 29 Dec 2008 01:42:34 -0000 1.3 @@ -1,19 +1,7 @@ -diff -urN dnsmasq-2.43/contrib/dnslist/dnslist.pl dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl ---- dnsmasq-2.43/contrib/dnslist/dnslist.pl 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl 2008-07-16 14:23:16.000000000 -0500 -@@ -44,7 +44,7 @@ - - # Location of state file. (This is the dnsmasq default.) - # Change with -s <file> --my $dnsmasq_state_file = '/var/lib/misc/dnsmasq.leases'; -+my $dnsmasq_state_file = '/var/lib/dnsmasq/dnsmasq.leases'; - # Location of template. (Assumed to be in current directory.) - # Change with -t <file> - my $html_template_file = 'dnslist.tt2'; -diff -urN dnsmasq-2.43/dnsmasq.conf.example dnsmasq-2.43-patched/dnsmasq.conf.example ---- dnsmasq-2.43/dnsmasq.conf.example 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/dnsmasq.conf.example 2008-07-16 14:23:29.000000000 -0500 -@@ -351,7 +351,7 @@ +diff -up dnsmasq-2.46/dnsmasq.conf.example.orig dnsmasq-2.46/dnsmasq.conf.example +--- dnsmasq-2.46/dnsmasq.conf.example.orig 2008-10-21 15:41:01.000000000 +0200 ++++ dnsmasq-2.46/dnsmasq.conf.example 2008-12-29 02:14:18.000000000 +0100 +@@ -365,7 +365,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. @@ -22,10 +10,10 @@ # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, -diff -urN dnsmasq-2.43/man/dnsmasq.8 dnsmasq-2.43-patched/man/dnsmasq.8 ---- dnsmasq-2.43/man/dnsmasq.8 2008-07-10 10:48:14.000000000 -0500 -+++ dnsmasq-2.43-patched/man/dnsmasq.8 2008-07-16 14:22:35.000000000 -0500 -@@ -1116,7 +1116,7 @@ +diff -up dnsmasq-2.46/man/dnsmasq.8.orig dnsmasq-2.46/man/dnsmasq.8 +--- dnsmasq-2.46/man/dnsmasq.8.orig 2008-10-23 12:23:57.000000000 +0200 ++++ dnsmasq-2.46/man/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 +@@ -1171,7 +1171,7 @@ file needs a 1GHz processor and about 60 .IR /etc/ethers @@ -34,10 +22,10 @@ .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.43/man/es/dnsmasq.8 dnsmasq-2.43-patched/man/es/dnsmasq.8 ---- dnsmasq-2.43/man/es/dnsmasq.8 2008-06-02 13:58:52.000000000 -0500 -+++ dnsmasq-2.43-patched/man/es/dnsmasq.8 2008-07-16 14:22:48.000000000 -0500 -@@ -1145,7 +1145,7 @@ +diff -up dnsmasq-2.46/man/es/dnsmasq.8.orig dnsmasq-2.46/man/es/dnsmasq.8 +--- dnsmasq-2.46/man/es/dnsmasq.8.orig 2008-11-03 12:18:56.000000000 +0100 ++++ dnsmasq-2.46/man/es/dnsmasq.8 2008-12-29 02:14:18.000000000 +0100 +@@ -1222,7 +1222,7 @@ un CPU de 1GHz y aproximadamente 60MB de .IR /etc/ethers @@ -46,21 +34,9 @@ .IR /var/db/dnsmasq.leases -diff -urN dnsmasq-2.43/man/fr/dnsmasq.8 dnsmasq-2.43-patched/man/fr/dnsmasq.8 ---- dnsmasq-2.43/man/fr/dnsmasq.8 2008-07-11 03:28:28.000000000 -0500 -+++ dnsmasq-2.43-patched/man/fr/dnsmasq.8 2008-07-16 14:22:54.000000000 -0500 -@@ -1280,7 +1280,7 @@ - - .IR /etc/ethers - --.IR /var/lib/misc/dnsmasq.leases -+.IR /var/lib/dnsmasq/dnsmasq.leases - - .IR /var/db/dnsmasq.leases - -diff -urN dnsmasq-2.43/src/config.h dnsmasq-2.43-patched/src/config.h ---- dnsmasq-2.43/src/config.h 2008-07-11 03:44:17.000000000 -0500 -+++ dnsmasq-2.43-patched/src/config.h 2008-07-16 14:21:02.000000000 -0500 +diff -up dnsmasq-2.46/src/config.h.orig dnsmasq-2.46/src/config.h +--- dnsmasq-2.46/src/config.h.orig 2008-11-10 22:47:46.000000000 +0100 ++++ dnsmasq-2.46/src/config.h 2008-12-29 02:16:05.000000000 +0100 @@ -43,7 +43,7 @@ #elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases" @@ -70,12 +46,12 @@ #endif #if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -167,7 +167,7 @@ +@@ -159,7 +159,7 @@ NOTES: + /* platform independent options- uncomment to enable */ #define HAVE_TFTP /* #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 + /* Allow TFTP to be disabled with COPTS=-DNO_TFTP */ + #ifdef NO_TFTP Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/F-10/dnsmasq.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- dnsmasq.spec 22 Jul 2008 00:52:10 -0000 1.35 +++ dnsmasq.spec 29 Dec 2008 01:42:34 -0000 1.36 @@ -10,7 +10,7 @@ %endif Name: dnsmasq -Version: 2.45 +Version: 2.46 Release: 1%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -109,6 +109,9 @@ %changelog +* Mon Dec 29 2008 Matěj Cepl <mcepl(a)redhat.com> - 2.45-2 +- rebuilt + * Mon Jul 21 2008 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.45-1 - Upstream release (bugfixes) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/F-10/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Jul 2008 00:52:10 -0000 1.22 +++ sources 29 Dec 2008 01:42:34 -0000 1.23 @@ -1 +1 @@ -b7956e15c9766e05b3eca3ce88fdb616 dnsmasq-2.45.tar.gz +79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz

15 years, 4 months

rpms/dnsmasq/devel dnsmasq-configuration.patch, NONE, 1.1 dnsmasq.spec, 1.25, 1.26

by fedora-extras-commits＠redhat.com

Author: jima Update of /cvs/pkgs/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27409 Modified Files: dnsmasq.spec Added Files: dnsmasq-configuration.patch Log Message: * Tue Dec 04 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.2.test20 - New upstream test release - Moving dnsmasq.leases to /var/lib/dnsmasq/ as per BZ#407901 - Ignoring dangerous-command-in-%%post rpmlint warning (as per above fix) - Patch consolidation/cleanup - Removed conditionals for Fedora <= 3 and Aurora 2.0 dnsmasq-configuration.patch: --- NEW FILE dnsmasq-configuration.patch --- diff -up dnsmasq-2.41test20/src/config.h.orig dnsmasq-2.41test20/src/config.h --- dnsmasq-2.41test20/src/config.h.orig 2007-11-27 14:09:01.000000000 -0600 +++ dnsmasq-2.41test20/src/config.h 2007-12-04 08:21:49.000000000 -0600 @@ -42,7 +42,7 @@ #elif defined(__sun__) # define LEASEFILE "/var/cache/dnsmasq.leases" #else -# define LEASEFILE "/var/lib/misc/dnsmasq.leases" +# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases" #endif #if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" @@ -182,7 +182,7 @@ NOTES: #define HAVE_TFTP /* #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 -up dnsmasq-2.41test20/man/es/dnsmasq.8.orig dnsmasq-2.41test20/man/es/dnsmasq.8 --- dnsmasq-2.41test20/man/es/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 +++ dnsmasq-2.41test20/man/es/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 @@ -1075,7 +1075,7 @@ un CPU de 1GHz y aproximadamente 60MB de .IR /etc/ethers -.IR /var/lib/misc/dnsmasq.leases +.IR /var/lib/dnsmasq/dnsmasq.leases .IR /var/db/dnsmasq.leases diff -up dnsmasq-2.41test20/man/dnsmasq.8.orig dnsmasq-2.41test20/man/dnsmasq.8 --- dnsmasq-2.41test20/man/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600 +++ dnsmasq-2.41test20/man/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600 @@ -1070,7 +1070,7 @@ file needs a 1GHz processor and about 60 .IR /etc/ethers -.IR /var/lib/misc/dnsmasq.leases +.IR /var/lib/dnsmasq/dnsmasq.leases .IR /var/db/dnsmasq.leases diff -up dnsmasq-2.41test20/dnsmasq.conf.example.orig dnsmasq-2.41test20/dnsmasq.conf.example --- dnsmasq-2.41test20/dnsmasq.conf.example.orig 2007-11-27 14:09:01.000000000 -0600 +++ dnsmasq-2.41test20/dnsmasq.conf.example 2007-12-04 08:44:16.000000000 -0600 @@ -344,7 +344,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases +#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, @@ -461,4 +461,4 @@ # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d +conf-dir=/etc/dnsmasq.d Index: dnsmasq.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- dnsmasq.spec 27 Nov 2007 22:04:41 -0000 1.25 +++ dnsmasq.spec 4 Dec 2007 15:46:52 -0000 1.26 @@ -11,7 +11,7 @@ Name: dnsmasq Version: 2.41 -Release: 0.1.%{?extraversion}%{?dist} +Release: 0.2.%{?extraversion}%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -19,18 +19,15 @@ 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}-2.33-enable-dbus.patch -Patch2: %{name}-2.35-conf-dir.patch +Patch1: %{name}-configuration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%fedora" > "3" || "%aurora" > "2" BuildRequires: dbus-devel -%endif - BuildRequires: pkgconfig Requires(post): /sbin/chkconfig Requires(post): /sbin/service +Requires(post): /bin/sed /bin/grep Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -48,10 +45,7 @@ %prep %setup -q -n %{name}-%{version}%{?extraversion} %patch0 -p1 -%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 -%endif -%patch2 -p1 %build make %{?_smp_mflags} @@ -62,13 +56,12 @@ # 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%{_var}/lib/dnsmasq \ $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \ $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" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -%endif install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -77,6 +70,20 @@ %post if [ "$1" = "2" ]; then # if we're being upgraded + # if using the old leases location, move the file to the new one + # but only if we're not clobbering another file + # + if [ -f /var/lib/misc/dnsmasq.leases -a ! -f /var/lib/dnsmasq/dnsmasq.leases ]; then + # causes rpmlint to report dangerous-command-in-post, + # but that's the price of selinux compliance :-( + mv -f /var/lib/misc/dnsmasq.leases /var/lib/dnsmasq/dnsmasq.leases || : + fi + # ugly, but kind of necessary + if [ ! `grep -q dhcp-leasefile=/var/lib/misc/dnsmasq.leases %{_sysconfdir}/dnsmasq.conf` ]; then + cp %{_sysconfdir}/dnsmasq.conf %{_sysconfdir}/dnsmasq.conf.tmp || : + sed -e 's/var\/lib\/misc/var\/lib\/dnsmasq/' < %{_sysconfdir}/dnsmasq.conf.tmp > %{_sysconfdir}/dnsmasq.conf || : + rm -f %{_sysconfdir}/dnsmasq.conf.tmp || : + fi /sbin/service dnsmasq condrestart >/dev/null 2>&1 || : else # if we're being installed /sbin/chkconfig --add dnsmasq @@ -94,20 +101,20 @@ %doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf %dir /etc/dnsmasq.d -%if "%fedora" > "3" || "%aurora" > "2" +%dir %{_var}/lib/dnsmasq %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf -%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog -* Tue Nov 27 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.1.test20 -- New upstream test release - -* Mon Oct 22 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.1.test11 +* Tue Dec 04 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.41-0.2.test20 - New upstream test release +- Moving dnsmasq.leases to /var/lib/dnsmasq/ as per BZ#407901 +- Ignoring dangerous-command-in-%%post rpmlint warning (as per above fix) +- Patch consolidation/cleanup +- Removed conditionals for Fedora <= 3 and Aurora 2.0 * Tue Sep 18 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.40-1 - Finalized upstream release

16 years, 4 months

rpms/dnsmasq/devel dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5, 1.6 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.3, 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-serv31614/devel 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/devel/dnsmasq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dnsmasq.spec 2 May 2006 16:28:07 -0000 1.5 +++ dnsmasq.spec 8 May 2006 15:51:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +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 @@ -53,8 +51,10 @@ $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" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %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 +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* 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 :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/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 15:51:19 -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/FC-5 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 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-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-5 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-5/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +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 @@ -53,8 +51,10 @@ $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" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %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 +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* 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 :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/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:41 -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/FC-4 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 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-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-4 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-4/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +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 @@ -53,8 +51,10 @@ $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" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %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 +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* 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 :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/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/devel dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3

by fedora-extras-commits＠redhat.com

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... 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,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(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"