dnsmasq: update to 2.53

3 files changed, 16 insertions, 14 deletions

diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index b082c1d57..63257ed42 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-2d156f322564fdd71ad238040cd607ac  dnsmasq-2.52.tar.lzma
-570317114c986bbf2f90949c17049ac7  dnsmasq-config.patch
+07328f6e8a88ae0d0f30f90434282d78  dnsmasq-2.53.tar.lzma
+3810b9df4f93a02546027dc21edc18db  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 86944ece1..50532a1ea 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -1,9 +1,9 @@
-# Description: Caching DNS forwarder and DHCP server 
+# Description: Caching DNS forwarder and DHCP/TFTP server 
 # URL:         http://www.thekelleys.org.uk/dnsmasq/doc.html
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 
 name=dnsmasq
-version=2.52
+version=2.53
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.lzma \
         $name-config.patch dnsmasq)
@@ -12,6 +12,8 @@ build () {
     cd $name-$version
 
     patch -p1 -i $SRC/$name-config.patch
+    sed -i 's/2\.54/2\.53/' src/config.h
+    
     make
     make PREFIX=$PKG/usr install
 
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 082150317..cc9c2aa1f 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.52.orig/Makefile dnsmasq-2.52/Makefile
---- dnsmasq-2.52.orig/Makefile	2010-01-22 22:26:22.000000000 +0100
-+++ dnsmasq-2.52/Makefile	2010-01-22 22:51:22.000000000 +0100
+diff -Nru dnsmasq-2.53.orig/Makefile dnsmasq-2.53/Makefile
+--- dnsmasq-2.53.orig/Makefile	2010-06-04 07:00:56.695385709 +0200
++++ dnsmasq-2.53/Makefile	2010-06-04 07:02:52.285384778 +0200
 @@ -15,7 +15,7 @@
  
  PREFIX = /usr/local
@@ -19,9 +19,9 @@ diff -Nru dnsmasq-2.52.orig/Makefile dnsmasq-2.52/Makefile
  
  #################################################################
  
-diff -Nru dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/dnsmasq.conf.example
---- dnsmasq-2.52.orig/dnsmasq.conf.example	2010-01-22 22:26:22.000000000 +0100
-+++ dnsmasq-2.52/dnsmasq.conf.example	2010-01-22 22:26:59.000000000 +0100
+diff -Nru dnsmasq-2.53.orig/dnsmasq.conf.example dnsmasq-2.53/dnsmasq.conf.example
+--- dnsmasq-2.53.orig/dnsmasq.conf.example	2010-06-04 07:00:56.705377927 +0200
++++ dnsmasq-2.53/dnsmasq.conf.example	2010-06-04 07:02:52.285384778 +0200
 @@ -75,8 +75,8 @@
  
  # If you want dnsmasq to change uid and gid to something other
@@ -33,7 +33,7 @@ diff -Nru dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/dnsmasq.conf.examp
  
  # If you want dnsmasq to listen for DHCP and DNS requests only on
  # specified interfaces (and the loopback) give the name of the
-@@ -415,7 +415,7 @@
+@@ -427,7 +427,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.
@@ -42,9 +42,9 @@ diff -Nru dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/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 -Nru dnsmasq-2.52.orig/src/config.h dnsmasq-2.52/src/config.h
---- dnsmasq-2.52.orig/src/config.h	2010-01-22 22:26:23.000000000 +0100
-+++ dnsmasq-2.52/src/config.h	2010-01-22 22:26:59.000000000 +0100
+diff -Nru dnsmasq-2.53.orig/src/config.h dnsmasq-2.53/src/config.h
+--- dnsmasq-2.53.orig/src/config.h	2010-06-04 07:00:56.725386449 +0200
++++ dnsmasq-2.53/src/config.h	2010-06-04 07:02:52.285384778 +0200
 @@ -47,7 +47,7 @@
  #   elif defined(__sun__) || defined (__sun)
  #      define LEASEFILE "/var/cache/dnsmasq.leases"