dnsmasq: update to 2.60

3 files changed, 37 insertions, 41 deletions

diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum
index 5f6fe4211..ea247a7b6 100644
--- a/dnsmasq/.md5sum
+++ b/dnsmasq/.md5sum
@@ -1,3 +1,3 @@
 d1b2a1f31cea2c529358d7e73bcda6bd  dnsmasq
-42823ed7f5726fdfb343f60911de606b  dnsmasq-2.59.tar.lzma
-07efc73e6b7b38d036deced10048b280  dnsmasq-config.patch
+475f1d8d297d5c4b92e009a9bee67f26  dnsmasq-2.60.tar.lzma
+71282d75d7d66707dbfa9baf8ba25c0d  dnsmasq-config.patch
diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile
index 8688fba52..752367907 100644
--- a/dnsmasq/Pkgfile
+++ b/dnsmasq/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=dnsmasq
-version=2.59
+version=2.60
 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 d83b13d63..0eb8be768 100644
--- a/dnsmasq/dnsmasq-config.patch
+++ b/dnsmasq/dnsmasq-config.patch
@@ -1,27 +1,23 @@
-diff -Nru dnsmasq-2.58.orig/Makefile dnsmasq-2.58/Makefile
---- dnsmasq-2.58.orig/Makefile	2011-08-27 10:05:03.610645122 +0200
-+++ dnsmasq-2.58/Makefile	2011-08-27 10:05:18.486783402 +0200
-@@ -15,7 +15,7 @@
- 
- PREFIX = /usr/local
- BINDIR = ${PREFIX}/sbin
--MANDIR = ${PREFIX}/share/man
-+MANDIR = ${PREFIX}/man
- LOCALEDIR = ${PREFIX}/share/locale
- 
- PKG_CONFIG = pkg-config
-@@ -24,7 +24,7 @@
- MSGFMT = msgfmt
- XGETTEXT = xgettext
- 
--CFLAGS = -Wall -W -O2
-+CFLAGS += -Wall -W
- 
- #################################################################
- 
-diff -Nru dnsmasq-2.58.orig/dnsmasq.conf.example dnsmasq-2.58/dnsmasq.conf.example
---- dnsmasq-2.58.orig/dnsmasq.conf.example	2011-08-27 10:05:03.610645122 +0200
-+++ dnsmasq-2.58/dnsmasq.conf.example	2011-08-27 10:05:18.486783402 +0200
+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
+@@ -20,11 +20,11 @@
+ 
+ PREFIX        = /usr/local
+ BINDIR        = $(PREFIX)/sbin
+-MANDIR        = $(PREFIX)/share/man
++MANDIR        = $(PREFIX)/man
+ LOCALEDIR     = $(PREFIX)/share/locale
+ BUILDDIR      = $(SRC)
+ DESTDIR       = 
+-CFLAGS        = -Wall -W -O2
++CFLAGS        += -Wall -W
+ 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 @@
  
  # If you want dnsmasq to change uid and gid to something other
@@ -33,7 +29,7 @@ diff -Nru dnsmasq-2.58.orig/dnsmasq.conf.example dnsmasq-2.58/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
-@@ -439,7 +439,7 @@
+@@ -466,7 +466,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,10 +38,19 @@ diff -Nru dnsmasq-2.58.orig/dnsmasq.conf.example dnsmasq-2.58/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.58.orig/src/config.h dnsmasq-2.58/src/config.h
---- dnsmasq-2.58.orig/src/config.h	2011-08-27 10:05:03.607311907 +0200
-+++ dnsmasq-2.58/src/config.h	2011-08-27 10:05:18.486783402 +0200
-@@ -49,7 +49,7 @@
+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 @@
+ #define RUNFILE "/var/run/dnsmasq.pid"
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+ #define CHUSER "nobody"
+-#define CHGRP "dip"
++#define CHGRP "nobody"
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE "/dev/urandom"
+@@ -137,7 +137,7 @@
  #   elif defined(__ANDROID__)
  #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else
@@ -54,12 +59,3 @@ diff -Nru dnsmasq-2.58.orig/src/config.h dnsmasq-2.58/src/config.h
  #   endif
  #endif
  
-@@ -63,7 +63,7 @@
- 
- #define DEFLEASE 3600 /* default lease time, 1 hour */
- #define CHUSER "nobody"
--#define CHGRP "dip"
-+#define CHGRP "nobody"
- #define NAMESERVER_PORT 53
- #define DHCP_SERVER_PORT 67
- #define DHCP_CLIENT_PORT 68