dnsmasq: update to 2.61

3 files changed, 16 insertions, 16 deletions

diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index ea247a7b6..cf8041574 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-475f1d8d297d5c4b92e009a9bee67f26  dnsmasq-2.60.tar.lzma
-71282d75d7d66707dbfa9baf8ba25c0d  dnsmasq-config.patch
+eebc2e1b8bee9d3dfaf7f91eb3cd0354  dnsmasq-2.61.tar.lzma
+7849643871a6de02fd04214fef307248  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 752367907..b8a808601 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=dnsmasq
-version=2.60
+version=2.61
 release=1
 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.lzma \
         $name-config.patch dnsmasq)
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch
index 0eb8be768..b4e4a5884 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,6 +1,6 @@
-diff -Nru dnsmasq-2.60.orig/Makefile dnsmasq-2.60/Makefile
---- dnsmasq-2.60.orig/Makefile	2012-03-06 09:13:14.574103519 +0100
-+++ dnsmasq-2.60/Makefile	2012-03-06 09:11:44.000000000 +0100
+diff -Nru dnsmasq-2.61.orig/Makefile dnsmasq-2.61/Makefile
+--- dnsmasq-2.61.orig/Makefile	2012-04-29 17:29:37.527992253 +0200
++++ dnsmasq-2.61/Makefile	2012-04-29 17:29:51.834373337 +0200
 @@ -20,11 +20,11 @@
  
  PREFIX        = /usr/local
@@ -15,10 +15,10 @@ diff -Nru dnsmasq-2.60.orig/Makefile dnsmasq-2.60/Makefile
  LDFLAGS       = 
  COPTS         = 
  RPM_OPT_FLAGS = 
-diff -Nru dnsmasq-2.60.orig/dnsmasq.conf.example dnsmasq-2.60/dnsmasq.conf.example
---- dnsmasq-2.60.orig/dnsmasq.conf.example	2012-03-06 09:13:14.574103519 +0100
-+++ dnsmasq-2.60/dnsmasq.conf.example	2012-03-06 09:07:32.000000000 +0100
-@@ -75,8 +75,8 @@
+diff -Nru dnsmasq-2.61.orig/dnsmasq.conf.example dnsmasq-2.61/dnsmasq.conf.example
+--- dnsmasq-2.61.orig/dnsmasq.conf.example	2012-04-29 17:29:37.534658843 +0200
++++ dnsmasq-2.61/dnsmasq.conf.example	2012-04-29 17:29:51.834373337 +0200
+@@ -80,8 +80,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.60.orig/dnsmasq.conf.example dnsmasq-2.60/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
-@@ -466,7 +466,7 @@
+@@ -498,7 +498,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.60.orig/dnsmasq.conf.example dnsmasq-2.60/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.60.orig/src/config.h dnsmasq-2.60/src/config.h
---- dnsmasq-2.60.orig/src/config.h	2012-03-06 09:13:14.574103519 +0100
-+++ dnsmasq-2.60/src/config.h	2012-03-06 09:12:38.000000000 +0100
-@@ -35,7 +35,7 @@
+diff -Nru dnsmasq-2.61.orig/src/config.h dnsmasq-2.61/src/config.h
+--- dnsmasq-2.61.orig/src/config.h	2012-04-29 17:29:37.534658843 +0200
++++ dnsmasq-2.61/src/config.h	2012-04-29 17:29:51.834373337 +0200
+@@ -36,7 +36,7 @@
  #define RUNFILE "/var/run/dnsmasq.pid"
  #define DEFLEASE 3600 /* default lease time, 1 hour */
  #define CHUSER "nobody"
@@ -50,7 +50,7 @@ diff -Nru dnsmasq-2.60.orig/src/config.h dnsmasq-2.60/src/config.h
  #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
  #define LOG_MAX 5 /* log-queue length */
  #define RANDFILE "/dev/urandom"
-@@ -137,7 +137,7 @@
+@@ -138,7 +138,7 @@
  #   elif defined(__ANDROID__)
  #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else