From cb2172301bb9f1a620579c61eb1a8367fd5f9e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 15 Feb 2018 14:31:19 +0100
Subject: [PATCH] Rebase to 9.11.3b1 Remove merged upstream patches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Menšík <pemensik@redhat.com>

Update new so names
---
 .gitignore                         |   1 +
 bind-9.10-dist-native-pkcs11.patch |  82 +++++----
 bind-9.10-sdb.patch                |  40 ++---
 bind-9.11-dlz-mysql-modules.patch  |  86 ---------
 bind-9.11-dlz-mysql.patch          |  93 ----------
 bind-9.11-kyua-ht_test.patch       | 275 -----------------------------
 bind-9.11-kyua-portfix.patch       |  60 -------
 bind-9.11-kyua-unit-oot.patch      |   6 +-
 bind-9.11-kyua-unit.patch          |  65 -------
 bind-9.11-rh1484451.patch          |  27 ---
 bind-9.11-rh1500017.patch          |  75 --------
 bind-9.5-dlz-64bit.patch           |  78 ++++++--
 bind.spec                          |  40 ++---
 bind97-rh693982.patch              |  18 +-
 sources                            |   2 +-
 15 files changed, 157 insertions(+), 791 deletions(-)
 delete mode 100644 bind-9.11-dlz-mysql-modules.patch
 delete mode 100644 bind-9.11-dlz-mysql.patch
 delete mode 100644 bind-9.11-kyua-ht_test.patch
 delete mode 100644 bind-9.11-kyua-portfix.patch
 delete mode 100644 bind-9.11-kyua-unit.patch
 delete mode 100644 bind-9.11-rh1484451.patch
 delete mode 100644 bind-9.11-rh1500017.patch

diff --git a/.gitignore b/.gitignore
index ea89e26..b37b3e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.11.2.tar.gz
 /config-17.tar.bz2
 /bind-9.11.2-P1.tar.gz
+/bind-9.11.3b1.tar.gz
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch
index fd3f0bc..cb36e04 100644
--- a/bind-9.10-dist-native-pkcs11.patch
+++ b/bind-9.10-dist-native-pkcs11.patch
@@ -137,10 +137,10 @@ index 8c6627a..c070881 100644
  CWARNINGS =
  
 diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
-index 903023b..b40303d 100644
+index 83bce80..5170f47 100644
 --- a/bin/named-pkcs11/Makefile.in
 +++ b/bin/named-pkcs11/Makefile.in
-@@ -36,26 +36,26 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
+@@ -40,26 +40,26 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
  DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
  
  CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
@@ -174,7 +174,7 @@ index 903023b..b40303d 100644
  LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
  BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
  
-@@ -64,15 +64,15 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
+@@ -68,15 +68,15 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -193,7 +193,7 @@ index 903023b..b40303d 100644
  
  GEOIPLINKOBJS = geoip.@O@
  
-@@ -83,8 +83,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+@@ -87,8 +87,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
  		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
  		zoneconf.@O@ \
  		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@@ -203,7 +203,7 @@ index 903023b..b40303d 100644
  
  UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
  
-@@ -99,8 +98,7 @@ SRCS =		builtin.c client.c config.c control.c \
+@@ -103,8 +102,7 @@ SRCS =		builtin.c client.c config.c control.c \
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
  		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@@ -213,16 +213,25 @@ index 903023b..b40303d 100644
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -139,7 +137,7 @@ server.@O@: server.c
+@@ -143,14 +141,14 @@ server.@O@: server.c
  		-DPRODUCT=\"${PRODUCT}\" \
  		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
  
--named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
-+named-pkcs11@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+-named@EXEEXT@: ${OBJS} ${DEPLIBS}
++named-pkcs11@EXEEXT@: ${OBJS} ${DEPLIBS}
  	export MAKE_SYMTABLE="yes"; \
  	export BASEOBJS="${OBJS} ${UOBJS}"; \
  	${FINALBUILDCMD}
-@@ -166,22 +164,12 @@ statschannel.@O@: bind9.xsl.h
+ 
+-lwresd@EXEEXT@: named@EXEEXT@
++lwresd@EXEEXT@: named-pkcs11@EXEEXT@
+ 	rm -f lwresd@EXEEXT@
+-	@LN@ named@EXEEXT@ lwresd@EXEEXT@
++	@LN@ named-pkcs11@EXEEXT@ lwresd@EXEEXT@
+ 
+ doc man:: ${MANOBJS}
+ 
+@@ -170,22 +168,12 @@ statschannel.@O@: bind9.xsl.h
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -249,10 +258,10 @@ index 903023b..b40303d 100644
  @DLZ_DRIVER_RULES@
  
 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 903023b..9c14b73 100644
+index 83bce80..f217965 100644
 --- a/bin/named/Makefile.in
 +++ b/bin/named/Makefile.in
-@@ -40,7 +40,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
+@@ -44,7 +44,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
  
@@ -283,10 +292,10 @@ index d9aa66b..1900e3c 100644
  DEPLIBS =	${ISCDEPLIBS}
  
 diff --git a/configure.in b/configure.in
-index 9e1016d..0940743 100644
+index 71dadbf..127de9b 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI)
+@@ -1152,12 +1152,14 @@ AC_SUBST(USE_GSSAPI)
  AC_SUBST(DST_GSSAPI_INC)
  AC_SUBST(DNS_GSSAPI_LIBS)
  DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
@@ -301,7 +310,7 @@ index 9e1016d..0940743 100644
  
  #
  # was --with-randomdev specified?
-@@ -1495,11 +1497,11 @@ fi
+@@ -1542,11 +1544,11 @@ fi
  AC_MSG_CHECKING(for OpenSSL library)
  OPENSSL_WARNING=
  openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
@@ -318,15 +327,15 @@ index 9e1016d..0940743 100644
  
  if test "auto" = "$use_openssl"
  then
-@@ -1512,6 +1514,7 @@ then
+@@ -1559,6 +1561,7 @@ then
  		fi
  	done
  fi
 +CRYPTO_PK11=""
  OPENSSL_ECDSA=""
  OPENSSL_GOST=""
- gosttype="raw"
-@@ -1532,16 +1535,17 @@ case "$with_gost" in
+ OPENSSL_ED25519=""
+@@ -1580,11 +1583,10 @@ case "$with_gost" in
  		;;
  esac
  
@@ -338,8 +347,11 @@ index 9e1016d..0940743 100644
  		DST_OPENSSL_INC=""
 -		CRYPTO="-DPKCS11CRYPTO"
 +		CRYPTO_PK11="-DPKCS11CRYPTO"
- 		OPENSSLGOSTLINKOBJS=""
- 		OPENSSLGOSTLINKSRS=""
+ 		OPENSSLECDSALINKOBJS=""
+ 		OPENSSLECDSALINKSRCS=""
+ 		OPENSSLEDDSALINKOBJS=""
+@@ -1593,7 +1595,9 @@ case "$use_openssl" in
+ 		OPENSSLGOSTLINKSRCS=""
  		OPENSSLLINKOBJS=""
  		OPENSSLLINKSRCS=""
 -		;;
@@ -349,24 +361,24 @@ index 9e1016d..0940743 100644
  	no)
  		AC_MSG_RESULT(no)
  		DST_OPENSSL_INC=""
-@@ -1563,11 +1567,11 @@ case "$use_openssl" in
+@@ -1623,11 +1627,11 @@ case "$use_openssl" in
  If you don't want OpenSSL, use --without-openssl])
  		;;
  	*)
 -		if test "yes" = "$want_native_pkcs11"
 -		then
--                        AC_MSG_RESULT()
+-			AC_MSG_RESULT()
 -			AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
 -		fi
-+# 		if test "yes" = "$want_native_pkcs11"
-+# 		then
-+#                         AC_MSG_RESULT()
-+# 			AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
-+# 		fi
++		# if test "yes" = "$want_native_pkcs11"
++		# then
++		# 	AC_MSG_RESULT()
++		# 	AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
++		# fi
  		if test "yes" = "$use_openssl"
  		then
  			# User did not specify a path - guess it
-@@ -1923,6 +1927,7 @@ AC_SUBST(OPENSSL_ECDSA)
+@@ -2085,6 +2089,7 @@ AC_SUBST(OPENSSL_ED25519)
  AC_SUBST(OPENSSL_GOST)
  
  DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
@@ -374,15 +386,15 @@ index 9e1016d..0940743 100644
  
  ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
  if test "yes" = "$with_aes"
-@@ -2218,6 +2223,7 @@ esac
+@@ -2404,6 +2409,7 @@ esac
  AC_SUBST(PKCS11LINKOBJS)
  AC_SUBST(PKCS11LINKSRCS)
  AC_SUBST(CRYPTO)
 +AC_SUBST(CRYPTO_PK11)
  AC_SUBST(PKCS11_ECDSA)
  AC_SUBST(PKCS11_GOST)
- AC_SUBST(PKCS11_TEST)
-@@ -5137,8 +5143,11 @@ AC_CONFIG_FILES([
+ AC_SUBST(PKCS11_ED25519)
+@@ -5398,8 +5404,11 @@ AC_CONFIG_FILES([
  	bin/delv/Makefile
  	bin/dig/Makefile
  	bin/dnssec/Makefile
@@ -394,7 +406,7 @@ index 9e1016d..0940743 100644
  	bin/nsupdate/Makefile
  	bin/pkcs11/Makefile
  	bin/python/Makefile
-@@ -5239,6 +5248,10 @@ AC_CONFIG_FILES([
+@@ -5500,6 +5509,10 @@ AC_CONFIG_FILES([
  	lib/dns/include/dns/Makefile
  	lib/dns/include/dst/Makefile
  	lib/dns/tests/Makefile
@@ -405,7 +417,7 @@ index 9e1016d..0940743 100644
  	lib/irs/Makefile
  	lib/irs/include/Makefile
  	lib/irs/include/irs/Makefile
-@@ -5263,6 +5276,24 @@ AC_CONFIG_FILES([
+@@ -5524,6 +5537,24 @@ AC_CONFIG_FILES([
  	lib/isc/unix/include/Makefile
  	lib/isc/unix/include/isc/Makefile
  	lib/isc/unix/include/pkcs11/Makefile
@@ -444,7 +456,7 @@ index 318450c..87cde21 100644
  
  @BIND9_MAKE_RULES@
 diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
-index 257d5e5..4abcc49 100644
+index f7556f3..8e29a5c 100644
 --- a/lib/dns-pkcs11/Makefile.in
 +++ b/lib/dns-pkcs11/Makefile.in
 @@ -23,16 +23,16 @@ VERSION=@BIND9_VERSION@
@@ -469,7 +481,7 @@ index 257d5e5..4abcc49 100644
  
  LIBS =		@LIBS@
  
-@@ -135,15 +135,15 @@ version.@O@: version.c
+@@ -142,15 +142,15 @@ version.@O@: version.c
  		-DLIBAGE=${LIBAGE} \
  		-c ${srcdir}/version.c
  
@@ -489,7 +501,7 @@ index 257d5e5..4abcc49 100644
  
  include: gen
  	${MAKE} include/dns/enumtype.h
-@@ -169,25 +169,25 @@ code.h:	gen
+@@ -176,25 +176,25 @@ code.h:	gen
  	./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
  
  gen: gen.c
diff --git a/bind-9.10-sdb.patch b/bind-9.10-sdb.patch
index f2179b0..0318e9e 100644
--- a/bind-9.10-sdb.patch
+++ b/bind-9.10-sdb.patch
@@ -14,10 +14,10 @@ index 7d21984..015ff45 100644
  
  @BIND9_MAKE_RULES@
 diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
-index 9c14b73..36e7916 100644
+index f217965..b79d6fe 100644
 --- a/bin/named-sdb/Makefile.in
 +++ b/bin/named-sdb/Makefile.in
-@@ -23,10 +23,10 @@ VERSION=@BIND9_VERSION@
+@@ -27,10 +27,10 @@ VERSION=@BIND9_VERSION@
  #
  # Add database drivers here.
  #
@@ -31,7 +31,7 @@ index 9c14b73..36e7916 100644
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -72,7 +72,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
+@@ -76,7 +76,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  
  SUBDIRS =	unix
  
@@ -40,16 +40,16 @@ index 9c14b73..36e7916 100644
  
  GEOIPLINKOBJS = geoip.@O@
  
-@@ -139,7 +139,7 @@ server.@O@: server.c
+@@ -143,7 +143,7 @@ server.@O@: server.c
  		-DPRODUCT=\"${PRODUCT}\" \
  		-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
  
--named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
-+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+-named@EXEEXT@: ${OBJS} ${DEPLIBS}
++named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
  	export MAKE_SYMTABLE="yes"; \
  	export BASEOBJS="${OBJS} ${UOBJS}"; \
  	${FINALBUILDCMD}
-@@ -166,22 +166,12 @@ statschannel.@O@: bind9.xsl.h
+@@ -170,22 +170,12 @@ statschannel.@O@: bind9.xsl.h
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -76,7 +76,7 @@ index 9c14b73..36e7916 100644
  @DLZ_DRIVER_RULES@
  
 diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
-index 00002a9..cb9b5f5 100644
+index 64ee3ce..218d9b0 100644
 --- a/bin/named-sdb/main.c
 +++ b/bin/named-sdb/main.c
 @@ -88,6 +88,10 @@
@@ -90,7 +90,7 @@ index 00002a9..cb9b5f5 100644
  
  #ifdef CONTRIB_DLZ
  /*
-@@ -1052,6 +1056,11 @@ setup(void) {
+@@ -1060,6 +1064,11 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -102,7 +102,7 @@ index 00002a9..cb9b5f5 100644
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
  		      ns_g_product, ns_g_version,
-@@ -1173,6 +1182,75 @@ setup(void) {
+@@ -1181,6 +1190,75 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -178,7 +178,7 @@ index 00002a9..cb9b5f5 100644
  	ns_server_create(ns_g_mctx, &ns_g_server);
  
  #ifdef HAVE_LIBSECCOMP
-@@ -1215,6 +1293,11 @@ cleanup(void) {
+@@ -1223,6 +1301,11 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -191,10 +191,10 @@ index 00002a9..cb9b5f5 100644
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 9c14b73..08318a2 100644
+index f217965..05b8699 100644
 --- a/bin/named/Makefile.in
 +++ b/bin/named/Makefile.in
-@@ -38,9 +38,9 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
+@@ -42,9 +42,9 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
  CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
  		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
@@ -206,7 +206,7 @@ index 9c14b73..08318a2 100644
  
  CWARNINGS =
  
-@@ -64,11 +64,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
+@@ -68,11 +68,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -220,7 +220,7 @@ index 9c14b73..08318a2 100644
  
  SUBDIRS =	unix
  
-@@ -83,8 +83,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+@@ -87,8 +87,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
  		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
  		zoneconf.@O@ \
  		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@@ -230,7 +230,7 @@ index 9c14b73..08318a2 100644
  
  UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
  
-@@ -99,8 +98,7 @@ SRCS =		builtin.c client.c config.c control.c \
+@@ -103,8 +102,7 @@ SRCS =		builtin.c client.c config.c control.c \
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
  		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@@ -240,7 +240,7 @@ index 9c14b73..08318a2 100644
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -183,7 +181,5 @@ uninstall::
+@@ -187,7 +185,5 @@ uninstall::
  	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
  	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
  
@@ -284,10 +284,10 @@ index c7e0868..95ab742 100644
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
  	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
 diff --git a/configure.in b/configure.in
-index 6435274..5e614a7 100644
+index 1a0cc5f..b59a549 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -5125,6 +5125,8 @@ AC_CONFIG_FILES([
+@@ -5409,6 +5409,8 @@ AC_CONFIG_FILES([
  	bin/named/unix/Makefile
  	bin/named-pkcs11/Makefile
  	bin/named-pkcs11/unix/Makefile
@@ -296,7 +296,7 @@ index 6435274..5e614a7 100644
  	bin/nsupdate/Makefile
  	bin/pkcs11/Makefile
  	bin/python/Makefile
-@@ -5149,6 +5151,7 @@ AC_CONFIG_FILES([
+@@ -5433,6 +5435,7 @@ AC_CONFIG_FILES([
  	bin/python/isc/tests/dnskey_test.py
  	bin/python/isc/tests/policy_test.py
  	bin/rndc/Makefile
diff --git a/bind-9.11-dlz-mysql-modules.patch b/bind-9.11-dlz-mysql-modules.patch
deleted file mode 100644
index 1085195..0000000
--- a/bind-9.11-dlz-mysql-modules.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 0bde24d..3272e8e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4813,6 +4813,8 @@ DLZ_DRIVER_LIBS=""
- DLZ_DRIVER_SRCS=""
- DLZ_DRIVER_OBJS=""
- DLZ_SYSTEM_TEST=""
-+DLZ_DRIVER_MYSQL_INCLUDES=""
-+DLZ_DRIVER_MYSQL_LIBS=""
- 
- # 
- # Configure support for building a shared library object
-@@ -4935,7 +4937,9 @@ if test -n "$CONTRIB_DLZ"
- then
- 	AC_MSG_RESULT(yes)
- 	DLZ_DRIVER_RULES=contrib/dlz/drivers/rules
--	AC_CONFIG_FILES([$DLZ_DRIVER_RULES])
-+	AC_CONFIG_FILES([$DLZ_DRIVER_RULES
-+		contrib/dlz/modules/mysql/Makefile
-+		contrib/dlz/modules/mysqldyn/Makefile])
- else
- 	AC_MSG_RESULT(no)
- 	DLZ_DRIVER_RULES=/dev/null
-@@ -4947,6 +4951,8 @@ AC_SUBST(DLZ_DRIVER_LIBS)
- AC_SUBST(DLZ_DRIVER_SRCS)
- AC_SUBST(DLZ_DRIVER_OBJS)
- AC_SUBST(DLZ_SYSTEM_TEST)
-+AC_SUBST(DLZ_DRIVER_MYSQL_INCLUDES)
-+AC_SUBST(DLZ_DRIVER_MYSQL_LIBS)
- AC_SUBST_FILE(DLZ_DRIVER_RULES)
- 
- if test "yes" = "$cross_compiling"; then
-diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
-index db8af01..8a13306 100644
---- a/contrib/dlz/config.dlz.in
-+++ b/contrib/dlz/config.dlz.in
-@@ -45,10 +45,12 @@ AC_DEFUN(DLZ_ADD_DRIVER, [
- 	if test -n "$3"
- 	then
- 		DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES $3"
-+		DLZ_DRIVER_$1_INCLUDES="$3"
- 	fi
- 	if test -n "$4"
- 	then
- 		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS $4"
-+		DLZ_DRIVER_$1_LIBS="$4"
- 	fi
- ])
- 
-diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile.in
-similarity index 81%
-rename from contrib/dlz/modules/mysql/Makefile
-rename to contrib/dlz/modules/mysql/Makefile.in
-index ad3876c..5ab31be 100644
---- a/contrib/dlz/modules/mysql/Makefile
-+++ b/contrib/dlz/modules/mysql/Makefile.in
-@@ -1,8 +1,8 @@
- prefix = /usr
- libdir = $(prefix)/lib/bind9
- 
--CFLAGS=-fPIC -g -I../include
--MYSQL_LIBS=-lmysqlclient
-+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
-+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
- 
- all: dlz_mysql_dynamic.so
- 
-diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile.in
-similarity index 81%
-rename from contrib/dlz/modules/mysqldyn/Makefile
-rename to contrib/dlz/modules/mysqldyn/Makefile.in
-index bba91af..248e3da 100644
---- a/contrib/dlz/modules/mysqldyn/Makefile
-+++ b/contrib/dlz/modules/mysqldyn/Makefile.in
-@@ -1,8 +1,8 @@
- prefix = /usr
- libdir = $(prefix)/lib/bind9
- 
--CFLAGS=-fPIC -Wall -g -I../include
--MYSQL_LIBS=-lmysqlclient
-+CFLAGS=-fPIC -Wall -g -I../include @DLZ_DRIVER_MYSQL_INCLUDES@
-+MYSQL_LIBS=@DLZ_DRIVER_MYSQL_LIBS@
- 
- all: dlz_mysqldyn_mod.so
- 
diff --git a/bind-9.11-dlz-mysql.patch b/bind-9.11-dlz-mysql.patch
deleted file mode 100644
index 23d0808..0000000
--- a/bind-9.11-dlz-mysql.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
-index 9b1464c..d1fe16e 100644
---- a/contrib/dlz/config.dlz.in
-+++ b/contrib/dlz/config.dlz.in
-@@ -135,38 +135,48 @@ AC_ARG_WITH(dlz_mysql,
- 			       (Required to use MySQL with DLZ)],
-     use_dlz_mysql="$withval", use_dlz_mysql="no")
- 
-+AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
-+
- mysql_include=""
- mysql_lib=""
- if test "$use_dlz_mysql" = "yes"
- then
--	# User did not specify a path - guess it
--	mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
--	for d in $mysqldirs
--	do
--		if test -f $d/include/mysql/mysql.h
--		then
--			use_dlz_mysql=$d
--			mysql_include=$d/include/mysql
--			if test -d $d/${target_lib}/mysql
-+	if test -n "$MYSQL_CONFIG"
-+	then
-+		mysql_include=`${MYSQL_CONFIG} --include`
-+		mysql_lib=`${MYSQL_CONFIG} --libs`
-+		use_dlz_mysql="config"
-+
-+	else
-+		# User did not specify a path - guess it
-+		mysqldirs="/usr /usr/local /usr/local/mysql /usr/pkg"
-+		for d in $mysqldirs
-+		do
-+			if test -f $d/include/mysql/mysql.h
- 			then
--				mysql_lib=$d/${target_lib}/mysql
--			else
--				mysql_lib=$d/lib
--			fi
--			break
--		elif test -f $d/include/mysql.h
--		then
--			use_dlz_mysql=$d
--			mysql_include=$d/include
--			if test -d $d/lib/mysql
-+				use_dlz_mysql=$d
-+				mysql_include=$d/include/mysql
-+				if test -d $d/${target_lib}/mysql
-+				then
-+					mysql_lib=$d/${target_lib}/mysql
-+				else
-+					mysql_lib=$d/lib
-+				fi
-+				break
-+			elif test -f $d/include/mysql.h
- 			then
--				mysql_lib=$d/lib/mysql
--			else
--				mysql_lib=$d/lib
-+				use_dlz_mysql=$d
-+				mysql_include=$d/include
-+				if test -d $d/lib/mysql
-+				then
-+					mysql_lib=$d/lib/mysql
-+				else
-+					mysql_lib=$d/lib
-+				fi
-+				break
- 			fi
--			break
--		fi
--	done
-+		done
-+	fi
- elif test "$use_dlz_mysql" != "no"
- then
- 	d=$use_dlz_mysql
-@@ -202,6 +212,14 @@ case "$use_dlz_mysql" in
- 	no)
- 		AC_MSG_RESULT(no)
- 		;;
-+	config)
-+		DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
-+				[${mysql_include}],
-+				[${mysql_lib}])
-+
-+		AC_MSG_RESULT(
-+[using mysql with libs ${mysql_lib} and includes ${mysql_include}])
-+		;;
- 	*)
- 		DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
- 				[-I${mysql_include}],
diff --git a/bind-9.11-kyua-ht_test.patch b/bind-9.11-kyua-ht_test.patch
deleted file mode 100644
index 2184f7f..0000000
--- a/bind-9.11-kyua-ht_test.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From cc6bf2f8a3a1986ae0ef74ad8baadc08145a6702 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Wed, 27 Sep 2017 16:02:02 +1000
-Subject: [PATCH] 4740.   [cleanup]       Avoid triggering format-truncated
- warnings. [RT #46107]
-
-(cherry picked from commit 73074e954a1f751c561728d08176b6849e843a2e)
-
-use %u and cast to unsigned int
-
-(cherry picked from commit 2495de04a50dc44968490168226199b9c80a2ab4)
-
-4775.   [bug]           Address Coverity warnings in ht_test.c and mem_test.c
-                        [RT #46281]
-
-(cherry picked from commit 583e355951c73f5cdae3a161be9753701abaf553)
-
-4776.   [bug]           Improve portability of ht_test. [RT #46333]
-
-(cherry picked from commit 66258ca349b7398062e684337b19c5ce76701037)
-
-(cherry picked from commit 5ff48dca189244295a0baded4970605156ca8529)
----
- lib/isc/tests/ht_test.c | 99 +++++++++++++++++++++++++++++++++----------------
- 1 file changed, 67 insertions(+), 32 deletions(-)
-
-diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
-index 78dbc2d6a1..4a56ab86b5 100644
---- a/lib/isc/tests/ht_test.c
-+++ b/lib/isc/tests/ht_test.c
-@@ -20,8 +20,11 @@
- #include <isc/ht.h>
- #include <isc/mem.h>
- #include <isc/print.h>
-+#include <isc/string.h>
- #include <isc/util.h>
- 
-+#include <inttypes.h>
-+
- static void *
- default_memalloc(void *arg, size_t size) {
- 	UNUSED(arg);
-@@ -36,25 +39,28 @@ default_memfree(void *arg, void *ptr) {
- 	free(ptr);
- }
- 
--
--static void test_ht_full(int bits, int count) {
-+static void test_ht_full(int bits, uintptr_t count) {
- 	isc_ht_t *ht = NULL;
- 	isc_result_t result;
- 	isc_mem_t *mctx = NULL;
--	isc_int64_t i;
-+	uintptr_t i;
- 
- 	result = isc_mem_createx2(0, 0, default_memalloc, default_memfree,
- 				  NULL, &mctx, 0);
- 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
- 
--	isc_ht_init(&ht, mctx, bits);
-+	result = isc_ht_init(&ht, mctx, bits);
-+	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-+	ATF_REQUIRE(ht != NULL);
-+
- 	for (i = 1; i < count; i++) {
- 		/*
--		 * Note that the string we're snprintfing is always > 16 bytes
--		 * so we are always filling the key.
-+		 * Note: snprintf() is followed with strlcat()
-+		 * to ensure we are always filling the 16 byte key.
- 		 */
- 		unsigned char key[16];
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_add(ht, key, 16, (void *) i);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
- 	}
-@@ -62,22 +68,29 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
- 		void *f = NULL;
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_find(ht, key, 16, &f);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
--		ATF_REQUIRE_EQ(i, (isc_int64_t) f);
-+		ATF_REQUIRE_EQ(i, (uintptr_t) f);
- 	}
- 
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_add(ht, key, 16, (void *) i);
- 		ATF_REQUIRE_EQ(result, ISC_R_EXISTS);
- 	}
- 
- 	for (i = 1; i < count; i++) {
- 		char key[64];
--		snprintf((char *)key, 64, "%lld key of a str hashtable!!", i);
-+		/*
-+		 * Note: the key size is now strlen(key) which is bigger
-+		 * then the keys added above.
-+		 */
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_add(ht, (const unsigned char *) key,
- 				    strlen(key), (void *) i);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-@@ -86,7 +99,11 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
- 		void *f = NULL;
--		snprintf((char *)key, 16, "%lld KEY of a raw hashtable!!", i);
-+		/*
-+		 * Note: case of KEY is now in capitals,
-+		 */
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " KEY of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_find(ht, key, 16, &f);
- 		ATF_REQUIRE_EQ(result, ISC_R_NOTFOUND);
- 		ATF_REQUIRE_EQ(f, NULL);
-@@ -95,7 +112,8 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		char key[64];
- 		void *f = NULL;
--		snprintf((char *)key, 64, "%lld key of a str hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_find(ht, (const unsigned char *) key,
- 				     strlen(key), &f);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-@@ -105,7 +123,8 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
- 		void *f = NULL;
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_delete(ht, key, 16);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
- 		result = isc_ht_find(ht, key, 16, &f);
-@@ -115,7 +134,11 @@ static void test_ht_full(int bits, int count) {
- 
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
--		snprintf((char *)key, 16, "%lld KEY of a raw hashtable!!", i);
-+		/*
-+		 * Note: upper case KEY.
-+		 */
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " KEY of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_add(ht, key, 16, (void *) i);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
- 	}
-@@ -123,7 +146,8 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		char key[64];
- 		void *f = NULL;
--		snprintf((char *)key, 64, "%lld key of a str hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_delete(ht, (const unsigned char *) key,
- 				       strlen(key));
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-@@ -137,16 +161,21 @@ static void test_ht_full(int bits, int count) {
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
- 		void *f = NULL;
--		snprintf((char *)key, 16, "%lld KEY of a raw hashtable!!", i);
-+		/*
-+		 * Note: case of KEY is now in capitals,
-+		 */
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " KEY of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_find(ht, key, 16, &f);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
--		ATF_REQUIRE_EQ(i, (isc_int64_t) f);
-+		ATF_REQUIRE_EQ(i, (uintptr_t) f);
- 	}
- 
- 	for (i = 1; i < count; i++) {
- 		unsigned char key[16];
- 		void *f = NULL;
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, " key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_find(ht, key, 16, &f);
- 		ATF_REQUIRE_EQ(result, ISC_R_NOTFOUND);
- 		ATF_REQUIRE_EQ(f, NULL);
-@@ -161,9 +190,9 @@ static void test_ht_iterator() {
- 	isc_result_t result;
- 	isc_mem_t *mctx = NULL;
- 	isc_ht_iter_t * iter = NULL;
--	isc_int64_t i;
--	isc_int64_t v;
--	isc_uint32_t count = 10000;
-+	uintptr_t i;
-+	void *v;
-+	uintptr_t count = 10000;
- 	isc_uint32_t walked;
- 	unsigned char key[16];
- 	unsigned char *tkey;
-@@ -181,7 +210,8 @@ static void test_ht_iterator() {
- 		 * Note that the string we're snprintfing is always > 16 bytes
- 		 * so we are always filling the key.
- 		 */
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", i);
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, "key of a raw hashtable!!", sizeof(key));
- 		result = isc_ht_add(ht, key, 16, (void *) i);
- 		ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
- 	}
-@@ -194,10 +224,12 @@ static void test_ht_iterator() {
- 	     result == ISC_R_SUCCESS;
- 	     result = isc_ht_iter_next(iter))
- 	{
--		isc_ht_iter_current(iter, (void**) &v);
-+		isc_ht_iter_current(iter, &v);
- 		isc_ht_iter_currentkey(iter, &tkey, &tksize);
- 		ATF_REQUIRE_EQ(tksize, 16);
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", v);
-+		i = (uintptr_t)v;
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, "key of a raw hashtable!!", sizeof(key));
- 		ATF_REQUIRE_EQ(memcmp(key, tkey, 16), 0);
- 		walked++;
- 	}
-@@ -208,12 +240,14 @@ static void test_ht_iterator() {
- 	walked = 0;
- 	result = isc_ht_iter_first(iter);
- 	while (result == ISC_R_SUCCESS) {
--		isc_ht_iter_current(iter, (void**) &v);
-+		isc_ht_iter_current(iter, &v);
- 		isc_ht_iter_currentkey(iter, &tkey, &tksize);
- 		ATF_REQUIRE_EQ(tksize, 16);
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", v);
-+		i = (uintptr_t)v;
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, "key of a raw hashtable!!", sizeof(key));
- 		ATF_REQUIRE_EQ(memcmp(key, tkey, 16), 0);
--		if (v % 2 == 0) {
-+		if ((uintptr_t)v % 2 == 0) {
- 			result = isc_ht_iter_delcurrent_next(iter);
- 		} else {
- 			result = isc_ht_iter_next(iter);
-@@ -227,12 +261,14 @@ static void test_ht_iterator() {
- 	walked = 0;
- 	result = isc_ht_iter_first(iter);
- 	while (result == ISC_R_SUCCESS) {
--		isc_ht_iter_current(iter, (void**) &v);
-+		isc_ht_iter_current(iter, &v);
- 		isc_ht_iter_currentkey(iter, &tkey, &tksize);
- 		ATF_REQUIRE_EQ(tksize, 16);
--		snprintf((char *)key, 16, "%lld key of a raw hashtable!!", v);
-+		i = (uintptr_t)v;
-+		snprintf((char *)key, sizeof(key), "%u", (unsigned int)i);
-+		strlcat((char *)key, "key of a raw hashtable!!", sizeof(key));
- 		ATF_REQUIRE_EQ(memcmp(key, tkey, 16), 0);
--		if (v % 2 == 1) {
-+		if ((uintptr_t)v % 2 == 1) {
- 			result = isc_ht_iter_delcurrent_next(iter);
- 		} else {
- 			result = isc_ht_iter_next(iter);
-@@ -322,4 +358,3 @@ ATF_TP_ADD_TCS(tp) {
- 	ATF_TP_ADD_TC(tp, isc_ht_iterator);
- 	return (atf_no_error());
- }
--
--- 
-2.14.3
-
diff --git a/bind-9.11-kyua-portfix.patch b/bind-9.11-kyua-portfix.patch
deleted file mode 100644
index 09e57a5..0000000
--- a/bind-9.11-kyua-portfix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 822739a9f5163f6836a05e694faaa7b88d74f39c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Tue, 9 Jan 2018 17:01:04 +0100
-Subject: [PATCH] Fix machine portability issues, fixes tests on non-x86
- architectures
-
----
- lib/isc/tests/hash_test.c      | 15 +++++++++++++++
- lib/isc/unix/include/isc/int.h |  2 +-
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
-index 0c287e83fa..d51b44fa26 100644
---- a/lib/isc/tests/hash_test.c
-+++ b/lib/isc/tests/hash_test.c
-@@ -1784,6 +1784,18 @@ ATF_TC_BODY(isc_hmacmd5, tc) {
- }
- #endif
- 
-+#ifdef WORDS_BIGENDIAN
-+/* Source: https://stackoverflow.com/questions/2182002/convert-big-endian-to-little-endian-in-c-without-using-provided-func */
-+static inline isc_uint64_t
-+swap_uint64(isc_uint64_t val) {
-+	val = ((val << 8) & 0xFF00FF00FF00FF00ULL ) |
-+	      ((val >> 8) & 0x00FF00FF00FF00FFULL );
-+	val = ((val << 16) & 0xFFFF0000FFFF0000ULL ) |
-+	      ((val >> 16) & 0x0000FFFF0000FFFFULL );
-+	return (val << 32) | (val >> 32);
-+}
-+#endif
-+
- /* CRC64 Test */
- ATF_TC(isc_crc64);
- ATF_TC_HEAD(isc_crc64, tc) {
-@@ -1839,6 +1851,9 @@ ATF_TC_BODY(isc_crc64, tc) {
- 				       testcase->input_len);
- 		}
- 		isc_crc64_final(&crc);
-+#ifdef WORDS_BIGENDIAN
-+		crc = swap_uint64(crc);
-+#endif
- 		tohexstr((unsigned char *) &crc, sizeof(crc), str);
- 		ATF_CHECK_STREQ(str, testcase->result);
- 
-diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
-index 00fc048f65..706353eaca 100644
---- a/lib/isc/unix/include/isc/int.h
-+++ b/lib/isc/unix/include/isc/int.h
-@@ -13,7 +13,7 @@
- 
- /*! \file */
- 
--typedef char				isc_int8_t;
-+typedef signed char			isc_int8_t;
- typedef unsigned char			isc_uint8_t;
- typedef short				isc_int16_t;
- typedef unsigned short			isc_uint16_t;
--- 
-2.14.3
-
diff --git a/bind-9.11-kyua-unit-oot.patch b/bind-9.11-kyua-unit-oot.patch
index 59c7102..7409ebd 100644
--- a/bind-9.11-kyua-unit-oot.patch
+++ b/bind-9.11-kyua-unit-oot.patch
@@ -55,11 +55,11 @@ index 2ecf8b0..38bf342 100644
  clean distclean::
  	rm -f ${TARGETS}
 diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
-index 500e853..d630fbb 100644
+index 20c7e25..f7fa538 100644
 --- a/lib/isc/tests/Makefile.in
 +++ b/lib/isc/tests/Makefile.in
-@@ -148,7 +148,7 @@ netaddr_test@EXEEXT@: netaddr_test.@O@ ${ISCDEPLIBS}
- 			netaddr_test.@O@ ${ISCLIBS} ${LIBS}
+@@ -159,7 +159,7 @@ time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
+ 			time_test.@O@ ${ISCLIBS} ${LIBS}
  
  unit::
 -	sh ${top_srcdir}/unit/unittest.sh
diff --git a/bind-9.11-kyua-unit.patch b/bind-9.11-kyua-unit.patch
deleted file mode 100644
index 3acb1c1..0000000
--- a/bind-9.11-kyua-unit.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From cb616c6d5c2ece1fac37fa6e0bca2b53d4043098 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Tue, 2 Jan 2018 10:20:58 +1100
-Subject: [PATCH] 4851.   [port]          Support using kyua as well as atf-run
- to run the unit                         tests. [RT #46853]
-
-(cherry picked from commit ccb5678066ea0055012352df5011ce2aa44e0eb0)
----
- unit/unittest.sh.in | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
-index 899e00e..de304c6 100644
---- a/unit/unittest.sh.in
-+++ b/unit/unittest.sh.in
-@@ -2,17 +2,19 @@
- 
- PATH="@ATFBIN@:${PATH}"
- export PATH
-+ATFRUN=`type atf-run 2>/dev/null | awk '{print $3}'`
-+KYUA=`type kyua 2>/dev/null | awk '{print $3}'`
- 
- status=0
--if [ -n "@ATFBIN@" -a -f Atffile ]
-+if [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
- then
- 	echo "S:unit:`date`"
--        echo "T:unit:1:A"
-+	echo "T:unit:1:A"
- 	echo "I: unit tests"
- 	atf-run > atf.out
- 	status=$?
- 
--        # | cat is there to force non-fancy output
-+	# | cat is there to force non-fancy output
- 	atf-report < atf.out | cat
- 
- 	if [ $status -eq 0 ]
-@@ -23,5 +25,23 @@ then
- 		echo R:FAIL
- 	fi
- 	echo "E:unit:`date`"
-+elif [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
-+then
-+	echo "S:unit:`date`"
-+	echo "T:unit:1:A"
-+	echo "I: unit tests"
-+	kyua --logfile kyua.log test
-+	status=$?
-+
-+	kyua report
-+
-+	if [ $status -eq 0 ]
-+	then
-+		rm -f kyua.log
-+		echo R:PASS
-+	else
-+		echo R:FAIL
-+	fi
-+	echo "E:unit:`date`"
- fi
- exit $status
--- 
-2.9.5
-
diff --git a/bind-9.11-rh1484451.patch b/bind-9.11-rh1484451.patch
deleted file mode 100644
index c2596b2..0000000
--- a/bind-9.11-rh1484451.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8a20462b516b0cc39e9b1fb1a8dd514eb1aed29 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Fri, 1 Sep 2017 11:17:59 +1000
-Subject: [PATCH] 4697.   [bug]           Restore workaround for Microsoft
- Windows TSIG hash                         computation bug. [RT #45854]
-
----
- lib/dns/rdataset.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
-index 1386840..e563963 100644
---- a/lib/dns/rdataset.c
-+++ b/lib/dns/rdataset.c
-@@ -466,6 +466,9 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
- 	dns_name_copy(owner_name, name, NULL);
- 	dns_rdataset_getownercase(rdataset, name);
- 
-+	if ((owner_name->attributes & DNS_NAMEATTR_NOCOMPRESS) != 0)
-+		name->attributes |= DNS_NAMEATTR_NOCOMPRESS;
-+
- 	do {
- 		/*
- 		 * Copy out the name, type, class, ttl.
--- 
-2.9.5
-
diff --git a/bind-9.11-rh1500017.patch b/bind-9.11-rh1500017.patch
deleted file mode 100644
index 0605a75..0000000
--- a/bind-9.11-rh1500017.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From e3856204645c6547a7aae854e4f4138710864612 Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Wed, 11 Oct 2017 08:51:03 -0700
-Subject: [PATCH] Move KRB5_CONFIG=/dev/null to conf.sh.* so the named run in
- the tests gets the setting
-
-(cherry picked from commit 74f46c45b0868219512f52bb54d105ed65212f71)
----
- bin/tests/system/conf.sh.in       | 4 ++++
- bin/tests/system/conf.sh.win32    | 4 ++++
- bin/tests/system/tsiggss/tests.sh | 4 ----
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 8f73dbf..7b99e83 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -67,6 +67,9 @@ MAKEJOURNAL=$TOP/bin/tests/makejournal
- PIPEQUERIES=$TOP/bin/tests/system/pipelined/pipequeries
- SAMPLEUPDATE=$TOP/lib/samples/sample-update
- 
-+# we don't want a KRB5_CONFIG setting breaking the tests
-+KRB5_CONFIG=/dev/null
-+
- # The "stress" test is not run by default since it creates enough
- # load on the machine to make it unusable to other users.
- # v6synth
-@@ -150,6 +153,7 @@ export KEYFRLAB
- export KEYGEN
- export KEYSETTOOL
- export KEYSIGNER
-+export KRB5_CONFIG
- export LWRESD
- export LWTEST
- export MAKEJOURNAL
-diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
-index e2d7855..55175b4 100644
---- a/bin/tests/system/conf.sh.win32
-+++ b/bin/tests/system/conf.sh.win32
-@@ -73,6 +73,9 @@ LWTEST=$TOP/Build/$VSCONF/lwtest@EXEEXT@
- MAKEJOURNAL=$TOP/Build/$VSCONF/makejournal@EXEEXT@
- PIPEQUERIES=$TOP/Build/$VSCONF/pipequeries@EXEEXT@
- 
-+# we don't want a KRB5_CONFIG setting breaking the tests
-+KRB5_CONFIG=/dev/null
-+
- # The "stress" test is not run by default since it creates enough
- # load on the machine to make it unusable to other users.
- # v6synth
-@@ -150,6 +153,7 @@ export KEYFRLAB
- export KEYGEN
- export KEYSETTOOL
- export KEYSIGNER
-+export KRB5_CONFIG
- export LWRESD
- export LWTEST
- export MAKEJOURNAL
-diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
-index 7576a93..2198cf1 100644
---- a/bin/tests/system/tsiggss/tests.sh
-+++ b/bin/tests/system/tsiggss/tests.sh
-@@ -15,10 +15,6 @@ status=0
- 
- DIGOPTS="@10.53.0.1 -p 5300"
- 
--# we don't want a KRB5_CONFIG setting breaking the tests
--KRB5_CONFIG=/dev/null
--export KRB5_CONFIG
--
- test_update() {
-     host="$1"
-     type="$2"
--- 
-2.9.5
-
diff --git a/bind-9.5-dlz-64bit.patch b/bind-9.5-dlz-64bit.patch
index 5994e68..06b5545 100644
--- a/bind-9.5-dlz-64bit.patch
+++ b/bind-9.5-dlz-64bit.patch
@@ -1,6 +1,7 @@
-diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz/config.dlz.in
---- bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit	2014-06-23 06:47:35.000000000 +0200
-+++ bind-9.10.1b1/contrib/dlz/config.dlz.in	2014-07-29 15:29:06.956527598 +0200
+diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
+index 5d65a85..2677b26 100644
+--- a/contrib/dlz/config.dlz.in
++++ b/contrib/dlz/config.dlz.in
 @@ -17,6 +17,13 @@
  #
  dlzdir='${DLZ_DRIVER_DIR}'
@@ -15,19 +16,66 @@ diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz
  #
  # Private autoconf macro to simplify configuring drivers:
  #
-@@ -140,9 +147,9 @@ then
- 		then
- 			use_dlz_mysql=$d
- 			mysql_include=$d/include/mysql
--			if test -d $d/lib/mysql
-+			if test -d $d/${target_lib}/mysql
+@@ -152,23 +159,11 @@ then
  			then
+ 				use_dlz_mysql=$d
+ 				mysql_include=$d/include/mysql
+-			if test -d $d/lib/mysql
+-				then
 -				mysql_lib=$d/lib/mysql
-+				mysql_lib=$d/${target_lib}/mysql
- 			else
- 				mysql_lib=$d/lib
+-				else
+-					mysql_lib=$d/lib
+-				fi
+ 				break
+ 			elif test -f $d/include/mysql.h
+ 			then
+ 				use_dlz_mysql=$d
+ 				mysql_include=$d/include
+-				if test -d $d/lib/mysql
+-				then
+-					mysql_lib=$d/lib/mysql
+-				else
+-					mysql_lib=$d/lib
+-				fi
+ 				break
  			fi
-@@ -288,9 +295,9 @@ case "$use_dlz_bdb" in
+ 		done
+@@ -179,21 +174,9 @@ then
+ 	if test -f $d/include/mysql/mysql.h
+ 	then
+ 		mysql_include=$d/include/mysql
+-		if test -d $d/lib/mysql
+-		then
+-			mysql_lib=$d/lib/mysql
+-		else
+-			mysql_lib=$d/lib
+-		fi
+ 	elif test -f $d/include/mysql.h
+ 	then
+ 		mysql_include=$d/include
+-		if test -d $d/lib/mysql
+-		then
+-			mysql_lib=$d/lib/mysql
+-		else
+-			mysql_lib=$d/lib
+-		fi
+ 	fi
+ fi
+ 
+@@ -217,6 +200,12 @@ case "$use_dlz_mysql" in
+ [using mysql with libs ${mysql_lib} and includes ${mysql_include}])
+ 		;;
+ 	*)
++		if test -d $use_dlz_mysql/${target_lib}/mysql
++		then
++			mysql_lib=$use_dlz_mysql/${target_lib}/mysql
++		else
++			mysql_lib=$use_dlz_mysql/${target_lib}
++		fi
+ 		DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
+ 				[-I${mysql_include}],
+ 				[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])
+@@ -310,9 +299,9 @@ case "$use_dlz_bdb" in
  					then
  						break
  					fi
@@ -39,7 +87,7 @@ diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz
  					break
  				fi
  			done
-@@ -390,7 +397,7 @@ case "$use_dlz_ldap" in
+@@ -414,7 +403,7 @@ case "$use_dlz_ldap" in
  	*)
  		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
  				[-I$use_dlz_ldap/include],
@@ -48,7 +96,7 @@ diff -up bind-9.10.1b1/contrib/dlz/config.dlz.in.64bit bind-9.10.1b1/contrib/dlz
  
  		AC_MSG_RESULT(
  [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
-@@ -425,11 +432,11 @@ then
+@@ -450,11 +439,11 @@ then
  		odbcdirs="/usr /usr/local /usr/pkg"
  		for d in $odbcdirs
  		do
diff --git a/bind.spec b/bind.spec
index 9f817cc..92db192 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,8 +2,8 @@
 # Red Hat BIND package .spec file
 #
 
-%global PATCHVER P1
-#%%global PREVER rc1
+#%%global PATCHVER P1
+%global PREVER b1
 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 
 
@@ -37,8 +37,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.11.2
-Release:  11%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Version:  9.11.3
+Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,19 +94,9 @@ Patch136:bind-9.10-dist-native-pkcs11.patch
 # introduced by https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=fc9f0ac5778f78003a7acc957a23711811fec122
 Patch137:bind-9.10-use-of-strlcat.patch
 Patch140:bind-9.11-rh1410433.patch
-Patch142:bind-9.11-dlz-mysql.patch
-Patch143:bind-9.11-dlz-mysql-modules.patch
-Patch144:bind-9.11-rh1484451.patch
 Patch145:bind-9.11-rh1205168.patch
-Patch146:bind-9.11-rh1500017.patch
 # [ISC-Bugs #46853] commit cb616c6d5c2ece1fac37fa6e0bca2b53d4043098 ISC 4851
-Patch148:bind-9.11-kyua-unit.patch
 Patch149:bind-9.11-kyua-pkcs11.patch
-Patch150:bind-9.11-kyua-portfix.patch
-# [ISC-Bugs #46107] commit 73074e954a1f751c561728d08176b6849e843a2e ISC 4740
-# [ISC-Bugs #46281] commit 583e355951c73f5cdae3a161be9753701abaf553 ISC 4775
-# [ISC-Bugs #46333] commit 66258ca349b7398062e684337b19c5ce76701037 ISC 4776
-Patch151:bind-9.11-kyua-ht_test.patch
 Patch152:bind-9.11-kyua-unit-oot.patch
 Patch153:bind-9.11-export-suffix.patch
 
@@ -447,14 +437,7 @@ are used for building ISC DHCP.
 %patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
 %patch140 -p1 -b .rh1410433
-%patch142 -p1 -b .mysql_config
-%patch143 -p1 -b .mysql_modules
-%patch144 -p1 -b .rh1484451
 %patch145 -p1 -b .rh1205168
-%patch146 -p1 -b .rh1500017
-%patch148 -p1 -b .kyua-unit
-%patch150 -p1 -b .kyua-portfix
-%patch151 -p1 -b .kyua-ht_test
 %patch152 -p1 -b .kyua-unit-oot
 %patch153 -p1 -b .export_suffix
 
@@ -1151,9 +1134,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files libs-lite
 %defattr(-,root,root,-)
-%{_libdir}/libdns.so.169*
+%{_libdir}/libdns.so.1100*
 %{_libdir}/libirs.so.160*
-%{_libdir}/libisc.so.166*
+%{_libdir}/libisc.so.169*
 %{_libdir}/libisccfg.so.160*
 
 %files license
@@ -1323,8 +1306,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files pkcs11-libs
 %defattr(-,root,root,-)
-%{_libdir}/libdns-pkcs11.so.169*
-%{_libdir}/libisc-pkcs11.so.166*
+%{_libdir}/libdns-pkcs11.so.1100*
+%{_libdir}/libisc-pkcs11.so.169*
 
 %files pkcs11-devel
 %defattr(-,root,root,-)
@@ -1373,9 +1356,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %files export-libs
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{_export_dir}
-%{_libdir}/%{_export_dir}/libdns-export.so.169*
+%{_libdir}/%{_export_dir}/libdns-export.so.1100*
 %{_libdir}/%{_export_dir}/libirs-export.so.160*
-%{_libdir}/%{_export_dir}/libisc-export.so.166*
+%{_libdir}/%{_export_dir}/libisc-export.so.169*
 %{_libdir}/%{_export_dir}/libisccfg-export.so.160*
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
 
@@ -1401,6 +1384,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Feb 15 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-1.b1
+- Rebase to 9.11.3b1
+
 * Wed Feb 07 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-11.P1
 - Use versioned provides
 - Fix starting of unit tests
diff --git a/bind97-rh693982.patch b/bind97-rh693982.patch
index 34e6f73..0e73764 100644
--- a/bind97-rh693982.patch
+++ b/bind97-rh693982.patch
@@ -1,15 +1,15 @@
 diff --git a/bin/named/server.c b/bin/named/server.c
-index 529ba5e..a936597 100644
+index 20a6e31..dececd5 100644
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
-@@ -7892,15 +7892,6 @@ load_configuration(const char *filename, ns_server_t *server,
- 	if (first_time)
+@@ -8126,15 +8126,6 @@ load_configuration(const char *filename, ns_server_t *server,
  		ns_os_changeuser();
+ 	}
  
 -	/*
 -	 * Check that the working directory is writable.
 -	 */
--	if (access(".", W_OK) != 0) {
+-	if (!isc_file_isdirwritable(".")) {
 -		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 -			      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
 -			      "the working directory is not writable");
@@ -18,19 +18,19 @@ index 529ba5e..a936597 100644
  #ifdef HAVE_LMDB
  	/*
  	 * Reopen NZD databases.
-@@ -7976,6 +7967,15 @@ load_configuration(const char *filename, ns_server_t *server,
+@@ -8209,6 +8200,15 @@ load_configuration(const char *filename, ns_server_t *server,
+ 			      "config file");
  	}
  
- 	/*
++	/*
 +	 * Check that the working directory is writable.
 +	 */
-+	if (access(".", W_OK) != 0) {
++	if (!isc_file_isdirwritable(".")) {
 +		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 +			      NS_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
 +			      "the working directory is not writable");
 +	}
 +
-+	/*
+ 	/*
  	 * Set the default value of the query logging flag depending
  	 * whether a "queries" category has been defined.  This is
- 	 * a disgusting hack, but we need to do this for BIND 8
diff --git a/sources b/sources
index 984ca15..bae4ebf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bind-9.11.2-P1.tar.gz) = 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
+SHA512 (bind-9.11.3b1.tar.gz) = 5cd841d4d4457b89770fb1e4e42416a90a24d9e5f2487bf8e195558f8478aaa97db05c93f26f573deb01b46601d1d0159f59de8da1ac1f73e675c126a1931fe1
 SHA512 (config-17.tar.bz2) = 93d864be83a2aeaec3f4e150909bee21b0fc4761562928ee075f09e8fce28bc82735ed7d7a93e8dfff4fcf8e06f2aa9a04046fc3e538a6bf5cb380f2a3528729