X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbind.git;a=blobdiff_plain;f=bind.spec;h=0a6e58a95f3c3d442c3c59ae6dc91524d26b374f;hp=e73a2d20fe47f597a211a358fb6bd06ecd377f98;hb=5b8f7d0;hpb=0dbbf24910c5211d2ebe0303e9fe767aefd460b4

diff --git a/bind.spec b/bind.spec
index e73a2d2..0a6e58a 100644
--- a/bind.spec
+++ b/bind.spec
@@ -4,7 +4,7 @@
 # Conditional build:
 %bcond_without	ssl		# build without OpenSSL support
 %bcond_without	ipv6		# build without IPv6 support
-%bcond_without	ldap		# build without LDAP support
+%bcond_with	ldap		# build without LDAP support
 %bcond_without	kerberos5	# build without kerneros5 support
 %bcond_without	sql		# build without SQL support
 %bcond_without	static_libs	# build without static libraries
@@ -13,7 +13,6 @@
 %bcond_with	hip		# build with HIP RR support
 %bcond_without	geoip		# build with GeoIP support
 %bcond_with	seccomp		# seccomp
-%bcond_with	sit		# SIT (Source Identity Token)
 
 %if "%{pld_release}" == "ac"
 %bcond_with	epoll		# enable epoll support
@@ -25,10 +24,10 @@
 %bcond_without	epoll		# disable epoll support
 %endif
 
-%define		ver	9.10.4
-%if 1
-%define		pverdot	.P2
-%define		pverdir	-P2
+%define		ver	9.12.1
+%if 0
+%define		pverdot	.P1
+%define		pverdir	-P1
 %else
 %define		pverdot	%{nil}
 %define		pverdir	%{nil}
@@ -45,12 +44,12 @@ Summary(uk.UTF-8):	BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):	Internet 域名服务器
 Name:		bind
 Version:	%{ver}%{pverdot}
-Release:	2
+Release:	1
 Epoch:		7
-License:	BSD-like
+License:	MPL 2.0
 Group:		Networking/Daemons
 Source0:	ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz
-# Source0-md5:	50163d229020c48929c84bec5b0068d7
+# Source0-md5:	ec20f2d6aff50651296fad962d19ccfa
 Source1:	named.init
 Source2:	named.sysconfig
 Source3:	named.logrotate
@@ -61,7 +60,7 @@ Source5:	http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 Source6:	%{name}-hip.tar.gz
 # Source6-md5:	62a8a67f51ff8db9fe815205416a1f62
 Source7:	ftp://rs.internic.net/domain/root.zone
-# Source7-md5:	3de45e198fe82e0de4f9e02d96844d00
+# Source7-md5:	e01f13480b3a85246f74d12fd7df6537
 Source8:	%{name}-127.0.0.zone
 Source9:	%{name}-localhost.zone
 Source10:	%{name}-named.conf
@@ -79,6 +78,7 @@ BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
+%{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	idnkit-devel
 %{?with_seccomp:BuildRequires:	libseccomp-devel}
@@ -88,6 +88,8 @@ BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.8d}
 %{?with_sql:BuildRequires:	postgresql-devel}
+BuildRequires:	python3-devel
+BuildRequires:	python3-ply
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.647
@@ -101,6 +103,8 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	fileutils
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+# for dnssec-{checkds,coverage,keymgr}
+Requires:	python3-isc = %{epoch}:%{version}-%{release}
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.2.0
 Requires:	systemd-units >= 38
@@ -367,6 +371,19 @@ BIND schema for openldap.
 %description -n openldap-schema-bind -l pl.UTF-8
 Schemat BIND dla openldap.
 
+%package -n python3-isc
+Summary:        Python 3 ISC module - functions to support BIND utilities
+Summary(pl.UTF-8):	Moduł Pythona 3 ISC - funkcje wspomagające narzędzia BIND-a
+Group:          Libraries/Python
+Requires:       python3-modules
+
+%description -n python3-isc
+Python 3 ISC module containing functions to support BIND utilities.
+
+%description -n python3-isc -l pl.UTF-8
+Moduł Pythona 3 ISC, zawierający funkcje wspomagające narzędzia
+BIND-a.
+
 %prep
 %setup -q %{?with_hip:-a6} -n %{name}-%{ver}%{pverdir}
 %patch0 -p1
@@ -401,11 +418,11 @@ cp -f /usr/share/automake/config.* .
 	--enable-largefile \
 	%{!?with_epoll:--disable-epoll --disable-devpoll} \
 	%{!?with_static_libs:--enable-static=no} \
-	%{__enable_disable sit} \
 	--enable-threads \
 	--enable-getifaddrs \
 	--enable-full-report \
-	%{__enable_disable seccomp}
+	%{__enable_disable seccomp} \
+	--with-python=%{__python3}
 
 %{__make}
 %{?with_hip:cd bind-hip/; %{__make}}
@@ -416,15 +433,15 @@ cp -f /usr/share/automake/config.* .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_bindir},%{_sbindir},%{_includedir}} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \
-	$RPM_BUILD_ROOT{%{_mandir}/man{1,3,5,8},%{_var}/{lib/named/{M,D,S,dev,etc},run/{named,lwresd},log}} \
+	$RPM_BUILD_ROOT{%{_mandir}/man{1,3,5,8},%{_var}/{lib/named/{M,D,S,dev,etc},run/named,log}} \
 	$RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm $RPM_BUILD_ROOT%{_mandir}/README.named-non-english-man-pages
-mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.named-non-english-man-pages
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
 %{__sed} -i -e 's/NSLOOKUP 8/NSLOOKUP 1/' $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
 
 cp -p bin/tests/named.conf		EXAMPLE-CONFIG-named
@@ -436,7 +453,7 @@ cp -p %{SOURCE7}			$RPM_BUILD_ROOT%{_var}/lib/named/root.hint
 cp -p %{SOURCE8}			$RPM_BUILD_ROOT%{_var}/lib/named/M/127.0.0.zone
 cp -p %{SOURCE9}			$RPM_BUILD_ROOT%{_var}/lib/named/M/localhost.zone
 cp -p %{SOURCE10}			$RPM_BUILD_ROOT%{_var}/lib/named%{_sysconfdir}/named.conf
-mv $RPM_BUILD_ROOT/etc/bind.keys        $RPM_BUILD_ROOT%{_var}/lib/named%{_sysconfdir}/
+%{__mv} $RPM_BUILD_ROOT/etc/bind.keys   $RPM_BUILD_ROOT%{_var}/lib/named%{_sysconfdir}/
 
 ln -sf %{_var}/lib/named%{_sysconfdir}/named.conf $RPM_BUILD_ROOT/etc/named.conf
 ln -sf %{_var}/lib/named%{_sysconfdir}/bind.keys $RPM_BUILD_ROOT/etc/bind.keys
@@ -521,7 +538,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README EXAMPLE-CONFIG-* FAQ %{?with_hip:bind-hip/COPYRIGHT-HIP-RR}
+%doc README EXAMPLE-CONFIG-* %{?with_hip:bind-hip/COPYRIGHT-HIP-RR}
 %doc _doc/misc/* _doc/arm/*.html %{?with_ldap:_doc/*.sdb-ldap}
 
 %{systemdunitdir}/named.service
@@ -531,12 +548,9 @@ fi
 %attr(640,root,named) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bind.keys
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/named
 
-%attr(755,root,root) %{_sbindir}/arpaname
 %attr(755,root,root) %{_sbindir}/ddns-confgen
 %attr(755,root,root) %{_sbindir}/dnssec-*
 %attr(755,root,root) %{_sbindir}/genrandom
-%attr(755,root,root) %{_sbindir}/isc-hmac-fixup
-%attr(755,root,root) %{_sbindir}/lwresd
 %attr(755,root,root) %{_sbindir}/named
 %attr(755,root,root) %{_sbindir}/named-*
 %attr(755,root,root) %{_sbindir}/nsec3hash
@@ -544,15 +558,11 @@ fi
 %attr(755,root,root) %{_sbindir}/rndc-confgen
 %attr(755,root,root) %{_sbindir}/tsig-keygen
 
-%{_mandir}/man1/arpaname.1*
-%{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/ddns-confgen.8*
 %{_mandir}/man8/dnssec-*.8*
 %{_mandir}/man8/genrandom.8*
-%{_mandir}/man8/isc-hmac-fixup.8*
-%{_mandir}/man8/lwresd.8*
 %{_mandir}/man8/named.8*
 %{_mandir}/man8/named-*.8*
 %{_mandir}/man8/nsec3hash.8*
@@ -567,6 +577,8 @@ fi
 %attr(770,root,named) %dir %{_var}/lib/named/D
 %attr(770,root,named) %dir %{_var}/lib/named/M
 %attr(770,root,named) %dir %{_var}/lib/named/S
+%attr(770,root,named) %dir %{_var}/lib/named/dev
+%dev(c,1,9) %attr(644,root,root) %{_var}/lib/named/dev/urandom
 %attr(750,root,named) %dir %{_var}/lib/named/etc
 %attr(640,root,named) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/named/etc/bind.keys
 %attr(640,root,named) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/named/etc/named.conf
@@ -579,19 +591,24 @@ fi
 %attr(660,named,named) %config(noreplace,missingok) %verify(not md5 mtime size) %{_var}/log/named.stats
 
 %attr(770,root,named) %dir %{_var}/run/named
-%attr(770,root,named) %dir %{_var}/run/lwresd
 
 %files utils
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/arpaname
 %attr(755,root,root) %{_bindir}/delv
 %attr(755,root,root) %{_bindir}/dig
 %attr(755,root,root) %{_bindir}/host
+%attr(755,root,root) %{_bindir}/named-rrchecker
+%attr(755,root,root) %{_bindir}/mdig
 %attr(755,root,root) %{_bindir}/nslookup
 %attr(755,root,root) %{_bindir}/nsupdate
 %{?with_hip:%attr(755,root,root) %{_bindir}/hi2dns}
+%{_mandir}/man1/arpaname.1*
 %{_mandir}/man1/delv.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/host.1*
+%{_mandir}/man1/mdig.1*
+%{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man1/nslookup.1*
 %{_mandir}/man1/nsupdate.1*
 
@@ -611,19 +628,19 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbind9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbind9.so.140
+%attr(755,root,root) %ghost %{_libdir}/libbind9.so.1200
 %attr(755,root,root) %{_libdir}/libdns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdns.so.165
+%attr(755,root,root) %ghost %{_libdir}/libdns.so.1203
 %attr(755,root,root) %{_libdir}/libirs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libirs.so.141
+%attr(755,root,root) %ghost %{_libdir}/libirs.so.1200
 %attr(755,root,root) %{_libdir}/libisc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisc.so.160
+%attr(755,root,root) %ghost %{_libdir}/libisc.so.1200
 %attr(755,root,root) %{_libdir}/libisccc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccc.so.140
+%attr(755,root,root) %ghost %{_libdir}/libisccc.so.1200
 %attr(755,root,root) %{_libdir}/libisccfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.140
-%attr(755,root,root) %{_libdir}/liblwres.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblwres.so.141
+%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.1200
+%attr(755,root,root) %{_libdir}/libns.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libns.so.1203
 
 %files devel
 %defattr(644,root,root,755)
@@ -635,14 +652,14 @@ fi
 %attr(755,root,root) %{_libdir}/libisc.so
 %attr(755,root,root) %{_libdir}/libisccc.so
 %attr(755,root,root) %{_libdir}/libisccfg.so
-%attr(755,root,root) %{_libdir}/liblwres.so
+%attr(755,root,root) %{_libdir}/libns.so
 %{_libdir}/libbind9.la
 %{_libdir}/libdns.la
 %{_libdir}/libirs.la
 %{_libdir}/libisc.la
 %{_libdir}/libisccc.la
 %{_libdir}/libisccfg.la
-%{_libdir}/liblwres.la
+%{_libdir}/libns.la
 %{_includedir}/bind9
 %{_includedir}/dns
 %{_includedir}/dst
@@ -650,12 +667,11 @@ fi
 %{_includedir}/isc
 %{_includedir}/isccc
 %{_includedir}/isccfg
-%{_includedir}/lwres
+%{_includedir}/ns
 %{_includedir}/pk11
 %{_includedir}/pkcs11
 %{_mandir}/man1/bind9-config.1*
 %{_mandir}/man1/isc-config.sh.1*
-%{_mandir}/man3/lwres*.3*
 
 %if %{with static_libs}
 %files static
@@ -666,7 +682,7 @@ fi
 %{_libdir}/libisc.a
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
-%{_libdir}/liblwres.a
+%{_libdir}/libns.a
 %endif
 
 %if %{with ldap}
@@ -674,3 +690,8 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/openldap/schema/dnszone.schema
 %endif
+
+%files -n python3-isc
+%defattr(644,root,root,755)
+%{py3_sitedir}/isc
+%{py3_sitedir}/isc-*-py*.egg-info