diff options
| author | Juergen Daubert <jue@jue.li> | 2014-04-12 18:00:02 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-04-12 18:00:02 +0200 |
| commit | c864d6654a619fae1e0fdabf77b669065e3e3d17 (patch) | |
| tree | 947e9e16c7bbd45ddaffd39360ee431388812d85 /dnsmasq/dnsmasq-config.patch | |
| parent | ece70a8f310e128682b5f52ee2222a9b78b32af0 (diff) | |
| download | opt-c864d6654a619fae1e0fdabf77b669065e3e3d17.tar.gz opt-c864d6654a619fae1e0fdabf77b669065e3e3d17.tar.xz | |
dnsmasq: update to 2.69
Diffstat (limited to 'dnsmasq/dnsmasq-config.patch')
| -rw-r--r-- | dnsmasq/dnsmasq-config.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch index dc2703e7c..2fc531a0a 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,6 +1,6 @@ -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 +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 @@ -20,11 +20,11 @@ PREFIX = /usr/local @@ -15,10 +15,10 @@ diff -Nru dnsmasq-2.66.orig/Makefile dnsmasq-2.66/Makefile LDFLAGS = COPTS = RPM_OPT_FLAGS = -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 @@ +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 +@@ -96,8 +96,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.66.orig/dnsmasq.conf.example dnsmasq-2.66/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 -@@ -505,7 +505,7 @@ +@@ -517,7 +517,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.66.orig/dnsmasq.conf.example dnsmasq-2.66/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.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 @@ +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 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" @@ -50,7 +50,7 @@ diff -Nru dnsmasq-2.66.orig/src/config.h dnsmasq-2.66/src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -153,7 +153,7 @@ +@@ -166,7 +166,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else |