Update to 9.14.4

Current latest version fixes unit tests.
2019-07-24 12:50:29 +02:00 · 2019-07-24 12:50:29 +02:00 · 2dbb099871
commit 2dbb099871
parent 3c4d9d472a
8 changed files with 84 additions and 74 deletions
--- a/.gitignore
+++ b/.gitignore
@ -92,6 +92,7 @@ bind-9.7.2b1.tar.gz
 /bind-9.11.5-P4.tar.gz
 /bind-9.11.6.tar.gz
 /bind-9.11.6-P1.tar.gz
+/bind-9.14.4.tar.gz
 /bind-9.11.7.tar.gz
 /bind-9.11.8.tar.gz
 /bind-9.11.9.tar.gz
--- a/bind-9.10-dist-native-pkcs11.patch
+++ b/bind-9.10-dist-native-pkcs11.patch
@ -12,7 +12,7 @@ index 9ad7f62..094775a 100644
 TARGETS =
 
 diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
-index be1ac3b..c1ee27c 100644
+index 321058b..5067ee1 100644
 --- a/bin/dnssec-pkcs11/Makefile.in
 +++ b/bin/dnssec-pkcs11/Makefile.in
@@ -15,17 +15,17 @@ VERSION=@BIND9_VERSION@
@ -25,10 +25,10 @@ index be1ac3b..c1ee27c 100644
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+-DNSLIBS =	../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 -ISCLIBS =	../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
 -ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
-+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 +ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
 +ISCNOSYMLIBS =	../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@
 
@ -132,10 +132,10 @@ index be1ac3b..c1ee27c 100644
 
 clean distclean::
 diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
-index 856463f..dc826dd 100644
+index eecfa76..416e12e 100644
 --- a/bin/named-pkcs11/Makefile.in
 +++ b/bin/named-pkcs11/Makefile.in
-@@ -43,27 +43,27 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
+@@ -43,9 +43,9 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
 DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
 
 CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
@ -144,14 +144,15 @@ index 856463f..dc826dd 100644
 		${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
 -		${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
 +		${ISC_PKCS11_INCLUDES} ${DLZDRIVER_INCLUDES} \
- 		${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@
+ 		${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
+ 		@OPENSSL_INCLUDES@
 
- CDEFINES =      @CONTRIB_DLZ@
+@@ -53,18 +53,18 @@ CDEFINES =      @CONTRIB_DLZ@
 
 CWARNINGS =
 
-DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
-+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @DNS_CRYPTO_LIBS@
+-DNSLIBS =	../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 ISCCFGLIBS =	../../lib/isccfg/libisccfg.@A@
 ISCCCLIBS =	../../lib/isccc/libisccc.@A@
 -ISCLIBS =	../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
@ -170,7 +171,7 @@ index 856463f..dc826dd 100644
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
 NSDEPLIBS =	../../lib/ns/libns.@A@
 
-@@ -72,17 +72,17 @@ DEPLIBS =	${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
+@@ -73,17 +73,17 @@ DEPLIBS =	${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 
 LIBS =		${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -190,9 +191,9 @@ index 856463f..dc826dd 100644
 +TARGETS =	named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@
 
 GEOIPLINKOBJS = geoip.@O@
- 
-@@ -90,8 +90,7 @@ OBJS =		builtin.@O@ config.@O@ control.@O@ \
- 		controlconf.@O@ fuzz.@O@ @GEOIPLINKOBJS@ \
+ GEOIP2LINKOBJS = geoip.@O@
+@@ -93,8 +93,7 @@ OBJS =		builtin.@O@ config.@O@ control.@O@ \
+ 		@GEOIPLINKOBJS@ @GEOIP2LINKOBJS@ \
 		log.@O@ logconf.@O@ main.@O@ \
 		server.@O@ statschannel.@O@ \
 -		tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \
@ -201,8 +202,8 @@ index 856463f..dc826dd 100644
 
 UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
 
-@@ -103,8 +102,7 @@ SRCS =		builtin.c config.c control.c \
- 		controlconf.c fuzz.c @GEOIPLINKSRCS@ \
+@@ -108,8 +107,7 @@ SRCS =		builtin.c config.c control.c \
+ 		@GEOIPLINKSRCS@ @GEOIP2LINKSRCS@ \
 		log.c logconf.c main.c \
 		server.c statschannel.c \
 -		tkeyconf.c tsigconf.c zoneconf.c \
@ -211,7 +212,7 @@ index 856463f..dc826dd 100644
 
 MANPAGES =	named.8 named.conf.5
 
-@@ -143,7 +141,7 @@ server.@O@: server.c
+@@ -149,7 +147,7 @@ server.@O@: server.c
 		-DPRODUCT=\"${PRODUCT}\" \
 		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
 
@ -220,7 +221,7 @@ index 856463f..dc826dd 100644
 	export MAKE_SYMTABLE="yes"; \
 	export BASEOBJS="${OBJS} ${UOBJS}"; \
 	${FINALBUILDCMD}
-@@ -153,7 +151,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
+@@ -159,7 +157,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
 		-c ${top_srcdir}/bin/tests/system/feature-test.c
 
@ -229,7 +230,7 @@ index 856463f..dc826dd 100644
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
 		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
 
-@@ -186,13 +184,13 @@ install-man8: named.8
+@@ -192,13 +190,13 @@ install-man8: named.8
 
 install-man: install-man5 install-man8
 
@ -268,10 +269,10 @@ index 96aec05..0e542f3 100644
 DEPLIBS =	${ISCDEPLIBS}
 
 diff --git a/configure.ac b/configure.ac
-index 6e17d3a..0f7c850 100644
+index 29106cb..3dff344 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1188,12 +1188,14 @@ AC_SUBST(USE_GSSAPI)
+@@ -1267,12 +1267,14 @@ AC_SUBST(USE_GSSAPI)
 AC_SUBST(DST_GSSAPI_INC)
 AC_SUBST(DNS_GSSAPI_LIBS)
 DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS"
@ -286,7 +287,7 @@ index 6e17d3a..0f7c850 100644
 
 #
 # was --with-lmdb specified?
-@@ -2466,6 +2468,9 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE)
+@@ -2542,6 +2544,9 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE)
 AC_SUBST(BIND9_NS_BUILDINCLUDE)
 AC_SUBST(BIND9_BIND9_BUILDINCLUDE)
 AC_SUBST(BIND9_IRS_BUILDINCLUDE)
@ -296,7 +297,7 @@ index 6e17d3a..0f7c850 100644
 if test "X$srcdir" != "X"; then
 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
-@@ -2474,6 +2479,9 @@ if test "X$srcdir" != "X"; then
+@@ -2550,6 +2555,9 @@ if test "X$srcdir" != "X"; then
 	BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include"
 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
 	BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
@ -306,7 +307,7 @@ index 6e17d3a..0f7c850 100644
 else
 	BIND9_ISC_BUILDINCLUDE=""
 	BIND9_ISCCC_BUILDINCLUDE=""
-@@ -2482,6 +2490,9 @@ else
+@@ -2558,6 +2566,9 @@ else
 	BIND9_NS_BUILDINCLUDE=""
 	BIND9_BIND9_BUILDINCLUDE=""
 	BIND9_IRS_BUILDINCLUDE=""
@ -316,7 +317,7 @@ index 6e17d3a..0f7c850 100644
 fi
 
 AC_SUBST_FILE(BIND9_MAKE_INCLUDES)
-@@ -2940,8 +2951,11 @@ AC_CONFIG_FILES([
+@@ -3021,8 +3032,11 @@ AC_CONFIG_FILES([
 	bin/delv/Makefile
 	bin/dig/Makefile
 	bin/dnssec/Makefile
@ -328,7 +329,7 @@ index 6e17d3a..0f7c850 100644
 	bin/nsupdate/Makefile
 	bin/pkcs11/Makefile
 	bin/plugins/Makefile
-@@ -3014,6 +3028,10 @@ AC_CONFIG_FILES([
+@@ -3095,6 +3109,10 @@ AC_CONFIG_FILES([
 	lib/dns/include/dns/Makefile
 	lib/dns/include/dst/Makefile
 	lib/dns/tests/Makefile
@ -339,7 +340,7 @@ index 6e17d3a..0f7c850 100644
 	lib/irs/Makefile
 	lib/irs/include/Makefile
 	lib/irs/include/irs/Makefile
-@@ -3034,6 +3052,20 @@ AC_CONFIG_FILES([
+@@ -3115,6 +3133,20 @@ AC_CONFIG_FILES([
 	lib/isc/unix/include/Makefile
 	lib/isc/unix/include/isc/Makefile
 	lib/isc/unix/include/pkcs11/Makefile
@ -374,17 +375,18 @@ index ffa2d5a..439d748 100644
 
 @BIND9_MAKE_RULES@
 diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
-index eb3346a..c9e4960 100644
+index 60c87a8..50da232 100644
 --- a/lib/dns-pkcs11/Makefile.in
 +++ b/lib/dns-pkcs11/Makefile.in
-@@ -26,16 +26,16 @@ VERSION=@BIND9_VERSION@
+@@ -26,17 +26,17 @@ VERSION=@BIND9_VERSION@
 
 USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 
 -CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
-		${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
+-		${ISC_INCLUDES} ${MAXMINDDB_CFLAGS} \
 +CINCLUDES =	-I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} \
-+		${ISC_PKCS11_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
+		${ISC_PKCS11_INCLUDES} ${MAXMINDDB_CFLAGS} \
+ 		@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
 
 CDEFINES =	@USE_GSSAPI@ ${USE_ISC_SPNEGO}
 
@ -396,9 +398,9 @@ index eb3346a..c9e4960 100644
 -ISCDEPLIBS =	../../lib/isc/libisc.@A@
 +ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
 
- LIBS =		@LIBS@
+ LIBS =		${MAXMINDDB_LIBS} @LIBS@
 
-@@ -134,15 +134,15 @@ version.@O@: version.c
+@@ -138,15 +138,15 @@ version.@O@: version.c
 		-DLIBAGE=${LIBAGE} \
 		-c ${srcdir}/version.c
 
@ -418,13 +420,15 @@ index eb3346a..c9e4960 100644
 
 include: gen
 	${MAKE} include/dns/enumtype.h
-@@ -168,25 +168,25 @@ code.h:	gen
+@@ -172,27 +172,27 @@ code.h:	gen
 	./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
 
 gen: gen.c
 -	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
 +	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc-pkcs11/include \
- 	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
+ 	${LFS_CFLAGS} ${LFS_LDFLAGS} \
+ 	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
+ 	${BUILD_LIBS} ${LFS_LIBS}
 
 -timestamp: include libdns.@A@
 +timestamp: include libdns-pkcs11.@A@
@ -449,7 +453,7 @@ index eb3346a..c9e4960 100644
 +	rm -f libdns-pkcs11.@A@ timestamp
 	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
 	rm -f include/dns/rdatastruct.h
- 	rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h
+ 	rm -f dnstap.pb-c.c dnstap.pb-c.h
 diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
 index ed87279..3171b48 100644
 --- a/lib/isc-pkcs11/Makefile.in
--- a/bind-9.11-feature-test-named.patch
+++ b/bind-9.11-feature-test-named.patch
@ -1,4 +1,4 @@
-From b45cc1caf018d46753a03d59bb9e75cdeef1deeb Mon Sep 17 00:00:00 2001
+From 36e3d1b08f697190b259a8421472ec16b52315b5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Wed, 30 Jan 2019 14:37:17 +0100
 Subject: [PATCH] Create feature-test in source directory
@ -12,10 +12,10 @@ compile feature-test for each of them this way.
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 10d568f..856463f 100644
+index 4e8006d..eecfa76 100644
 --- a/bin/named/Makefile.in
 +++ b/bin/named/Makefile.in
-@@ -82,7 +82,7 @@ NOSYMLIBS =	${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
+@@ -83,7 +83,7 @@ NOSYMLIBS =	${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
 
 SUBDIRS =	unix
 
@ -23,8 +23,8 @@ index 10d568f..856463f 100644
 +TARGETS =	named@EXEEXT@ feature-test@EXEEXT@
 
 GEOIPLINKOBJS = geoip.@O@
- 
-@@ -148,6 +148,15 @@ named@EXEEXT@: ${OBJS} ${DEPLIBS}
+ GEOIP2LINKOBJS = geoip.@O@
+@@ -154,6 +154,15 @@ named@EXEEXT@: ${OBJS} ${DEPLIBS}
 	export BASEOBJS="${OBJS} ${UOBJS}"; \
 	${FINALBUILDCMD}
 
@ -41,10 +41,10 @@ index 10d568f..856463f 100644
 
 docclean manclean maintainer-clean::
 diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index d9efc63..0f4ead0 100644
+index c713d96..20366e5 100644
 --- a/bin/tests/system/conf.sh.in
 +++ b/bin/tests/system/conf.sh.in
-@@ -38,7 +38,7 @@ DELV=$TOP/bin/delv/delv
+@@ -34,7 +34,7 @@ DELV=$TOP/bin/delv/delv
 DIG=$TOP/bin/dig/dig
 DNSTAPREAD=$TOP/bin/tools/dnstap-read
 DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
--- a/bind-9.11-fips-tests.patch
+++ b/bind-9.11-fips-tests.patch
@ -1,4 +1,4 @@
-From 0b1c2b11ccec87da88bcdceeda814c489163461b Mon Sep 17 00:00:00 2001
+From 11d42f5d851881fd559a716df78a18dba1d6975d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Thu, 2 Aug 2018 23:46:45 +0200
 Subject: [PATCH] FIPS tests changes
@ -76,7 +76,6 @@ Date:   Wed Mar 7 10:44:23 2018 +0100
 bin/tests/system/catz/ns2/named.conf.in       |  2 +-
 bin/tests/system/checkconf/bad-tsig.conf      |  2 +-
 bin/tests/system/checkconf/good.conf          |  2 +-
- bin/tests/system/dlv/ns3/sign.sh              |  1 +
 bin/tests/system/feature-test.c               | 14 ++++
 bin/tests/system/notify/ns5/named.conf.in     |  6 +-
 bin/tests/system/notify/tests.sh              |  6 +-
@ -91,7 +90,7 @@ Date:   Wed Mar 7 10:44:23 2018 +0100
 bin/tests/system/tsig/tests.sh                | 67 ++++++++++++-------
 bin/tests/system/upforwd/ns1/named.conf.in    |  2 +-
 bin/tests/system/upforwd/tests.sh             |  2 +-
- 33 files changed, 152 insertions(+), 107 deletions(-)
+ 32 files changed, 151 insertions(+), 107 deletions(-)

 diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
 index 0ea6502..026db3f 100644
@ -561,20 +560,8 @@ index d627d2a..9d0322a 100644
 +	algorithm "hmac-sha256";
 	secret "qwertyuiopasdfgh";
 };
-diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
-index fa51ae1..bc46942 100755
--- a/bin/tests/system/dlv/ns3/sign.sh
-+++ b/bin/tests/system/dlv/ns3/sign.sh
-@@ -19,6 +19,7 @@ echo_i "dlv/ns3/sign.sh"
- dlvzone=dlv.utld.
- dlvsets=
- dssets=
-+bits=1024
- 
- zone=child1.utld.
- infile=child.db.in
 diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
-index 8b9deb6..e5d8997 100644
+index ff92ad2..746e022 100644
 --- a/bin/tests/system/feature-test.c
 +++ b/bin/tests/system/feature-test.c
@@ -19,6 +19,7 @@
@ -585,7 +572,7 @@ index 8b9deb6..e5d8997 100644
 #include <dns/edns.h>
 
 #ifdef WIN32
-@@ -159,6 +160,19 @@ main(int argc, char **argv) {
+@@ -168,6 +169,19 @@ main(int argc, char **argv) {
 #endif
 	}
 
@ -698,10 +685,10 @@ index 5d70114..6c4b55a 100644
 $DDNSCONFGEN -q -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key
 $DDNSCONFGEN -q -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key
 diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
-index dd0286f..906135c 100755
+index b73d178..f573905 100755
 --- a/bin/tests/system/nsupdate/tests.sh
 +++ b/bin/tests/system/nsupdate/tests.sh
-@@ -700,7 +700,14 @@ fi
+@@ -708,7 +708,14 @@ fi
 n=`expr $n + 1`
 ret=0
 echo_i "check TSIG key algorithms ($n)"
@ -717,7 +704,7 @@ index dd0286f..906135c 100755
     $NSUPDATE -k ns1/${alg}.key <<END > /dev/null || ret=1
 server 10.53.0.1 ${PORT}
 update add ${alg}.keytests.nil. 600 A 10.10.10.3
-@@ -708,7 +715,7 @@ send
+@@ -716,7 +723,7 @@ send
 END
 done
 sleep 2
--- a/bind-9.11-kyua-pkcs11.patch
+++ b/bind-9.11-kyua-pkcs11.patch
@ -1,4 +1,4 @@
-From c2e22d5b55fdc17cd51bf77980892e147c2b2ea1 Mon Sep 17 00:00:00 2001
+From f0ce2b4855b70f1fb04394b35626c37ebb0a8c75 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Tue, 2 Jan 2018 18:13:07 +0100
 Subject: [PATCH] Fix pkcs11 variants atf tests
@ -15,10 +15,10 @@ Add pkcs11 Kyuafile, fix dh_test to pass in pkcs11 mode
 5 files changed, 14 insertions(+), 10 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index 0f7c850..0532e5f 100644
+index 3dff344..424a542 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3032,6 +3032,7 @@ AC_CONFIG_FILES([
+@@ -3113,6 +3113,7 @@ AC_CONFIG_FILES([
 	lib/dns-pkcs11/include/Makefile
 	lib/dns-pkcs11/include/dns/Makefile
 	lib/dns-pkcs11/include/dst/Makefile
@ -42,7 +42,7 @@ index 39ce986..dcfb139 100644
 include('isccfg/Kyuafile')
 include('ns/Kyuafile')
 diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in
-index 7b35b93..c95d1c8 100644
+index eb297c9..144d6b2 100644
 --- a/lib/dns-pkcs11/tests/Makefile.in
 +++ b/lib/dns-pkcs11/tests/Makefile.in
@@ -15,14 +15,14 @@ VERSION=@BIND9_VERSION@
@ -57,11 +57,11 @@ index 7b35b93..c95d1c8 100644
 
 -ISCLIBS =	../../isc/libisc.@A@ @OPENSSL_LIBS@
 -ISCDEPLIBS =	../../isc/libisc.@A@
-DNSLIBS =	../libdns.@A@ @DNS_CRYPTO_LIBS@
+-DNSLIBS =	../libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 -DNSDEPLIBS =	../libdns.@A@
 +ISCLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
 +ISCDEPLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
-+DNSLIBS =	../libdns-pkcs11.@A@ @DNS_CRYPTO_LIBS@
+DNSLIBS =	../libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
 +DNSDEPLIBS =	../libdns-pkcs11.@A@
 
 LIBS =		@LIBS@ @CMOCKA_LIBS@
--- a/bind-9.14.4.tar.gz.asc
+++ b/bind-9.14.4.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABAgAdFiEErj+seWcR7Fn8AHqkdLtrmky7PTgFAl0u4wkACgkQdLtrmky7
+PThVjxAAgSBMHHL5U/vjlK1ZaNdOlwdG2b48+IYu3TkOnFHoAoX0Zkt12xgdWdHi
+ChL645zHeCo16a7OY40wcDhmSa9lIB+M7D7SNNhFAp0Ta2DGKy3mvSloTup/XDeJ
+cdb7rOQdvh70nf+YV4NKADP/QvQdAmMOEhNIZzAW2u+LOCcJwVAlaN1cMt2GEYLM
+0qhKynPKNWcotA9RnCH3K2eNPT4u8X6MyU1XqA+JHJvwFLwJq6xpV8l7IfHEnK5l
+6nhul6IlYAclHtFEw4rADQScQE8Zg2PXtb8Ajn/ml2nXbSjluprAWgHd8aUl2/gV
+VZVzGI9ZaZD9a2Vkj9pJcNKWMcGk0tlBME5Sv9BIwx8jna66kze9z0AhaziwDgnV
+4Ur+xYo784FzSXoxhwvSQlvbs18TZHTx9vYTg2xUIFO2bjIfdAY2oe2Hegr8u9mj
+tCxnOJYE+xLJaj3CsPEoPwDcyV11Swka6+jqsA8ngVb99Y/tct8+BDd6zgjRQaSG
+7ETk6Hi09QFAMe2YPy+BwcHhk05SD784Cvs3KH9W7x0uFVIdc7xVs+vwe+5SH/Q3
+IPCKfhk0k4A/dmjYSmKvzkT5UyIdt/VqVYuVFmMFLqs3Xf0F1KUt/3fJJJfGhaOp
+tflZWGpR6Gou7TY/kMM35yGz9HnZ5uSWAOUhEQAHG1uKck49GjA=
+=DwY1
+-----END PGP SIGNATURE-----
--- a/bind.spec
+++ b/bind.spec
@ -68,7 +68,7 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.14.0
+Version:  9.14.4
 Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
@ -166,7 +166,7 @@ Patch173:bind-9.11-rh1732883.patch
 # Make sure jsonccp-devel does not interfere
 Patch174:bind-9.11-json-c.patch
 Patch175:bind-9.11-fips-disable.patch
-Patch176: bind-9.11-unit-dnstap-pkcs11.patch
+#Patch176: bind-9.11-unit-dnstap-pkcs11.patch
 Patch177: bind-9.11-serve-stale.patch
 Patch178: bind-9.11-serve-stale-dbfix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1736762
@ -571,7 +571,7 @@ are used for building ISC DHCP.
 #%patch174 -p1 -b .unit-timer
 %patch174 -p1 -b .json-c
 %patch175 -p1 -b .rh1709553
-%patch176 -p1 -b .unit-dnstap
+#%patch176 -p1 -b .unit-dnstap
 %patch177 -p1 -b .serve-stale
 %patch178 -p1 -b .rh1770492
 %patch183 -p1 -b .rh1736762-5
@ -877,7 +877,7 @@ export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
    fi;
    popd
  %endif
-
+## End of UNITTEST
 %endif

 %if %{with SYSTEMTEST}
@ -1608,6 +1608,9 @@ fi;


 %changelog
+* Wed Jan 08 2020 Petr Menšík <pemensik@redhat.com> - 32:9.14.4-1
+- Update to 9.14.4
+
 * Wed Jan 08 2020 Petr Menšík <pemensik@redhat.com> - 32:9.14.0-1
 - Update to 9.14.0, disabled SDB and DLZ

--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (bind-9.11.14.tar.gz) = fc7729e780e44c3c4e50059032fdae2af3d0e07b492b5088b2fefc15354829d3c9a83fab4f2ecaa9323cd7a37b1f7eb94890c149ba1df5c4fbea7a145095cbe9
-SHA512 (bind-9.11.14.tar.gz.asc) = fd28a1ebd4adf8c2854de434cc6f5f4d47d982eaad73fbb42dce8df97f7b069feb6e7c374178e203a07fff83f2cd021dfd10fb77dd6e8c5201ee4d299df98b89
+SHA512 (bind-9.14.4.tar.gz) = f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932