- Bugfix/feature enhancement update

- Fixing BZ#494094
2009-06-10 12:36:25 +00:00 · 2009-06-10 12:36:25 +00:00 · 01b090efb8
parent 7cad9d9ed2
commit 01b090efb8
8 changed files with 25 additions and 93 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-dnsmasq-2.47.tar.gz
+dnsmasq-2.48.tar.gz
--- a/dnsmasq-2.33-enable-dbus.patch
+++ b/dnsmasq-2.33-enable-dbus.patch
@ -1,12 +0,0 @@
-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
--- a/dnsmasq-2.33-initscript.patch
+++ b/dnsmasq-2.33-initscript.patch
@ -6,7 +6,7 @@ diff -urN dnsmasq-2.33/rpm/dnsmasq.init dnsmasq-2.33-patched/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
--- a/dnsmasq-2.35-conf-dir.patch
+++ b/dnsmasq-2.35-conf-dir.patch
@ -1,9 +0,0 @@
-diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example	2006-10-18 15:24:50.000000000 -0500
-+++ dnsmasq-2.35-patched/dnsmasq.conf.example	2006-11-06 11:46:38.000000000 -0600
-@@ -382,4 +382,4 @@
- 
- # Include a another lot of configuration options.
- #conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
-+conf-dir=/etc/dnsmasq.d
--- a/dnsmasq-configuration.patch
+++ b/dnsmasq-configuration.patch
@ -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.example.orig dnsmasq-2.47/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 -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.orig dnsmasq-2.47/man/dnsmasq.8
 
 .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.orig 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 dnsmasq-2.47/src/config.h
 #   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 */
--- a/dnsmasq-newglibc.patch
+++ b/dnsmasq-newglibc.patch
@ -1,51 +0,0 @@
-diff -urN dnsmasq-2.41/CHANGELOG dnsmasq-2.42test1/CHANGELOG
--- dnsmasq-2.41/CHANGELOG	2008-02-11 05:48:46.000000000 -0600
-+++ dnsmasq-2.42test1/CHANGELOG	2008-02-13 15:06:43.000000000 -0600
-@@ -2462,6 +2462,9 @@
- 	    when debug mode is set. Thanks to cedric Duval for the
- 	    patch. 
- 
-+version 2.42 (backported fix)
-+            Define __USE_GNU to avoid problems with later glibc
-+            headers. Thanks to Jima for spotting the problem.
- 
-  
- 
-diff -urN dnsmasq-2.41/src/config.h dnsmasq-2.42test1/src/config.h
--- dnsmasq-2.41/src/config.h	2008-02-12 05:03:28.000000000 -0600
-+++ dnsmasq-2.42test1/src/config.h	2008-02-13 15:07:05.000000000 -0600
-@@ -85,13 +85,6 @@
- #endif
- 
- 
-/* Get linux C library versions. */
-#if defined(__linux__) && !defined(__UCLIBC__) && !defined(__uClinux__)
-/*#  include <libio.h> */
-#  include <features.h> 
-#endif
-
-
- /* Follows system specific switches. If you run on a 
-    new system, you may want to edit these. 
-    May replace this with Autoconf one day. 
-diff -urN dnsmasq-2.41/src/dnsmasq.h dnsmasq-2.42test1/src/dnsmasq.h
--- dnsmasq-2.41/src/dnsmasq.h	2008-02-01 15:42:35.000000000 -0600
-+++ dnsmasq-2.42test1/src/dnsmasq.h	2008-02-13 14:38:39.000000000 -0600
-@@ -17,6 +17,17 @@
- #define COPYRIGHT "Copyright (C) 2000-2008 Simon Kelley" 
- 
- /* get these before config.h  for IPv6 stuff... */
-+/* Get linux C library versions. */
-+#ifdef __linux__
-+#  include <features.h> 
-+#endif
-+
-+#ifdef __GLIBC__
-+/* needed for in6_pktinfo on later glibc releases */
-+#  define __USE_GNU
-+#  define _GNU_SOURCE
-+#endif
-+
- #include <sys/types.h> 
- #include <netinet/in.h>
- 
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@ -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@beer.tclug.org> 2.48-1
+- Bugfix/feature enhancement update
+- Fixing BZ#494094
+
 * Fri May 29 2009 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.47-1
 - Bugfix/feature enhancement update

--- a/2
+++ b/2
@ -1 +1 @@
-4524081e56d0b935717d493e8e8d3e11  dnsmasq-2.47.tar.gz
+8e12a386831b0b597c8a078f31d3fbd5  dnsmasq-2.48.tar.gz