On 23/04/2015 13:22, Felix Fietkau wrote:
On 2015-04-23 12:09, Kevin Darbyshire-Bryant wrote:
Bump dnsmasq to v2.73rc6
Remove 001-fix-crash-in-auth-code.patch
200-fix-dhcpv6-solicit-handling.patch as now included upstream.
Signed-off-by: Kevin Darbyshire-Bryant ke...@darbyshire-bryant.me.uk
The patch is line wrapped and does not apply.
- Felix
G, stoopid Thunderbird! Hidden setting found. Sorry. Try this Felix.
Bump dnsmasq to v2.73rc6
Remove 001-fix-crash-in-auth-code.patch
200-fix-dhcpv6-solicit-handling.patch as now included upstream.
Signed-off-by: Kevin Darbyshire-Bryant ke...@darbyshire-bryant.me.uk
diff --git a/package/network/services/dnsmasq/Makefile
b/package/network/services/dnsmasq/Makefile
index 9c90e0f..c5d37a4 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -8,12 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.73rc4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/release-candidates
-PKG_MD5SUM:=24569c7605059aee175b1776201afa93
+PKG_VERSION:=2.73rc6
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://thekelleys.org.uk/dnsmasq.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=b8f16556d36924cd8dc7663cb4129d7b1f3fc2be
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
diff --git
a/package/network/services/dnsmasq/patches/001-fix-crash-in-auth-code.patch
b/package/network/services/dnsmasq/patches/001-fix-crash-in-auth-code.patch
deleted file mode 100644
index 9cba0cc..000
--- a/package/network/services/dnsmasq/patches/001-fix-crash-in-auth-code.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 38440b204db65f9be16c4c3daa7e991e4356f6ed Mon Sep 17 00:00:00 2001
-From: Simon Kelley si...@thekelleys.org.uk
-Date: Sun, 12 Apr 2015 21:52:47 +0100
-Subject: [PATCH] Fix crash in auth code with odd configuration.
-
- CHANGELOG | 32 +---
- src/auth.c | 13 -
- 2 files changed, 29 insertions(+), 16 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 9af6170..f2142c7 100644
a/CHANGELOG
-+++ b/CHANGELOG
-@@ -68,18 +68,31 @@ version 2.73
- Fix broken DNSSEC validation of ECDSA signatures.
-
- Add --dnssec-timestamp option, which provides an automatic
-- way to detect when the system time becomes valid after boot
-- on systems without an RTC, whilst allowing DNS queries before the
-- clock is valid so that NTP can run. Thanks to
-- Kevin Darbyshire-Bryant for developing this idea.
-+ way to detect when the system time becomes valid after
-+ boot on systems without an RTC, whilst allowing DNS
-+ queries before the clock is valid so that NTP can run.
-+ Thanks to Kevin Darbyshire-Bryant for developing this idea.
-
- Add --tftp-no-fail option. Thanks to Stefan Tomanek for
- the patch.
-
-- Fix crash caused by looking up servers.bind, CHAOS text record,
-- when more than about five --servers= lines are in the dnsmasq
-- config. This causes memory corruption which causes a crash later.
-- Thanks to Matt Coddington for sterling work chasing this down.
-+ Fix crash caused by looking up servers.bind, CHAOS text
-+ record, when more than about five --servers= lines are
-+ in the dnsmasq config. This causes memory corruption
-+ which causes a crash later. Thanks to Matt Coddington for
-+ sterling work chasing this down.
-+
-+ Fix crash on receipt of certain malformed DNS requests.
-+ Thanks to Nick Sampanis for spotting the problem.
-+
-+Fix crash in authoritative DNS code, if a .arpa zone
-+ is declared as authoritative, and then a PTR query which
-+ is not to be treated as authoritative arrived. Normally,
-+ directly declaring .arpa zone as authoritative is not
-+ done, so this crash wouldn't be seen. Instead the
-+ relevant .arpa zone should be specified as a subnet
-+ in the auth-zone declaration. Thanks to Johnny S. Lee
-+ for the bugreport and initial patch.
-
-
- version 2.72
-@@ -125,10 +138,7 @@ version 2.72
- Fix problem with --local-service option on big-endian platforms
- Thanks to Richard Genoud for the patch.
-
-- Fix crash on receipt of certain malformed DNS requests. Thanks
-- to Nick Sampanis for spotting the problem.
-
--
- version 2.71
- Subtle change to error handling to help DNSSEC validation
- when servers fail to provide NODATA answers for
-diff --git a/src/auth.c b/src/auth.c
-index 15721e5..4a5c39f 100644
a/src/auth.c
-+++ b/src/auth.c
-@@ -141,7 +141,7 @@ size_t answer_auth(struct
