Message ID | 55408A9A.9050301@darbyshire-bryant.me.uk |
---|---|
State | Superseded |
Headers | show |
Sorry, beat you again by 20 minutes :P
On 29/04/2015 09:17, Steven Barth wrote: > Sorry, beat you again by 20 minutes :P > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ROFL - I *should* give up, but I won't :-) Out of interest, did I actually get the patch formatting and everything correct? Any reason why it wouldn't be applied? If not I'll be very happy! Kevin
Looks good and applies. Usually the Signed-off-by is at the end of the commit message though. Cheers, Steven
On 29/04/2015 10:13, Steven Barth wrote:
> Looks good and applies. Usually the Signed-off-by is at the end of the commit message though.
Understood. Happy :-)
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index b962470..8f55274 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.73rc6 +PKG_VERSION:=2.73rc7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/release-candidates -PKG_MD5SUM:=9ee735fe4f1250620f007039a034710f +PKG_MD5SUM:=526f7d51b71e07e6e431f5ea48f4b5be PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/dnsmasq/patches/001-include-RRSIG-RR-answers-to-ANY-queries.patch b/package/network/services/dnsmasq/patches/001-include-RRSIG-RR-answers-to-ANY-queries.patch new file mode 100644 index 0000000..40ccd1a --- /dev/null +++ b/package/network/services/dnsmasq/patches/001-include-RRSIG-RR-answers-to-ANY-queries.patch @@ -0,0 +1,29 @@ +From 2ed162ac204f3609fe4d9f9a0430baeaa352d88f Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Tue, 28 Apr 2015 21:26:35 +0100 +Subject: [PATCH] Don't remove RRSIG RR from answers to ANY queries when the + do bit is not set. + +--- + src/rfc1035.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 32df31a..5828055 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -1608,6 +1608,11 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + GETSHORT(qtype, p); + GETSHORT(qclass, p); + ++ /* Don't filter RRSIGS from answers to ANY queries, even if do-bit ++ not set. */ ++ if (qtype == T_ANY) ++ *do_bit = 1; ++ + ans = 0; /* have we answered this question */ + + if (qtype == T_TXT || qtype == T_ANY) +-- +1.7.10.4 +
Bump dnsmasq to v2.73rc7 Fixes DNSSEC over TCP issue Also include patch from dnsmasq upstream to include RRSIG RR replies in ANY queries Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> Tested Archer C7 Maybe I even get this one right :-)