diff --git a/dnsmasq-2.62.tar.gz b/dnsmasq-2.62.tar.gz deleted file mode 100644 index 55c1add..0000000 --- a/dnsmasq-2.62.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f2b4e4062f3bec35a9fd6636295f22fe042b2438b2305e1a570314f243ff210 -size 531616 diff --git a/dnsmasq-2.65.tar.gz b/dnsmasq-2.65.tar.gz new file mode 100644 index 0000000..cd02996 --- /dev/null +++ b/dnsmasq-2.65.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5ddf3111b4ec372d0e07bcc036bbe3a4c5a1a68b60c2a1018102a0099bc0740 +size 536832 diff --git a/dnsmasq.changes b/dnsmasq.changes index cdd8674..f19bdb4 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Dec 14 15:32:27 UTC 2012 - toganm@opensuse.org + +- Update to version 2.65. For other changes relating to other + versions in between please see the CHANGELOG + + * Fix regression which broke forwarding orgf queries sent via + TCP which are not for A and AAAA and which were directed to + non-default servers. Thanks to Niax for the bug reportst. + + Fix failure to build with DHCP support excluded. Thanks to + Gustavo Zacarias for the patch. + + Fix nasty regression in 27.64 which completely broke cacheing. + +- renamed group_and_isc.diff to group_and_isc.patch rebasinp to -p1 + level as outlined in the documentation at + http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines + ------------------------------------------------------------------- Thu Oct 4 07:32:36 UTC 2012 - cfarrell@suse.com diff --git a/dnsmasq.spec b/dnsmasq.spec index 64053ef..3397dd7 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -20,7 +20,7 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server License: GPL-2.0 Group: Productivity/Networking/DNS/Servers -Version: 2.62 +Version: 2.65 Release: 0 Provides: dns_daemon PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir @@ -28,7 +28,7 @@ Url: http://www.thekelleys.org.uk/dnsmasq/ Source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-%{version}.tar.gz Source1: vendor-files.tar.bz2 Source2: dnsmasq.service -Patch1: group_and_isc.diff +Patch1: group_and_isc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: libidn @@ -52,7 +52,7 @@ booting of diskless machines. %prep %setup -q -n dnsmasq-%{version} %setup -q -T -D -a1 -n dnsmasq-%{version} -%patch1 -p0 +%patch1 -p1 %build echo "#define HAVE_DBUS" >> src/config.h diff --git a/group_and_isc.diff b/group_and_isc.patch similarity index 67% rename from group_and_isc.diff rename to group_and_isc.patch index b618556..fe76f8a 100644 --- a/group_and_isc.diff +++ b/group_and_isc.patch @@ -1,17 +1,41 @@ ---- man/dnsmasq.8.orig -+++ man/dnsmasq.8 -@@ -118,8 +118,7 @@ can be over-ridden with this switch. - .TP - .B \-g, --group= +--- + Makefile | 4 ++-- + man/dnsmasq.8 | 1 + + src/config.h | 6 +++--- + 3 files changed, 6 insertions(+), 5 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ + + # Variables you may well want to override. + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man + LOCALEDIR = $(PREFIX)/share/locale +@@ -127,7 +127,7 @@ $(objs:.o=.c) $(hdrs): + $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< + + dnsmasq : .configured $(hdrs) $(objs) +- $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) + + dnsmasq.pot : $(objs:.o=.c) $(hdrs) + $(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ -i $(objs:.o=.c) +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -125,6 +125,7 @@ can be over-ridden with this switch. Specify the group which dnsmasq will run --as. The defaults to "dip", if available, to facilitate access to --/etc/ppp/resolv.conf which is not normally world readable. -+as. The defaults to "nogroup". + as. The defaults to "dip", if available, to facilitate access to + /etc/ppp/resolv.conf which is not normally world readable. ++as. The defaults to "nogroup" .TP .B \-v, --version Print the version number. ---- src/config.h.orig -+++ src/config.h +--- a/src/config.h ++++ b/src/config.h @@ -24,7 +24,7 @@ #define FORWARD_TIME 20 /* or 20 seconds */ #define RANDOM_SOCKS 64 /* max simultaneous random ports */ @@ -21,9 +45,9 @@ #define MAXLEASES 1000 /* maximum number of DHCP leases */ #define PING_WAIT 3 /* wait for ping address-in-use test */ #define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */ -@@ -35,8 +35,8 @@ +@@ -34,8 +34,8 @@ + #define HOSTSFILE "/etc/hosts" #define ETHERSFILE "/etc/ethers" - #define RUNFILE "/var/run/dnsmasq.pid" #define DEFLEASE 3600 /* default lease time, 1 hour */ -#define CHUSER "nobody" -#define CHGRP "dip" @@ -32,32 +56,3 @@ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" ---- Makefile.orig -+++ Makefile -@@ -18,14 +18,14 @@ - - # Variables you may well want to override. - --PREFIX = /usr/local -+PREFIX = /usr - BINDIR = $(PREFIX)/sbin - MANDIR = $(PREFIX)/share/man - LOCALEDIR = $(PREFIX)/share/locale - BUILDDIR = $(SRC) - DESTDIR = --CFLAGS = -Wall -W -O2 --LDFLAGS = -+CFLAGS += -Wall -W -O2 -+LDFLAGS += - COPTS = - RPM_OPT_FLAGS = - LIBS = -@@ -122,7 +122,7 @@ $(objs:.o=.c) $(hdrs): - $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< - - dnsmasq : $(hdrs) $(objs) -- $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) - - dnsmasq.pot : $(objs:.o=.c) $(hdrs) - $(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ -i $(objs:.o=.c)