dnsmasq: update to 2.69

3 files changed, 16 insertions, 16 deletions

diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index 9abd46d23..fcb869db9 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-fec885ba0a9df0f7d8f2e44db48f19ae  dnsmasq-2.68.tar.xz
-6792434a868864ac463809ac4ecbfe35  dnsmasq-config.patch
+c5a1152e646eb54db4f33f8e0deee180  dnsmasq-2.69.tar.xz
+7f4f17ceb6c1d5fe7b4eaa213405c472  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 2ce953732..2da98762e 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=dnsmasq
-version=2.68
+version=2.69
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
         $name-config.patch dnsmasq)
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index dc2703e7c..2fc531a0a 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.66.orig/Makefile dnsmasq-2.66/Makefile
---- dnsmasq-2.66.orig/Makefile	2013-04-17 18:29:47.249827442 +0200
-+++ dnsmasq-2.66/Makefile	2013-04-17 18:30:01.922663701 +0200
+diff -Nru dnsmasq-2.69.orig/Makefile dnsmasq-2.69/Makefile
+--- dnsmasq-2.69.orig/Makefile	2014-04-10 10:43:18.681038868 +0200
++++ dnsmasq-2.69/Makefile	2014-04-10 10:43:58.539625802 +0200
 @@ -20,11 +20,11 @@
  
  PREFIX        = /usr/local
@@ -15,10 +15,10 @@ diff -Nru dnsmasq-2.66.orig/Makefile dnsmasq-2.66/Makefile
  LDFLAGS       = 
  COPTS         = 
  RPM_OPT_FLAGS = 
-diff -Nru dnsmasq-2.66.orig/dnsmasq.conf.example dnsmasq-2.66/dnsmasq.conf.example
---- dnsmasq-2.66.orig/dnsmasq.conf.example	2013-04-17 18:29:47.253160657 +0200
-+++ dnsmasq-2.66/dnsmasq.conf.example	2013-04-17 18:30:01.922663701 +0200
-@@ -84,8 +84,8 @@
+diff -Nru dnsmasq-2.69.orig/dnsmasq.conf.example dnsmasq-2.69/dnsmasq.conf.example
+--- dnsmasq-2.69.orig/dnsmasq.conf.example	2014-04-10 10:43:18.684372083 +0200
++++ dnsmasq-2.69/dnsmasq.conf.example	2014-04-10 10:43:58.539625802 +0200
+@@ -96,8 +96,8 @@
  
  # If you want dnsmasq to change uid and gid to something other
  # than the default, edit the following lines.
@@ -29,7 +29,7 @@ diff -Nru dnsmasq-2.66.orig/dnsmasq.conf.example dnsmasq-2.66/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
-@@ -505,7 +505,7 @@
+@@ -517,7 +517,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.
@@ -38,10 +38,10 @@ diff -Nru dnsmasq-2.66.orig/dnsmasq.conf.example dnsmasq-2.66/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.66.orig/src/config.h dnsmasq-2.66/src/config.h
---- dnsmasq-2.66.orig/src/config.h	2013-04-17 18:29:47.253160657 +0200
-+++ dnsmasq-2.66/src/config.h	2013-04-17 18:30:01.922663701 +0200
-@@ -35,7 +35,7 @@
+diff -Nru dnsmasq-2.69.orig/src/config.h dnsmasq-2.69/src/config.h
+--- dnsmasq-2.69.orig/src/config.h	2014-04-10 10:43:18.684372083 +0200
++++ dnsmasq-2.69/src/config.h	2014-04-10 10:43:58.539625802 +0200
+@@ -37,7 +37,7 @@
  #define ETHERSFILE "/etc/ethers"
  #define DEFLEASE 3600 /* default lease time, 1 hour */
  #define CHUSER "nobody"
@@ -50,7 +50,7 @@ diff -Nru dnsmasq-2.66.orig/src/config.h dnsmasq-2.66/src/config.h
  #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
  #define LOG_MAX 5 /* log-queue length */
  #define RANDFILE "/dev/urandom"
-@@ -153,7 +153,7 @@
+@@ -166,7 +166,7 @@
  #   elif defined(__ANDROID__)
  #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else