ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

dnsmasq: update to 2.47

Browse Source
This commit is contained in:
Juergen Daubert 2009-02-07 09:00:27 +01:00
parent b855817855
commit 16e9fa125a
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dnsmasq/.md5sum
View File

@ -1,3 +1,3 @@
d1b2a1f31cea2c529358d7e73bcda6bd dnsmasq d1b2a1f31cea2c529358d7e73bcda6bd dnsmasq
79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz 4524081e56d0b935717d493e8e8d3e11 dnsmasq-2.47.tar.gz
9ac70b8fc8c1e2d2db5779a4316d46a0 dnsmasq-config.patch 1fbb5506fd5bfa07febdb13e9dc8f30f dnsmasq-config.patch

2
dnsmasq/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
name=dnsmasq name=dnsmasq
version=2.46 version=2.47
release=1 release=1
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \ source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \
$name-config.patch dnsmasq) $name-config.patch dnsmasq)

49
dnsmasq/dnsmasq-config.patch
View File

@ -1,6 +1,6 @@
diff -Nru dnsmasq-2.46.orig/Makefile dnsmasq-2.46/Makefile diff -Nru dnsmasq-2.47.orig/Makefile dnsmasq-2.47/Makefile
--- dnsmasq-2.46.orig/Makefile 2008-11-14 23:43:19.000000000 +0100 --- dnsmasq-2.47.orig/Makefile 2009-02-06 09:20:22.000000000 +0100
+++ dnsmasq-2.46/Makefile 2008-11-14 23:43:35.000000000 +0100 +++ dnsmasq-2.47/Makefile 2009-02-06 09:21:25.000000000 +0100
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
PREFIX = /usr/local PREFIX = /usr/local
@ -10,18 +10,27 @@ diff -Nru dnsmasq-2.46.orig/Makefile dnsmasq-2.46/Makefile
LOCALEDIR = ${PREFIX}/share/locale LOCALEDIR = ${PREFIX}/share/locale
SRC = src SRC = src
diff -Nru dnsmasq-2.46.orig/bld/Makefile dnsmasq-2.46/bld/Makefile @@ -23,7 +23,7 @@
--- dnsmasq-2.46.orig/bld/Makefile 2008-11-14 23:43:19.000000000 +0100 MAN = man
+++ dnsmasq-2.46/bld/Makefile 2008-11-14 23:43:35.000000000 +0100
PKG_CONFIG = pkg-config
-AWK = nawk
+AWK = awk
INSTALL = install
DBUS_MINOR=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --modversion dbus-1 | $(AWK) -F . -- '{ if ($$(NF-1)) print \"-DDBUS_MINOR=\"$$(NF-1) }'`"
diff -Nru dnsmasq-2.47.orig/bld/Makefile dnsmasq-2.47/bld/Makefile
--- dnsmasq-2.47.orig/bld/Makefile 2009-02-06 09:20:22.000000000 +0100
+++ dnsmasq-2.47/bld/Makefile 2009-02-06 09:20:35.000000000 +0100
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-CFLAGS = -Wall -W -O2 -CFLAGS = -Wall -W -O2
+CFLAGS += -Wall -W +CFLAGS += -Wall -W
OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \ OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \ dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
diff -Nru dnsmasq-2.46.orig/dnsmasq.conf.example dnsmasq-2.46/dnsmasq.conf.example diff -Nru dnsmasq-2.47.orig/dnsmasq.conf.example dnsmasq-2.47/dnsmasq.conf.example
--- dnsmasq-2.46.orig/dnsmasq.conf.example 2008-11-14 23:43:19.000000000 +0100 --- dnsmasq-2.47.orig/dnsmasq.conf.example 2009-02-06 09:20:22.000000000 +0100
+++ dnsmasq-2.46/dnsmasq.conf.example 2008-11-14 23:43:35.000000000 +0100 +++ dnsmasq-2.47/dnsmasq.conf.example 2009-02-06 09:20:36.000000000 +0100
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
# If you want dnsmasq to change uid and gid to something other # If you want dnsmasq to change uid and gid to something other
@ -33,7 +42,7 @@ diff -Nru dnsmasq-2.46.orig/dnsmasq.conf.example dnsmasq-2.46/dnsmasq.conf.examp
# If you want dnsmasq to listen for DHCP and DNS requests only on # If you want dnsmasq to listen for DHCP and DNS requests only on
# specified interfaces (and the loopback) give the name of the # specified interfaces (and the loopback) give the name of the
@@ -365,7 +365,7 @@ @@ -381,7 +381,7 @@
# The DHCP server needs somewhere on disk to keep its lease database. # 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 # This defaults to a sane location, but if you want to change it, use
# the line below. # the line below.
@ -42,20 +51,20 @@ diff -Nru dnsmasq-2.46.orig/dnsmasq.conf.example dnsmasq-2.46/dnsmasq.conf.examp
# Set the DHCP server to authoritative mode. In this mode it will barge in # 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, # and take over the lease for any client which broadcasts on the network,
diff -Nru dnsmasq-2.46.orig/src/config.h dnsmasq-2.46/src/config.h diff -Nru dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h
--- dnsmasq-2.46.orig/src/config.h 2008-11-14 23:43:19.000000000 +0100 --- dnsmasq-2.47.orig/src/config.h 2009-02-06 09:20:22.000000000 +0100
+++ dnsmasq-2.46/src/config.h 2008-11-14 23:43:35.000000000 +0100 +++ dnsmasq-2.47/src/config.h 2009-02-06 09:20:36.000000000 +0100
@@ -43,7 +43,7 @@ @@ -45,7 +45,7 @@
#elif defined(__sun__) || defined (__sun) # elif defined(__sun__) || defined (__sun)
# define LEASEFILE "/var/cache/dnsmasq.leases" # define LEASEFILE "/var/cache/dnsmasq.leases"
#else # else
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases" +# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
# endif
#endif #endif
#if defined(__FreeBSD__)
# define CONFFILE "/usr/local/etc/dnsmasq.conf" @@ -59,7 +59,7 @@
@@ -52,7 +52,7 @@
#endif
#define DEFLEASE 3600 /* default lease time, 1 hour */ #define DEFLEASE 3600 /* default lease time, 1 hour */
#define CHUSER "nobody" #define CHUSER "nobody"
-#define CHGRP "dip" -#define CHGRP "dip"