commit 922a7fd2e7b1d5194d4935850a67edc0a1dd15fc Author: Juergen Daubert <jue@jue.li> Date: Fri Apr 19 17:15:15 2013 +0200 dnsmasq: update to 2.66 diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index abc6d4e..9b430e6 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ d1b2a1f31cea2c529358d7e73bcda6bd dnsmasq -23b411df85291a0be4d2ce037fa4ac6f dnsmasq-2.65.tar.xz -7849643871a6de02fd04214fef307248 dnsmasq-config.patch +cd1c70dd66d2e3ad02b66ca6af4ebf20 dnsmasq-2.66.tar.xz +6792434a868864ac463809ac4ecbfe35 dnsmasq-config.patch diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 31979e9..4b0a522 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=dnsmasq -version=2.65 +version=2.66 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 b4e4a58..dc2703e 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,6 +1,6 @@ -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 +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 @@ -20,11 +20,11 @@ PREFIX = /usr/local @@ -15,10 +15,10 @@ diff -Nru dnsmasq-2.61.orig/Makefile dnsmasq-2.61/Makefile LDFLAGS = COPTS = RPM_OPT_FLAGS = -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 @@ +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 @@ # 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.61.orig/dnsmasq.conf.example dnsmasq-2.61/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 -@@ -498,7 +498,7 @@ +@@ -505,7 +505,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,11 +38,11 @@ diff -Nru dnsmasq-2.61.orig/dnsmasq.conf.example dnsmasq-2.61/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.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" +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 @@ + #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" -#define CHGRP "dip" @@ -50,7 +50,7 @@ diff -Nru dnsmasq-2.61.orig/src/config.h dnsmasq-2.61/src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -138,7 +138,7 @@ +@@ -153,7 +153,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else