7:36 a.m.
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 ---