dnsmasq: update to 2.48

3 files changed, 16 insertions, 25 deletions

diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index fee155769..d09251edb 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-4524081e56d0b935717d493e8e8d3e11  dnsmasq-2.47.tar.gz
-1fbb5506fd5bfa07febdb13e9dc8f30f  dnsmasq-config.patch
+8e12a386831b0b597c8a078f31d3fbd5  dnsmasq-2.48.tar.gz
+aeb39ec4e102459cea48e0984b9406b3  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 7edd4d9a1..f06faadf0 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 
 name=dnsmasq
-version=2.47
+version=2.48
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \
         $name-config.patch dnsmasq)
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index da836cf85..d96041170 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.47.orig/Makefile dnsmasq-2.47/Makefile
---- dnsmasq-2.47.orig/Makefile	2009-02-06 09:20:22.000000000 +0100
-+++ dnsmasq-2.47/Makefile	2009-02-06 09:21:25.000000000 +0100
+diff -Nru dnsmasq-2.48.orig/Makefile dnsmasq-2.48/Makefile
+--- dnsmasq-2.48.orig/Makefile	2009-06-05 09:56:02.000000000 +0200
++++ dnsmasq-2.48/Makefile	2009-06-05 09:56:38.000000000 +0200
 @@ -15,7 +15,7 @@
  
  PREFIX = /usr/local
@@ -10,27 +10,18 @@ diff -Nru dnsmasq-2.47.orig/Makefile dnsmasq-2.47/Makefile
  LOCALEDIR = ${PREFIX}/share/locale
  
  SRC = src
-@@ -23,7 +23,7 @@
- MAN = man
- 
- PKG_CONFIG = pkg-config
--AWK = nawk
-+AWK = awk
- INSTALL = install
- 
- DBUS_MINOR=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --modversion dbus-1 | $(AWK) -F . -- '{ if ($$(NF-1)) print \"-DDBUS_MINOR=\"$$(NF-1) }'`" 
-diff -Nru dnsmasq-2.47.orig/bld/Makefile dnsmasq-2.47/bld/Makefile
---- dnsmasq-2.47.orig/bld/Makefile	2009-02-06 09:20:22.000000000 +0100
-+++ dnsmasq-2.47/bld/Makefile	2009-02-06 09:20:35.000000000 +0100
+diff -Nru dnsmasq-2.48.orig/bld/Makefile dnsmasq-2.48/bld/Makefile
+--- dnsmasq-2.48.orig/bld/Makefile	2009-06-05 09:56:02.000000000 +0200
++++ dnsmasq-2.48/bld/Makefile	2009-06-05 09:56:38.000000000 +0200
 @@ -1,4 +1,4 @@
 -CFLAGS = -Wall -W -O2
 +CFLAGS += -Wall -W
  
  OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \
         dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
-diff -Nru dnsmasq-2.47.orig/dnsmasq.conf.example dnsmasq-2.47/dnsmasq.conf.example
---- dnsmasq-2.47.orig/dnsmasq.conf.example	2009-02-06 09:20:22.000000000 +0100
-+++ dnsmasq-2.47/dnsmasq.conf.example	2009-02-06 09:20:36.000000000 +0100
+diff -Nru dnsmasq-2.48.orig/dnsmasq.conf.example dnsmasq-2.48/dnsmasq.conf.example
+--- dnsmasq-2.48.orig/dnsmasq.conf.example	2009-06-05 09:56:02.000000000 +0200
++++ dnsmasq-2.48/dnsmasq.conf.example	2009-06-05 09:56:38.000000000 +0200
 @@ -75,8 +75,8 @@
  
  # If you want dnsmasq to change uid and gid to something other
@@ -42,7 +33,7 @@ diff -Nru dnsmasq-2.47.orig/dnsmasq.conf.example dnsmasq-2.47/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
-@@ -381,7 +381,7 @@
+@@ -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.
@@ -51,9 +42,9 @@ diff -Nru dnsmasq-2.47.orig/dnsmasq.conf.example 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 -Nru dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h
---- dnsmasq-2.47.orig/src/config.h	2009-02-06 09:20:22.000000000 +0100
-+++ dnsmasq-2.47/src/config.h	2009-02-06 09:20:36.000000000 +0100
+diff -Nru dnsmasq-2.48.orig/src/config.h dnsmasq-2.48/src/config.h
+--- dnsmasq-2.48.orig/src/config.h	2009-06-05 09:56:02.000000000 +0200
++++ dnsmasq-2.48/src/config.h	2009-06-05 09:56:38.000000000 +0200
 @@ -45,7 +45,7 @@
  #   elif defined(__sun__) || defined (__sun)
  #      define LEASEFILE "/var/cache/dnsmasq.leases"