diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index 872960157..b082c1d57 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ d1b2a1f31cea2c529358d7e73bcda6bd dnsmasq -0f048f3fd1f3888876867809d162cd89 dnsmasq-2.51.tar.lzma -940ad9c3f952082e74c5a140b5e879f4 dnsmasq-config.patch +2d156f322564fdd71ad238040cd607ac dnsmasq-2.52.tar.lzma +570317114c986bbf2f90949c17049ac7 dnsmasq-config.patch diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 1c37bfb6e..86944ece1 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de name=dnsmasq -version=2.51 +version=2.52 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.lzma \ $name-config.patch dnsmasq) diff --git a/dnsmasq/README b/dnsmasq/README index d610e1d94..77cd012b5 100644 --- a/dnsmasq/README +++ b/dnsmasq/README @@ -11,13 +11,13 @@ PRE-INSTALL POST-INSTALL -As of version 1.16 dnsmasq use the syslogd facility daemon +As of version 1.16 dnsmasq use the syslog facility daemon with priority debug for logging of queries, if log-queries is enabled. This will not work with the default configuration of CRUX. Add something like the following to /etc/syslog.conf: - daemon.debug -/var/log/debug + *.=debug /var/log/debug PRECAUTION diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch index bb08374d1..082150317 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,6 +1,6 @@ -diff -Nru dnsmasq-2.51.orig/Makefile dnsmasq-2.51/Makefile ---- dnsmasq-2.51.orig/Makefile 2009-10-15 13:58:55.000000000 +0200 -+++ dnsmasq-2.51/Makefile 2009-10-15 13:59:12.000000000 +0200 +diff -Nru dnsmasq-2.52.orig/Makefile dnsmasq-2.52/Makefile +--- dnsmasq-2.52.orig/Makefile 2010-01-22 22:26:22.000000000 +0100 ++++ dnsmasq-2.52/Makefile 2010-01-22 22:51:22.000000000 +0100 @@ -15,7 +15,7 @@ PREFIX = /usr/local @@ -9,19 +9,19 @@ diff -Nru dnsmasq-2.51.orig/Makefile dnsmasq-2.51/Makefile +MANDIR = ${PREFIX}/man LOCALEDIR = ${PREFIX}/share/locale - SRC = src -diff -Nru dnsmasq-2.51.orig/bld/Makefile dnsmasq-2.51/bld/Makefile ---- dnsmasq-2.51.orig/bld/Makefile 2009-10-15 13:58:55.000000000 +0200 -+++ dnsmasq-2.51/bld/Makefile 2009-10-15 13:59:12.000000000 +0200 -@@ -1,4 +1,4 @@ + PKG_CONFIG = pkg-config +@@ -24,7 +24,7 @@ + MSGFMT = msgfmt + XGETTEXT = xgettext + -CFLAGS = -Wall -W -O2 +CFLAGS += -Wall -W - 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 \ -diff -Nru dnsmasq-2.51.orig/dnsmasq.conf.example dnsmasq-2.51/dnsmasq.conf.example ---- dnsmasq-2.51.orig/dnsmasq.conf.example 2009-10-15 13:58:55.000000000 +0200 -+++ dnsmasq-2.51/dnsmasq.conf.example 2009-10-15 13:59:12.000000000 +0200 + ################################################################# + +diff -Nru dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/dnsmasq.conf.example +--- dnsmasq-2.52.orig/dnsmasq.conf.example 2010-01-22 22:26:22.000000000 +0100 ++++ dnsmasq-2.52/dnsmasq.conf.example 2010-01-22 22:26:59.000000000 +0100 @@ -75,8 +75,8 @@ # If you want dnsmasq to change uid and gid to something other @@ -42,9 +42,9 @@ diff -Nru dnsmasq-2.51.orig/dnsmasq.conf.example dnsmasq-2.51/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.51.orig/src/config.h dnsmasq-2.51/src/config.h ---- dnsmasq-2.51.orig/src/config.h 2009-10-15 13:58:55.000000000 +0200 -+++ dnsmasq-2.51/src/config.h 2009-10-15 13:59:12.000000000 +0200 +diff -Nru dnsmasq-2.52.orig/src/config.h dnsmasq-2.52/src/config.h +--- dnsmasq-2.52.orig/src/config.h 2010-01-22 22:26:23.000000000 +0100 ++++ dnsmasq-2.52/src/config.h 2010-01-22 22:26:59.000000000 +0100 @@ -47,7 +47,7 @@ # elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases"