X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bind.spec;h=14a846504f75118ba38a53c23b257b58ff0de937;hb=358debf0e5efad15ac9c76cf8deba4219cf5ce9f;hp=53bad7d70736a44a2cd47ccebca8a55922eb447a;hpb=4083602a59691dba3b30ad155147faded14d2d4b;p=packages%2Fbind.git

diff --git a/bind.spec b/bind.spec
index 53bad7d..14a8465 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,15 +2,21 @@
 # - apply http://www.caraytech.com/geodns/
 #
 # Conditional build:
-%bcond_without	ssl		# build without OpenSSL support
-%bcond_without	ipv6		# build without IPv6 support
-%bcond_without	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
-%bcond_without	tests		# perform tests
-%bcond_with	edns_cli	# build with the ability to use edns-client-subnet in dig
-%bcond_with	hip		# build with HIP RR support
+%bcond_without	geoip		# GeoIP support
+%bcond_without	ipv6		# IPv6 support
+%bcond_without	kerberos5	# GSS-API support
+%bcond_without	ssl		# OpenSSL support
+%bcond_with	ldap		# LDAP DLZ support
+%bcond_with	odbc		# ODBC DLZ support
+%bcond_without	sql		# SQL (MySQL+PostgreSQL) DLZ support
+%bcond_without	lmdb		# LMDB storage support for addzone zones
+%bcond_without	static_libs	# static libraries
+%bcond_with	system_tests	# system tests (require root to configure localhost IPs)
+%bcond_without	tests		# unit tests
+%bcond_with	edns_cli	# ability to use edns-client-subnet in dig
+%bcond_with	hip		# HIP RR support
+%bcond_with	seccomp		# libseccomp system call filtering
+
 %if "%{pld_release}" == "ac"
 %bcond_with	epoll		# enable epoll support
 # there didn't exist x86_64 2.4 kernel in PLD, so can safely enable epoll
@@ -21,8 +27,8 @@
 %bcond_without	epoll		# disable epoll support
 %endif
 
-%define		ver	9.9.4
-%if 0
+%define		ver	9.12.3
+%if 1
 %define		pverdot	.P1
 %define		pverdir	-P1
 %else
@@ -43,10 +49,10 @@ Name:		bind
 Version:	%{ver}%{pverdot}
 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:	f69757adc86776daed8e5acb0ee7c0ca
+# Source0-md5:	6a73280ad5ad0dfeab611de04aefd35e
 Source1:	named.init
 Source2:	named.sysconfig
 Source3:	named.logrotate
@@ -56,8 +62,8 @@ Source5:	http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 # Source5-md5:	49fe799c6eca54ae227b22d57ebc1145
 Source6:	%{name}-hip.tar.gz
 # Source6-md5:	62a8a67f51ff8db9fe815205416a1f62
-Source7:	ftp://rs.internic.net/domain/root.zone
-# Source7-md5:	cc31f5311962922a121b27fc85db4629
+Source7:	https://www.internic.net/domain/named.root
+# Source7-md5:	a2d36ae713cf5e8ea59641b320b6ec5d
 Source8:	%{name}-127.0.0.zone
 Source9:	%{name}-localhost.zone
 Source10:	%{name}-named.conf
@@ -69,24 +75,31 @@ Patch2:		%{name}-pmake.patch
 Patch3:		%{name}-sdb-ldap.patch
 Patch4:		%{name}-ac-libs.patch
 Patch5:		%{name}-edns-client-subnet.patch
-Patch6:         nsupdate_segfault.patch
+Patch6:		nsupdate_segfault.patch
 URL:		https://www.isc.org/software/bind
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
+%{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
-BuildRequires:	idnkit-devel
+BuildRequires:	json-c-devel
+BuildRequires:	libidn2-devel
+%{?with_seccomp:BuildRequires:	libseccomp-devel}
 BuildRequires:	libtool
 %{?with_hip:BuildRequires:	libxml2-devel}
+%{?with_lmdb:BuildRequires:	lmdb-devel}
 %{?with_sql:BuildRequires:	mysql-devel}
 %{?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
-%{?with_sql:BuildRequires:	unixODBC-devel}
+%{?with_odbc:BuildRequires:	unixODBC-devel}
+BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -96,6 +109,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
@@ -362,6 +377,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
@@ -369,10 +397,9 @@ Schemat BIND dla openldap.
 %patch2 -p1
 %{?with_ldap:%patch3 -p1}
 %patch4 -p1
-%{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic}
-%patch6 -p0
-
+%{?with_hip:%{__mv} bind-hip/hip_55.[ch] lib/dns/rdata/generic}
 %{?with_edns_cli:%patch5 -p0}
+%patch6 -p0
 
 %build
 %{__libtoolize}
@@ -381,47 +408,57 @@ Schemat BIND dla openldap.
 cp -f /usr/share/automake/config.* .
 %configure \
 	CFLAGS="-D_GNU_SOURCE=1 %{rpmcppflags}" \
-	--with-idn \
-	--with-libtool \
-	%{?with_ssl:--with-openssl} \
+	%{!?with_epoll:--disable-epoll --disable-devpoll} \
+	--enable-full-report \
+	--enable-getifaddrs \
 	%{?with_ipv6:--enable-ipv6} \
-	%{?with_kerberos5:--with-gssapi} \
-	%{?with_sql:--with-dlz-postgres=yes} \
-	%{?with_sql:--with-dlz-mysql=yes} \
-	--with-dlz-bdb=no \
-	--with-dlz-filesystem=yes \
-	%{?with_ldap:--with-dlz-ldap=yes} \
-	--with-dlz-odbc=no \
-	--with-dlz-stub=yes \
 	--enable-largefile \
-	%{!?with_epoll:--disable-epoll --disable-devpoll} \
-	%{!?with_static_libs:--enable-static=no} \
+	%{__enable_disable seccomp} \
+	%{!?with_static_libs:--disable-static} \
 	--enable-threads \
-	--enable-getifaddrs \
-	--enable-newstats \
-	--enable-full-report
+	%{?with_kerberos5:--with-gssapi} \
+	--with-libidn2 \
+	--with-libtool \
+	%{?with_ssl:--with-openssl} \
+	%{?with_sql:--with-dlz-postgres} \
+	%{?with_sql:--with-dlz-mysql} \
+	--without-dlz-bdb \
+	--with-dlz-filesystem \
+	%{?with_ldap:--with-dlz-ldap} \
+	--with-dlz-odbc%{!?with_odbc:=no} \
+	--with-dlz-stub \
+	%{?with_geoip:--with-geoip} \
+	--with-lmdb%{!?with_lmdb:=no} \
+	--with-python=%{__python3}
 
 %{__make}
-%{?with_hip:cd bind-hip/; %{__make}}
 
-%{?with_tests:%{__make} test-force}
+%{?with_hip:%{__make} -C bind-hip}
+
+%if %{with tests}
+%if %{with system_tests}
+%{__make} test-force
+%else
+sh unit/unittest.sh
+%endif
+%endif
 
 %install
 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}
-mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
-%{__perl} -pi -e 's/NSLOOKUP 8/NSLOOKUP 1/' $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
-cp -p bin/tests/ndc.conf		EXAMPLE-CONFIG-ndc
 install -p %{SOURCE1}			$RPM_BUILD_ROOT/etc/rc.d/init.d/named
 cp -p %{SOURCE2}			$RPM_BUILD_ROOT/etc/sysconfig/named
 cp -p %{SOURCE3}			$RPM_BUILD_ROOT/etc/logrotate.d/named
@@ -429,7 +466,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
@@ -448,7 +485,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema
 
 %{?with_hip:install -p bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}}
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8
 echo ".so man8/named-checkzone.8" > $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8
 
 # let rpm generate deps (workaround -m644 used for libs installation)
@@ -457,7 +494,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*.*
 # we don't want Makefiles in documentation...
 rm -rf _doc
 cp -a doc _doc
-rm -f _doc/misc/Makefile*
+%{__rm} _doc/misc/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -514,7 +551,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
@@ -524,39 +561,37 @@ 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
 %attr(755,root,root) %{_sbindir}/rndc
 %attr(755,root,root) %{_sbindir}/rndc-confgen
+%attr(755,root,root) %{_sbindir}/tsig-keygen
 
-%{_mandir}/man1/arpaname.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*
 %{_mandir}/man8/rndc.8*
 %{_mandir}/man8/rndc-confgen.8*
+%{_mandir}/man8/tsig-keygen.8*
 %lang(ja) %{_mandir}/ja/man8/named*
 
 %{systemdtmpfilesdir}/%{name}.conf
 
 %attr(770,root,named) %dir %{_var}/lib/named
 %attr(770,root,named) %dir %{_var}/lib/named/D
-%attr(750,root,named) %dir %{_var}/lib/named/M
+%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
@@ -569,17 +604,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*
 
@@ -599,52 +641,61 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbind9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbind9.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libbind9.so.1201
 %attr(755,root,root) %{_libdir}/libdns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdns.so.[0-9][0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libdns.so.1207
+%attr(755,root,root) %{_libdir}/libirs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libirs.so.1201
 %attr(755,root,root) %{_libdir}/libisc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisc.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libisc.so.1204
 %attr(755,root,root) %{_libdir}/libisccc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccc.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libisccc.so.1201
 %attr(755,root,root) %{_libdir}/libisccfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.[0-9][0-9]
-%attr(755,root,root) %{_libdir}/liblwres.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblwres.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.1203
+%attr(755,root,root) %{_libdir}/libns.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libns.so.1205
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bind9-config
 %attr(755,root,root) %{_bindir}/isc-config.sh
 %attr(755,root,root) %{_libdir}/libbind9.so
 %attr(755,root,root) %{_libdir}/libdns.so
+%attr(755,root,root) %{_libdir}/libirs.so
 %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
+%{_includedir}/irs
 %{_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
 %defattr(644,root,root,755)
 %{_libdir}/libbind9.a
 %{_libdir}/libdns.a
+%{_libdir}/libirs.a
 %{_libdir}/libisc.a
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
-%{_libdir}/liblwres.a
+%{_libdir}/libns.a
 %endif
 
 %if %{with ldap}
@@ -652,3 +703,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