commit 84cad556a0356cb0f708e2130642764b69d01477 Author: Juergen Daubert <jue@jue.li> Date: Wed Jul 29 09:53:10 2015 +0200 dnsmasq: update to 2.74 diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index a1afd1a..8c5ea7d 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ cf2b6cff8356ce9da3f6da7dfa0e588b dnsmasq -b8bfe96d22945c8cf4466826ba9b21bd dnsmasq-2.73.tar.xz -7f4f17ceb6c1d5fe7b4eaa213405c472 dnsmasq-config.patch +f48cd0fe26a55617a375ffc95b71e3c3 dnsmasq-2.74.tar.xz +7e9e053cff450d0f6aeb71d42f3b5fa8 dnsmasq-config.patch diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 03813dd..4c74868 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=dnsmasq -version=2.73 +version=2.74 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 2fc531a..b915c0c 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,6 +1,6 @@ -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 +diff -Nru dnsmasq-2.74.orig/Makefile dnsmasq-2.74/Makefile +--- dnsmasq-2.74.orig/Makefile 2015-07-29 09:24:06.524601095 +0200 ++++ dnsmasq-2.74/Makefile 2015-07-29 09:24:43.299930250 +0200 @@ -20,11 +20,11 @@ PREFIX = /usr/local @@ -15,9 +15,9 @@ diff -Nru dnsmasq-2.69.orig/Makefile dnsmasq-2.69/Makefile LDFLAGS = COPTS = RPM_OPT_FLAGS = -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 +diff -Nru dnsmasq-2.74.orig/dnsmasq.conf.example dnsmasq-2.74/dnsmasq.conf.example +--- dnsmasq-2.74.orig/dnsmasq.conf.example 2015-07-29 09:24:06.524601095 +0200 ++++ dnsmasq-2.74/dnsmasq.conf.example 2015-07-29 09:24:43.299930250 +0200 @@ -96,8 +96,8 @@ # If you want dnsmasq to change uid and gid to something other @@ -29,7 +29,7 @@ diff -Nru dnsmasq-2.69.orig/dnsmasq.conf.example dnsmasq-2.69/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 -@@ -517,7 +517,7 @@ +@@ -535,7 +535,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.69.orig/dnsmasq.conf.example dnsmasq-2.69/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.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 @@ +diff -Nru dnsmasq-2.74.orig/src/config.h dnsmasq-2.74/src/config.h +--- dnsmasq-2.74.orig/src/config.h 2015-07-29 09:24:06.521267883 +0200 ++++ dnsmasq-2.74/src/config.h 2015-07-29 09:24:43.299930250 +0200 +@@ -40,7 +40,7 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" @@ -50,7 +50,7 @@ diff -Nru dnsmasq-2.69.orig/src/config.h dnsmasq-2.69/src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -166,7 +166,7 @@ +@@ -186,7 +186,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else