Update to 9.11.0-P1

1 files changed, 36 insertions, 20 deletions

diff --git a/bind.spec b/bind.spec
index 162a65f..8dcb413 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,7 +2,7 @@
 # Red Hat BIND package .spec file
 #
 
-%global PATCHVER P4
+%global PATCHVER P1
 #%%global PREVER rc1
 %global VERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 
@@ -23,9 +23,9 @@
 #
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
-License:  ISC
-Version:  9.10.4
-Release:  3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+License:  MPLv2.0
+Version:  9.11.0
+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)
@@ -66,11 +66,9 @@ Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch109:bind97-rh478718.patch
-Patch110:bind97-rh570851.patch
 Patch112:bind97-rh645544.patch
 Patch119:bind97-rh693982.patch
 Patch123:bind98-rh735103.patch
-Patch125:bind99-buildfix.patch
 Patch130:bind-9.9.1-P2-dlz-libdb.patch
 Patch131:bind-9.9.1-P2-multlib-conflict.patch
 Patch133:bind99-rh640538.patch
@@ -90,7 +88,6 @@ Patch12: bind-9.10-sdb.patch
 
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
-Patch104: bind-9.10-dyndb.patch
 
 # [ISC-Bugs #36101] IDN support in host/dig/nslookup using GNU libidn(2)
 Patch73: bind-99-libidn.patch
@@ -101,6 +98,8 @@ Requires(preun):  systemd
 Requires(postun): systemd
 Requires:       coreutils
 Requires(pre):  shadow-utils
+Requires:	python3-ply
+BuildRequires:	python3-ply
 Requires:       bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes:      bind-config < 30:9.3.2-34.fc6
 Provides:       bind-config = 30:9.3.2-34.fc6
@@ -291,6 +290,15 @@ chroot(2) jail for the named-sdb(8) program from the BIND package.
 Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %endif
 
+%package -n python3-bind
+Summary:	A module allowing rndc commands to be sent from Python programs
+Group:		Applications/System
+Requires:	bind-license = %{epoch}:%{version}-%{release}
+Requires: 	python3
+%{?python_provide:%python_provide python3-bind}
+
+%description -n python3-bind
+This package provides a module which allows commands to be sent to rndc directly from Python programs.
 
 %prep
 %setup -q -n %{name}-%{VERSION}
@@ -298,7 +306,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 # Common patches
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
-%patch104 -p1 -b .dyndb
 %ifnarch alpha ia64
 %patch72 -p1 -b .64bit
 %endif
@@ -306,12 +313,11 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch109 -p1 -b .rh478718
-%patch110 -p1 -b .rh570851
 %patch112 -p1 -b .rh645544
 %patch119 -p1 -b .rh693982
-%patch125 -p1 -b .buildfix
 %patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
+%patch138 -p1 -b .rh1390238
 
 %if %{PKCS11}
 cp -r bin/named{,-pkcs11}
@@ -351,7 +357,6 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 
 %patch133 -p1 -b .rh640538
 %patch134 -p1 -b .rh669163
-%patch138 -p1 -b .rh1390238
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -765,12 +770,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_unitdir}/named-setup-rndc.service
 %{_sbindir}/named-journalprint
 %{_sbindir}/named-checkconf
-%{_sbindir}/named-rrchecker
+%{_bindir}/named-rrchecker
+%{_bindir}/mdig
 %{_sbindir}/lwresd
 %{_sbindir}/named
 %{_sbindir}/rndc*
 %{_sbindir}/tsig-keygen
 %{_libexecdir}/generate-rndc-key.sh
+%{_mandir}/man1/mdig.1*
 %{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
@@ -831,16 +838,16 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libbind9.so.140*
-%{_libdir}/libisccc.so.140*
-%{_libdir}/liblwres.so.141*
+%{_libdir}/libbind9.so.160*
+%{_libdir}/libisccc.so.160*
+%{_libdir}/liblwres.so.160*
 
 %files libs-lite
 %defattr(-,root,root,-)
-%{_libdir}/libdns.so.165*
-%{_libdir}/libirs.so.141*
+%{_libdir}/libdns.so.166*
+%{_libdir}/libirs.so.160*
 %{_libdir}/libisc.so.160*
-%{_libdir}/libisccfg.so.140*
+%{_libdir}/libisccfg.so.160*
 
 %files license
 %defattr(-,root,root,-)
@@ -854,7 +861,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/host
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
-%{_sbindir}/arpaname
+%{_bindir}/arpaname
 %{_sbindir}/ddns-confgen
 %{_sbindir}/genrandom
 %{_sbindir}/nsec3hash
@@ -893,6 +900,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/bind9/bind9
 %{_includedir}/bind9/isccc
 %{_includedir}/bind9/lwres
+%{_includedir}/bind9/pk11
 %{_mandir}/man1/isc-config.sh.1*
 %{_mandir}/man1/bind9-config.1*
 %{_mandir}/man3/lwres*
@@ -992,7 +1000,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files pkcs11-libs
 %defattr(-,root,root,-)
-%{_libdir}/libdns-pkcs11.so.165*
+%{_libdir}/libdns-pkcs11.so.166*
 %{_libdir}/libisc-pkcs11.so.160*
 
 %files pkcs11-devel
@@ -1003,8 +1011,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libisc-pkcs11.so
 %endif
 
+%files -n python3-bind
+%defattr(-,root,root,-)
+%{python3_sitelib}/*py*
+%{python3_sitelib}/isc/*py
+%{python3_sitelib}/isc/__pycache__/*py*
 
 %changelog
+* Wed Nov 16 2016 Michal Ruprich <mruprich@redhat.com> - 32:9.11.0-1.P1
+- Update to 9.11.0-P1
+
 * Tue Nov 08 2016 Petr Menšík <pemensik@redhat.com> - 32:9.10.4-3.P4
 - Build with OpenSSL 1.1