diff --git a/dnsmasq-2.81-restore-ability-to-answer-non-recursive-requests.patch b/dnsmasq-2.81-restore-ability-to-answer-non-recursive-requests.patch index b062d29..cc6d9a8 100644 --- a/dnsmasq-2.81-restore-ability-to-answer-non-recursive-requests.patch +++ b/dnsmasq-2.81-restore-ability-to-answer-non-recursive-requests.patch @@ -1,4 +1,4 @@ -From d070ba529bf3be2c6c1e2fe52120820cc83ced68 Mon Sep 17 00:00:00 2001 +From bb7adef44c20e4271b0b8a6e55dac4e986c02fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 12 Apr 2019 15:29:00 +0200 Subject: [PATCH] Restore ability to answer non-recursive requests @@ -16,7 +16,7 @@ behaviour. 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/rfc1035.c b/src/rfc1035.c -index a943ecb..efc7009 100644 +index a943ecb..74befef 100644 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -1273,7 +1273,11 @@ static unsigned long crec_ttl(struct crec *crecp, time_t now) @@ -44,7 +44,7 @@ index a943ecb..efc7009 100644 /* never answer queries with RD unset, to avoid cache snooping. */ - if (!(header->hb3 & HB3_RD) || - ntohs(header->ancount) != 0 || -+ if (!ntohs(header->ancount) != 0 || ++ if (ntohs(header->ancount) != 0 || ntohs(header->nscount) != 0 || ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY ) diff --git a/dnsmasq.spec b/dnsmasq.spec index 2b98260..3a7342b 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -13,7 +13,7 @@ Name: dnsmasq Version: 2.80 -Release: 13%{?extraversion:.%{extraversion}}%{?dist} +Release: 14%{?extraversion:.%{extraversion}}%{?dist} Summary: A lightweight DHCP/caching DNS server License: GPLv2 or GPLv3 @@ -44,6 +44,7 @@ Patch13: dnsmasq-2.81-adjust-changes-to-version-2.80.patch # http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=52ec7836139e7a11374971905e5ac0d2d02e32c0 Patch14: dnsmasq-2.81-tag-filtering-of-dhcp-host-directives.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1647464 +# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=29ae3083981ea82f535f77ea54bbd538f1224a9e Patch15: dnsmasq-2.81-restore-ability-to-answer-non-recursive-requests.patch # This is workaround to nettle bug #1549190 @@ -177,6 +178,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf %{_mandir}/man1/dhcp_* %changelog +* Mon Mar 23 2020 Petr Menšík - 2.80-14 +- Fix last build breakage of DNS (#1814468) + * Tue Mar 10 2020 Petr Menšík - 2.80-13 - Respond to any local name also withou rd bit set (#1647464)