From 7584e54e6ce9531a3d5863c0fdd8fedea9214a66 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Aug 14 2017 10:17:30 +0000
Subject: Update to 9.11.2


---

diff --git a/.gitignore b/.gitignore
index ce76cad..0d58acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.11.1-P2.tar.gz
 /bind-9.11.1-P3.tar.gz
 /bind-9.11.2b1.tar.gz
+/bind-9.11.2.tar.gz
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch
index 8c94b1b..fd3f0bc 100644
--- a/bind-9.10-dist-native-pkcs11.patch
+++ b/bind-9.10-dist-native-pkcs11.patch
@@ -283,7 +283,7 @@ index d9aa66b..1900e3c 100644
  DEPLIBS =	${ISCDEPLIBS}
  
 diff --git a/configure.in b/configure.in
-index 69c09d2..90527d7 100644
+index 9e1016d..0940743 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI)
@@ -382,7 +382,7 @@ index 69c09d2..90527d7 100644
  AC_SUBST(PKCS11_ECDSA)
  AC_SUBST(PKCS11_GOST)
  AC_SUBST(PKCS11_TEST)
-@@ -5131,8 +5137,11 @@ AC_CONFIG_FILES([
+@@ -5137,8 +5143,11 @@ AC_CONFIG_FILES([
  	bin/delv/Makefile
  	bin/dig/Makefile
  	bin/dnssec/Makefile
@@ -394,7 +394,7 @@ index 69c09d2..90527d7 100644
  	bin/nsupdate/Makefile
  	bin/pkcs11/Makefile
  	bin/python/Makefile
-@@ -5233,6 +5242,10 @@ AC_CONFIG_FILES([
+@@ -5239,6 +5248,10 @@ AC_CONFIG_FILES([
  	lib/dns/include/dns/Makefile
  	lib/dns/include/dst/Makefile
  	lib/dns/tests/Makefile
@@ -405,7 +405,7 @@ index 69c09d2..90527d7 100644
  	lib/irs/Makefile
  	lib/irs/include/Makefile
  	lib/irs/include/irs/Makefile
-@@ -5257,6 +5270,24 @@ AC_CONFIG_FILES([
+@@ -5263,6 +5276,24 @@ AC_CONFIG_FILES([
  	lib/isc/unix/include/Makefile
  	lib/isc/unix/include/isc/Makefile
  	lib/isc/unix/include/pkcs11/Makefile
@@ -522,14 +522,14 @@ index 257d5e5..4abcc49 100644
  	rm -f include/dns/rdatastruct.h
  	rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h
 diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
-index 3e0a7e3..3a6665f 100644
+index bd8b109..3a6665f 100644
 --- a/lib/isc-pkcs11/Makefile.in
 +++ b/lib/isc-pkcs11/Makefile.in
 @@ -20,8 +20,8 @@ CINCLUDES =	-I${srcdir}/unix/include \
  		-I${srcdir}/@ISC_THREAD_DIR@/include \
  		-I${srcdir}/@ISC_ARCH_DIR@/include \
  		-I./include \
--		-I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES}
+-		-I${srcdir}/include ${DNS_INCLUDES} @ISC_OPENSSL_INC@
 -CDEFINES =	@CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
 +		-I${srcdir}/include ${DNS_PKCS11_INCLUDES}
 +CDEFINES =	@CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
diff --git a/bind.spec b/bind.spec
index e2272fb..a801da6 100644
--- a/bind.spec
+++ b/bind.spec
@@ -3,7 +3,7 @@
 #
 
 #%%global PATCHVER P3
-%global PREVER b1
+#%%global PREVER rc1
 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 
 %{?!SDB:       %global SDB       1}
@@ -1133,8 +1133,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python3_sitelib}/isc/__pycache__/*py*
 
 %changelog
-* Wed Aug 02 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-1.b1
-- Update to 9.11.2rc1
+* Wed Aug 02 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-1
+- Update to 9.11.2
 
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 32:9.11.1-6.P3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 5c64796..e6fb492 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bind-9.11.2b1.tar.gz) = 75cdac54940e32bd907526140d8a72deab7d344179d118a1a3ce11215396e87aac1948a801dcbe9a4b53a73658f05ca6cb279c2937ceb314ee952b69d93b4aa7
+SHA512 (bind-9.11.2.tar.gz) = c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9
 SHA512 (config-16.tar.bz2) = 983e0a8de3bb0c16fb21331894cc97ea516233796158eb5d1c932608227b31889496d0467c3e43953bf504dbf8b5f19210d2c9f8e0e3742aea2c7609245bf3f7