From 2352f5c9e65de619d0794d1460bc4d9bcd78a2d8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 19 2020 18:26:36 +0000
Subject: import bind-9.11.20-4.el8


---

diff --git a/SOURCES/bind-9.11-rh1859454.patch b/SOURCES/bind-9.11-rh1859454.patch
new file mode 100644
index 0000000..df0ff19
--- /dev/null
+++ b/SOURCES/bind-9.11-rh1859454.patch
@@ -0,0 +1,31 @@
+From 30753514ac06111da5b677fe7cdbafd696b1d620 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Wed, 22 Jul 2020 18:55:02 +0200
+Subject: [PATCH] Prevent crash on dst initialization failure
+
+server might be created, but not yet fully initialized, when fatal
+function is called. Check both server and task before attaching
+exclusive task.
+
+(cherry picked from commit c5e7152cf04f75d0fe00163f076f4cc3cafce259)
+(cherry picked from commit 35fbfaa4981333286437f26557db26863d4c5299)
+---
+ bin/named/server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 3cd8daf99e..38780ad3d7 100644
+--- a/bin/named/server.c
++++ b/bin/named/server.c
+@@ -9341,7 +9341,7 @@ ns_server_destroy(ns_server_t **serverp) {
+ 
+ static void
+ fatal(ns_server_t *server, const char *msg, isc_result_t result) {
+-	if (server != NULL) {
++	if (server != NULL && server->task != NULL) {
+ 		/*
+ 		 * Prevent races between the OpenSSL on_exit registered
+ 		 * function and any other OpenSSL calls from other tasks
+-- 
+2.26.2
+
diff --git a/SPECS/bind.spec b/SPECS/bind.spec
index 2ba69ee..b30d44b 100644
--- a/SPECS/bind.spec
+++ b/SPECS/bind.spec
@@ -65,7 +65,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.11.20
-Release:  3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 #
@@ -155,6 +155,7 @@ Patch174:bind-9.11-fips-disable.patch
 Patch175:bind-9.11-json-c.patch
 Patch177:bind-9.11-serve-stale.patch
 Patch178:bind-9.11-dhcp-time-monotonic.patch
+Patch179:bind-9.11-rh1859454.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -513,6 +514,7 @@ are used for building ISC DHCP.
 %patch175 -p1 -b .json-c
 %patch177 -p1 -b .serve-stale
 %patch178 -p1 -b .time-monotonic
+%patch179 -p1 -b .rh1859454
 
 mkdir lib/dns/tests/testdata/dstrandom
 cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
@@ -1521,6 +1523,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Jul 22 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.20-4
+- Prevent crash on dstlib initialization failure (#1859454)
+
 * Fri Jun 19 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.20-3
 - Add remaining require to bind package (#1633169)