rel 1

[packages/bind.git] / bind.spec

diff --git a/bind.spec b/bind.spec
index 0effe597768dfb8755e49b7273bc81c1bd75139a..5cbffb3409fa1bd44570236c6c3121ec7d7c43ff 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -11,7 +11,8 @@
 %bcond_without sql             # SQL (MySQL+PostgreSQL) DLZ support
 %bcond_without lmdb            # LMDB storage support for addzone zones
 %bcond_without static_libs     # static libraries
-%bcond_without tests           # perform tests
+%bcond_with    system_tests    # system tests (require root to configure localhost IPs)
+%bcond_with    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
@@ -26,10 +27,10 @@
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.12.1
-%if 1
-%define                pverdot .P2
-%define                pverdir -P2
+%define                ver     9.14.2
+%if 0
+%define                pverdot .P0
+%define                pverdir -P0
 %else
 %define                pverdot %{nil}
 %define                pverdir %{nil}
@@ -46,12 +47,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:       MPL 2.0
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz
-# Source0-md5: 7fbefc12bd0cf891546ee9d8bc18f7b0
+# Source0-md5: 5293355175c995210e6af6c1a5a41a66
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -61,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: d1377ba28666891f9bea92556e764a4d
+Source7:       https://www.internic.net/domain/named.root
+# Source7-md5: 60cbad328adbff5e9313fef5cd9a8d1d
 Source8:       %{name}-127.0.0.zone
 Source9:       %{name}-localhost.zone
 Source10:      %{name}-named.conf
@@ -82,8 +83,10 @@ BuildRequires:       bison
 BuildRequires: flex
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
-BuildRequires: idnkit-devel
 BuildRequires: json-c-devel
+BuildRequires: libidn2-devel
+# note, there is no kyua in PLD yet (work in progress)
+%{?with_tests:%{!?with_system_tests:BuildRequires:     kyua}}
 %{?with_seccomp:BuildRequires: libseccomp-devel}
 BuildRequires: libtool
 %{?with_hip:BuildRequires:     libxml2-devel}
@@ -416,7 +419,7 @@ cp -f /usr/share/automake/config.* .
        %{!?with_static_libs:--disable-static} \
        --enable-threads \
        %{?with_kerberos5:--with-gssapi} \
-       --with-idn \
+       --with-libidn2 \
        --with-libtool \
        %{?with_ssl:--with-openssl} \
        %{?with_sql:--with-dlz-postgres} \
@@ -434,7 +437,13 @@ cp -f /usr/share/automake/config.* .
 
 %{?with_hip:%{__make} -C bind-hip}
 
-%{?with_tests:%{__make} test-force}
+%if %{with tests}
+%if %{with system_tests}
+%{__make} test-force
+%else
+sh unit/unittest.sh
+%endif
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -452,7 +461,6 @@ bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 %{__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
@@ -557,7 +565,6 @@ fi
 
 %attr(755,root,root) %{_sbindir}/ddns-confgen
 %attr(755,root,root) %{_sbindir}/dnssec-*
-%attr(755,root,root) %{_sbindir}/genrandom
 %attr(755,root,root) %{_sbindir}/named
 %attr(755,root,root) %{_sbindir}/named-*
 %attr(755,root,root) %{_sbindir}/nsec3hash
@@ -569,7 +576,6 @@ fi
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/ddns-confgen.8*
 %{_mandir}/man8/dnssec-*.8*
-%{_mandir}/man8/genrandom.8*
 %{_mandir}/man8/named.8*
 %{_mandir}/man8/named-*.8*
 %{_mandir}/man8/nsec3hash.8*
@@ -635,19 +641,21 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbind9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbind9.so.1200
+%attr(755,root,root) %ghost %{_libdir}/libbind9.so.1302
 %attr(755,root,root) %{_libdir}/libdns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdns.so.1203
+%attr(755,root,root) %ghost %{_libdir}/libdns.so.1308
 %attr(755,root,root) %{_libdir}/libirs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libirs.so.1200
+%attr(755,root,root) %ghost %{_libdir}/libirs.so.1301
 %attr(755,root,root) %{_libdir}/libisc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisc.so.1200
+%attr(755,root,root) %ghost %{_libdir}/libisc.so.1308
 %attr(755,root,root) %{_libdir}/libisccc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccc.so.1200
+%attr(755,root,root) %ghost %{_libdir}/libisccc.so.1302
 %attr(755,root,root) %{_libdir}/libisccfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.1200
+%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.1302
 %attr(755,root,root) %{_libdir}/libns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libns.so.1203
+%attr(755,root,root) %ghost %{_libdir}/libns.so.1306
+%attr(755,root,root) %ghost %{_libdir}/named/filter-aaaa.so
+%{_mandir}/man8/filter-aaaa.8*
 
 %files devel
 %defattr(644,root,root,755)