X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbind.git;a=blobdiff_plain;f=bind.spec;h=0a6e58a95f3c3d442c3c59ae6dc91524d26b374f;hp=cdb219fbf9fab946bb5c3c27c095d7c32db166f6;hb=5b8f7d0;hpb=3475e3513aca5faefcb8bd9dc5801973a2897c30 diff --git a/bind.spec b/bind.spec index cdb219f..0a6e58a 100644 --- a/bind.spec +++ b/bind.spec @@ -4,15 +4,18 @@ # 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 %bcond_without tests # perform tests -%bcond_with edns_cli # build with the ability to use edns-client-subnet in dig +%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 # build with GeoIP support +%bcond_with seccomp # seccomp + %if "%{pld_release}" == "ac" -%bcond_with epoll # enable epoll support +%bcond_with epoll # enable epoll support # there didn't exist x86_64 2.4 kernel in PLD, so can safely enable epoll %ifarch %{x8664} %define with_epoll 1 @@ -21,8 +24,8 @@ %bcond_without epoll # disable epoll support %endif -%define ver 9.8.1 -%if 1 +%define ver 9.12.1 +%if 0 %define pverdot .P1 %define pverdir -P1 %else @@ -43,10 +46,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: afa41f8203d50bedad65071f9b6f96d7 +# Source0-md5: ec20f2d6aff50651296fad962d19ccfa Source1: named.init Source2: named.sysconfig Source3: named.logrotate @@ -56,32 +59,40 @@ 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/named.root -# Source7-md5: 013336e29e65923682f7bce094bb3e5c +Source7: ftp://rs.internic.net/domain/root.zone +# Source7-md5: e01f13480b3a85246f74d12fd7df6537 Source8: %{name}-127.0.0.zone Source9: %{name}-localhost.zone Source10: %{name}-named.conf +Source11: %{name}.tmpfiles +Source12: named.service Patch0: %{name}-time.patch Patch1: %{name}-link.patch Patch2: %{name}-pmake.patch Patch3: %{name}-sdb-ldap.patch Patch4: %{name}-ac-libs.patch Patch5: %{name}-edns-client-subnet.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 +%{?with_seccomp:BuildRequires: libseccomp-devel} BuildRequires: libtool %{?with_hip:BuildRequires: libxml2-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.268 +BuildRequires: rpmbuild(macros) >= 1.647 %{?with_sql:BuildRequires: unixODBC-devel} Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -92,14 +103,18 @@ 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 +Requires: uname(release) >= 2.2.18 Provides: group(named) Provides: nameserver Provides: user(named) Obsoletes: caching-nameserver Conflicts: %{name}-chroot -Conflicts: kernel < 2.2.18 +Conflicts: logrotate < 3.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define schemadir /usr/share/openldap/schema @@ -346,6 +361,9 @@ Group: Development/Libraries Requires(post,postun): sed >= 4.0 Requires: openldap-servers Requires: sed >= 4.0 +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n openldap-schema-bind BIND schema for openldap. @@ -353,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 @@ -361,8 +392,8 @@ Schemat BIND dla openldap. %{?with_ldap:%patch3 -p1} %patch4 -p1 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic} - %{?with_edns_cli:%patch5 -p0} +%patch6 -p0 %build %{__libtoolize} @@ -381,31 +412,37 @@ cp -f /usr/share/automake/config.* . --with-dlz-bdb=no \ --with-dlz-filesystem=yes \ %{?with_ldap:--with-dlz-ldap=yes} \ + %{?with_geoip:--with-geoip=yes} \ --with-dlz-odbc=no \ --with-dlz-stub=yes \ --enable-largefile \ %{!?with_epoll:--disable-epoll --disable-devpoll} \ %{!?with_static_libs:--enable-static=no} \ --enable-threads \ - --enable-getifaddrs + --enable-getifaddrs \ + --enable-full-report \ + %{__enable_disable seccomp} \ + --with-python=%{__python3} %{__make} %{?with_hip:cd bind-hip/; %{__make}} -%{?with_tests:%{__make} test} +%{?with_tests:%{__make} test-force} %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 @@ -416,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 @@ -425,6 +462,9 @@ ln -sf %{_var}/lib/named/named.stats $RPM_BUILD_ROOT%{_var}/log/named.stats touch $RPM_BUILD_ROOT%{_var}/lib/named/named.{log,stats} +install %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/named.service +install %{SOURCE11} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + %if %{with ldap} install -d $RPM_BUILD_ROOT%{schemadir} cp -p %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema @@ -432,7 +472,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) @@ -441,8 +481,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/rfc/rfc* -rm -f _doc/misc/Makefile* +%{__rm} _doc/misc/Makefile* %clean rm -rf $RPM_BUILD_ROOT @@ -459,18 +498,21 @@ fi %post /sbin/chkconfig --add named %service named restart +%systemd_post named.service %preun if [ "$1" = "0" ]; then %service named stop /sbin/chkconfig --del named fi +%systemd_preun named.service %postun if [ "$1" = "0" ]; then %userremove named %groupremove named fi +%systemd_reload %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -491,48 +533,52 @@ fi %{__sed} -i -e 's#^\([ \t]*category[ \t]\+response-checks[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf %{__sed} -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf +%triggerpostun -- %{name} < 7:9.9.2.P2-2 +%systemd_trigger named.service + %files %defattr(644,root,root,755) -%doc README EXAMPLE-CONFIG-* FAQ %{?with_hip:bind-hip/COPYRIGHT-HIP-RR} -%doc _doc/misc/* _doc/arm/*.html _doc/rfc/index %{?with_ldap:_doc/*.sdb-ldap} +%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 %attr(754,root,root) /etc/rc.d/init.d/named %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/named %attr(640,root,named) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/named.conf %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 @@ -545,17 +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* @@ -575,52 +628,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.1200 %attr(755,root,root) %{_libdir}/libdns.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdns.so.[0-9][0-9] +%attr(755,root,root) %ghost %{_libdir}/libdns.so.1203 +%attr(755,root,root) %{_libdir}/libirs.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libirs.so.1200 %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.1200 %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.1200 %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.1200 +%attr(755,root,root) %{_libdir}/libns.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libns.so.1203 %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} @@ -628,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