From e9bc98912be495f3340f0f820119a5aae59812e0 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Thu, 19 May 2016 19:19:03 +0200 Subject: [PATCH] dnsmasq: update to 2.76 --- dnsmasq/.footprint | 7 ++++--- dnsmasq/.md5sum | 4 ++-- dnsmasq/Pkgfile | 2 +- dnsmasq/dnsmasq-config.patch | 29 ++++++++++++----------------- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dnsmasq/.footprint b/dnsmasq/.footprint index f9fb8551a..c2683986f 100644 --- a/dnsmasq/.footprint +++ b/dnsmasq/.footprint @@ -3,11 +3,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/dnsmasq drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/dnsmasq.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/dnsmasq +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/dnsmasq.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/dhcp/ diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index 9144c9a40..39178c269 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ cf2b6cff8356ce9da3f6da7dfa0e588b dnsmasq -887236f1ddde6eb57cdb9d01916c9f72 dnsmasq-2.75.tar.xz -7e9e053cff450d0f6aeb71d42f3b5fa8 dnsmasq-config.patch +00f5ee66b4e4b7f14538bf62ae3c9461 dnsmasq-2.76.tar.xz +51193165dcaa9061f07f8b43eaf466d0 dnsmasq-config.patch diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 03e778cd5..5ed22e828 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=dnsmasq -version=2.75 +version=2.76 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 b915c0c5c..b45b614b6 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,12 +1,7 @@ -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 - BINDIR = $(PREFIX)/sbin --MANDIR = $(PREFIX)/share/man -+MANDIR = $(PREFIX)/man +diff -Nru dnsmasq-2.76.orig/Makefile dnsmasq-2.76/Makefile +--- dnsmasq-2.76.orig/Makefile 2016-05-19 19:10:26.729305866 +0200 ++++ dnsmasq-2.76/Makefile 2016-05-19 19:11:06.601200120 +0200 +@@ -24,7 +24,7 @@ LOCALEDIR = $(PREFIX)/share/locale BUILDDIR = $(SRC) DESTDIR = @@ -15,9 +10,9 @@ diff -Nru dnsmasq-2.74.orig/Makefile dnsmasq-2.74/Makefile LDFLAGS = COPTS = RPM_OPT_FLAGS = -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 +diff -Nru dnsmasq-2.76.orig/dnsmasq.conf.example dnsmasq-2.76/dnsmasq.conf.example +--- dnsmasq-2.76.orig/dnsmasq.conf.example 2016-05-19 19:10:26.732639080 +0200 ++++ dnsmasq-2.76/dnsmasq.conf.example 2016-05-19 19:10:39.865498646 +0200 @@ -96,8 +96,8 @@ # If you want dnsmasq to change uid and gid to something other @@ -38,10 +33,10 @@ diff -Nru dnsmasq-2.74.orig/dnsmasq.conf.example dnsmasq-2.74/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.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 @@ +diff -Nru dnsmasq-2.76.orig/src/config.h dnsmasq-2.76/src/config.h +--- dnsmasq-2.76.orig/src/config.h 2016-05-19 19:10:26.732639080 +0200 ++++ dnsmasq-2.76/src/config.h 2016-05-19 19:10:39.865498646 +0200 +@@ -41,7 +41,7 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" @@ -50,7 +45,7 @@ diff -Nru dnsmasq-2.74.orig/src/config.h dnsmasq-2.74/src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -186,7 +186,7 @@ +@@ -187,7 +187,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else