From 50ec459a28b9c63c72846a4e94e4cad0a76a7189 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Mar 22 2018 15:12:12 +0000
Subject: Rebase to 9.11.3


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

---

diff --git a/.gitignore b/.gitignore
index eb390f1..4db9140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.11.1-P3.tar.gz
 /bind-9.11.2-P1.tar.gz
 /bind-9.11.3b1.tar.gz
+/bind-9.11.3.tar.gz
diff --git a/bind-9.11-kyua-unit-oot.patch b/bind-9.11-kyua-unit-oot.patch
deleted file mode 100644
index 7409ebd..0000000
--- a/bind-9.11-kyua-unit-oot.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index b2681ed..c6e14a4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,6 +7,7 @@
- srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
-+top_builddir =  @top_builddir@
- 
- VERSION=@BIND9_VERSION@
- 
-@@ -86,7 +87,8 @@ force-test: test-force
- test-force:
- 	status=0; \
- 	(cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
--	(test -f unit/unittest.sh && $(SHELL) unit/unittest.sh) || status=1; \
-+	(test -f ${top_builddir}/unit/unittest.sh && \
-+		$(SHELL) ${top_builddir}/unit/unittest.sh) || status=1; \
- 	exit $$status
- 
- README: README.md
-@@ -102,6 +104,6 @@ OPTIONS: OPTIONS.md
- 		${W3M} -dump -cols 75 -O ascii -T text/html > $@
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean::
-diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
-index c7fd4ed..2a6571b 100644
---- a/lib/dns/tests/Makefile.in
-+++ b/lib/dns/tests/Makefile.in
-@@ -234,7 +234,7 @@ tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
- 			${ISCLIBS} ${LIBS}
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean distclean::
- 	rm -f ${TARGETS}
-diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
-index 2ecf8b0..38bf342 100644
---- a/lib/irs/tests/Makefile.in
-+++ b/lib/irs/tests/Makefile.in
-@@ -45,7 +45,7 @@ resconf_test@EXEEXT@: resconf_test.@O@ ${CFGDEPLIBS} ${DNSDEPLIBS} ${IRSDEPLIBS}
- 			resconf_test.@O@ ${LIBS}
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean distclean::
- 	rm -f ${TARGETS}
-diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
-index 20c7e25..f7fa538 100644
---- a/lib/isc/tests/Makefile.in
-+++ b/lib/isc/tests/Makefile.in
-@@ -159,7 +159,7 @@ time_test@EXEEXT@: time_test.@O@ ${ISCDEPLIBS}
- 			time_test.@O@ ${ISCLIBS} ${LIBS}
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean distclean::
- 	rm -f ${TARGETS}
-diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
-index be64b92..cbd444a 100644
---- a/lib/isccfg/tests/Makefile.in
-+++ b/lib/isccfg/tests/Makefile.in
-@@ -44,7 +44,7 @@ parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS
- 				${ISCLIBS} ${LIBS}
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean distclean::
- 	rm -f ${TARGETS}
-diff --git a/lib/lwres/tests/Makefile.in b/lib/lwres/tests/Makefile.in
-index 7166d44..10db3e7 100644
---- a/lib/lwres/tests/Makefile.in
-+++ b/lib/lwres/tests/Makefile.in
-@@ -39,7 +39,7 @@ config_test@EXEEXT@: config_test.@O@ ${LWRESDEPLIBS}
- 			config_test.@O@ ${LWRESLIBS} ${LIBS}
- 
- unit::
--	sh ${top_srcdir}/unit/unittest.sh
-+	sh ${top_builddir}/unit/unittest.sh
- 
- clean distclean::
- 	rm -f ${TARGETS}
diff --git a/bind.spec b/bind.spec
index 0077dea..85f7992 100644
--- a/bind.spec
+++ b/bind.spec
@@ -3,7 +3,7 @@
 #
 
 #%%global PATCHVER P1
-%global PREVER b1
+#%%global PREVER b1
 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 
 %{?!SDB:       %global SDB       1}
@@ -25,7 +25,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.11.3
-Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -1023,6 +1023,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python3_sitelib}/isc/
 
 %changelog
+* Wed Mar 21 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-2
+- Rebase to 9.11.3
+
 * Thu Feb 15 2018 Petr Menšík <pemensik@redhat.com> - 32:9.11.3-1.b1
 - Rebase to 9.11.3b1
 
diff --git a/sources b/sources
index 946b163..cd40e3f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bind-9.11.3b1.tar.gz) = 5cd841d4d4457b89770fb1e4e42416a90a24d9e5f2487bf8e195558f8478aaa97db05c93f26f573deb01b46601d1d0159f59de8da1ac1f73e675c126a1931fe1
+SHA512 (bind-9.11.3.tar.gz) = 1f0da13165d1ee872800fe10bb8b0f69c6c76515f9861c1528fb6005213bb71b21a1270906d2ea9ded3eaf6df1a1bac0f2c80aa511683b8d57dcff4f278d8c35
 SHA512 (config-16.tar.bz2) = 983e0a8de3bb0c16fb21331894cc97ea516233796158eb5d1c932608227b31889496d0467c3e43953bf504dbf8b5f19210d2c9f8e0e3742aea2c7609245bf3f7