diff --git a/bind-9.11-rh1893761.patch b/bind-9.11-rh1893761.patch new file mode 100644 index 0000000..0ce51dd --- /dev/null +++ b/bind-9.11-rh1893761.patch @@ -0,0 +1,28 @@ +From ee53b9558fb73dc0c2f328fe91421f2c32e9a369 Mon Sep 17 00:00:00 2001 +From: Mark Andrews +Date: Tue, 3 Nov 2020 11:25:55 +1100 +Subject: [PATCH] Call nta_detach() before dns_view_weakdetach() so view is + available. + +(cherry picked from commit ea956976d1e89f49570a4690fbad377e4f607c77) +--- + lib/dns/nta.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dns/nta.c b/lib/dns/nta.c +index 79058bb9b5..73febe44ed 100644 +--- a/lib/dns/nta.c ++++ b/lib/dns/nta.c +@@ -283,8 +283,8 @@ checkbogus(isc_task_t *task, isc_event_t *event) { + &nta->sigrdataset, + &nta->fetch); + if (result != ISC_R_SUCCESS) { +- dns_view_weakdetach(&view); + nta_detach(view->mctx, &nta); ++ dns_view_weakdetach(&view); + } + } + +-- +2.26.2 + diff --git a/bind.spec b/bind.spec index 1a90d93..9089da0 100644 --- a/bind.spec +++ b/bind.spec @@ -67,7 +67,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.24 -Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -162,6 +162,7 @@ Patch174:bind-9.11-json-c.patch Patch175:bind-9.11-fips-disable.patch Patch177: bind-9.11-serve-stale.patch Patch178: bind-9.11-serve-stale-dbfix.patch +Patch179: bind-9.11-rh1893761.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -575,6 +576,7 @@ are used for building ISC DHCP. %patch175 -p1 -b .rh1709553 %patch177 -p1 -b .serve-stale %patch178 -p1 -b .rh1770492 +%patch179 -p1 -b .rh1893761 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1608,6 +1610,9 @@ fi; %endif %changelog +* Wed Nov 04 2020 Petr Menšík - 32:9.11.24-2 +- Fix crash on NTA recheck failure (#1893761) + * Fri Oct 23 2020 Petr Menšík - 32:9.11.24-1 - Update to 9.11.24