X-Git-Url: https://git.pld-linux.org/?p=packages%2Fbind.git;a=blobdiff_plain;f=bind.spec;h=4e80a97f6716182d99682b068f602aaac47bd72f;hp=9ef572d1ef36d359c341b4a4f221fb91b5560065;hb=HEAD;hpb=6c15569ce8ea2260548590e4348a7625249c6761 diff --git a/bind.spec b/bind.spec index 9ef572d..4e80a97 100644 --- a/bind.spec +++ b/bind.spec @@ -6,11 +6,9 @@ %bcond_without geoip # GeoIP 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_without doh # DNS over HTTPS support +%bcond_with static_libs # static libraries %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 @@ -26,7 +24,7 @@ %bcond_without epoll # disable epoll support %endif -%define ver 9.16.21 +%define ver 9.18.25 %if 0 %define pverdot .P0 %define pverdir -P0 @@ -51,28 +49,23 @@ Epoch: 7 License: MPL 2.0 Group: Networking/Daemons Source0: ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.xz -# Source0-md5: 55da4659c614aa80e3fb57c900bb70e1 +# Source0-md5: 05385c9873e499356d0461b1d13ca4f8 Source1: named.init Source2: named.sysconfig Source3: named.logrotate Source4: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source4-md5: 35b1dfaa12615c9802126ee833e0e7f7 -# formerly http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt (dead URL now) -Source5: dnszone-schema.txt -# Source5-md5: 49fe799c6eca54ae227b22d57ebc1145 Source6: %{name}-hip.tar.gz # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62 Source7: https://www.internic.net/domain/named.root -# Source7-md5: 076cfeb40394314adf28b7be79e6ecb1 +# Source7-md5: a551fabe906ec055e7f563276dad9c35 Source8: %{name}-127.0.0.zone Source9: %{name}-localhost.zone Source10: %{name}-named.conf Source11: %{name}.tmpfiles Source12: named.service -Patch1: %{name}-link.patch -Patch2: %{name}-pmake.patch -Patch3: %{name}-sdb-ldap.patch +Patch3: jemalloc.patch Patch4: %{name}-ac-libs.patch Patch5: %{name}-edns-client-subnet.patch URL: https://www.isc.org/software/bind @@ -82,30 +75,30 @@ BuildRequires: bison %{?with_tests:BuildRequires: cmocka-devel >= 1.0.0} BuildRequires: flex %{?with_kerberos5:BuildRequires: heimdal-devel} +BuildRequires: jemalloc-devel BuildRequires: json-c-devel >= 0.11 +BuildRequires: libatomic-devel BuildRequires: libcap-devel BuildRequires: libidn2-devel # note, there is no kyua in PLD yet (work in progress) %{?with_tests:%{!?with_system_tests:BuildRequires: kyua}} BuildRequires: libtool -BuildRequires: libuv-devel >= 1.37.0 +BuildRequires: libuv-devel >= 1.40.0 # any version for hi2dns (if with_hip), 2.6.0 for XML stats BuildRequires: libxml2-devel >= 1:2.6.0 %{?with_lmdb:BuildRequires: lmdb-devel} %{?with_geoip:BuildRequires: libmaxminddb-devel} -%{?with_sql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel} +%{?with_doh:BuildRequires: nghttp2-devel >= 1.6.0} %{?with_ssl:BuildRequires: openssl-devel >= 1.0.0} BuildRequires: pkgconfig -%{?with_sql:BuildRequires: postgresql-devel} BuildRequires: python3-devel >= 1:3.2 -BuildRequires: python3-ply BuildRequires: python3-sphinx_rtd_theme BuildRequires: readline-devel BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: sphinx-pdg -%{?with_odbc:BuildRequires: unixODBC-devel} +BuildRequires: tar >= 1:1.22 +BuildRequires: xz BuildRequires: zlib-devel %if %{with dnstap} BuildRequires: fstrm-devel @@ -120,8 +113,6 @@ 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 @@ -130,12 +121,12 @@ Provides: group(named) Provides: nameserver Provides: user(named) Obsoletes: caching-nameserver -Conflicts: %{name}-chroot +Obsoletes: openldap-schema-bind < 7:9.18.0 +Obsoletes: python3-isc < 7:9.18.0 +Conflicts: bind-chroot Conflicts: logrotate < 3.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define schemadir /usr/share/openldap/schema - %description BIND (Berkeley Internet Name Domain) is an implementation of the DNS (Domain Name System) protocols. BIND includes a DNS server (named), @@ -213,6 +204,20 @@ BIND (Berkeley Internet Name Domain) є реалізацією протокол Конфігураційні файли, ща настроюють BIND на роботу в режимі простого кешируючого серверу, включені в пакет caching-nameserver. +%package plugins +Summary: Plugins for Bind DNS name server +Summary(pl.UTF-8): Wtyczki dla serwera nazw DNS Bind +Group: Networking/Utilities +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description plugins +Plugins for extending of query processing functionality of Bind DNS name +server. + +%description plugins -l pl.UTF-8 +Wtyczki rozszerzające funkcjonalność przetwarzania zapytań przez serwer +nazw DNS Bind. + %package utils Summary: DNS utils - host, dig, dnsquery, nslookup Summary(de.UTF-8): DNS-Utils - Host, Dig, Dnsquery, Nslookup @@ -291,8 +296,9 @@ Summary(uk.UTF-8): Бібліотеки, необхідні для bind Summary(zh_CN.UTF-8): Internet 域名服务器开发库 Group: Libraries Requires: json-c >= 0.11 -Requires: libuv >= 1.37.0 +Requires: libuv >= 1.40.0 Requires: libxml2 >= 1:2.6.0 +%{?with_doh:Requires: nghttp2-libs >= 1.6.0} %description libs The bind-libs package contains all libraries required for running BIND @@ -374,40 +380,10 @@ Bibliotecas estáticas para desenvolvimento DNS. Статичні бібліотеки, необхідні для розробки програм з використанням BIND. -%package -n openldap-schema-bind -Summary: BIND schema for openldap -Summary(pl.UTF-8): Schemat BIND dla openldap -Group: Development/Libraries -Requires(post,postun): sed >= 4.0 -Requires: openldap-servers -Requires: sed >= 4.0 -BuildArch: noarch - -%description -n openldap-schema-bind -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} -%patch1 -p1 -%patch2 -p1 -%{?with_ldap:%patch3 -p1} +%patch3 -p1 %patch4 -p1 %{?with_hip:%{__mv} bind-hip/hip_55.[ch] lib/dns/rdata/generic} %{?with_edns_cli:%patch5 -p0} @@ -416,29 +392,25 @@ BIND-a. %{__libtoolize} %{__aclocal} %{__autoconf} -cp -f /usr/share/automake/config.* . +%{__automake} %configure \ CFLAGS="-D_GNU_SOURCE=1 %{rpmcflags} %{rpmcppflags}" \ LDFLAGS="%{rpmldflags}" \ %{?with_dnstap:--enable-dnstap} \ + %{!?with_doh:--disable-doh} \ %{!?with_epoll:--disable-epoll --disable-devpoll} \ --enable-full-report \ --enable-largefile \ - %{!?with_static_libs:--disable-static} \ + %{?with_static_libs:--enable-static} \ %{?with_kerberos5:--with-gssapi} \ + --with-jemalloc=yes \ --with-libidn2 \ - --with-libtool \ + --with-libxml2 \ %{?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-maxminddb} \ --with-lmdb%{!?with_lmdb:=no} \ - --with-python=%{__python3} + --with-tuning \ + --disable-silent-rules %{__make} %{__make} -C doc/arm html @@ -463,12 +435,13 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_bindir},%{_sbindir},%{_includedir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_libdir}/bind/filter-*.la + 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 %{__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 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 @@ -488,11 +461,6 @@ 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 -%endif - %{?with_hip:install -p bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}} # we don't want Makefiles in documentation... @@ -534,23 +502,13 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post -n openldap-schema-bind -%openldap_schema_register %{schemadir}/dnszone.schema -%service -q ldap restart - -%postun -n openldap-schema-bind -if [ "$1" = "0" ]; then - %openldap_schema_unregister %{schemadir}/dnszone.schema - %service -q ldap restart -fi - %triggerpostun -- %{name} < 7:9.9.2.P2-2 %systemd_trigger named.service %files %defattr(644,root,root,755) -%doc README EXAMPLE-CONFIG-* %{?with_hip:bind-hip/COPYRIGHT-HIP-RR} -%doc _doc/misc/* _doc/arm/_build/html/*.html %{?with_ldap:_doc/*.sdb-ldap} +%doc README.md %{?with_hip:bind-hip/COPYRIGHT-HIP-RR} +%doc _doc/misc/* _doc/arm/_build/html/*.html %{systemdunitdir}/named.service %attr(754,root,root) /etc/rc.d/init.d/named @@ -559,22 +517,22 @@ fi %{_sysconfdir}/named.conf %{_sysconfdir}/bind.keys +%attr(755,root,root) %{_bindir}/dnssec-* +%attr(755,root,root) %{_bindir}/named-* +%attr(755,root,root) %{_bindir}/nsec3hash %attr(755,root,root) %{_sbindir}/ddns-confgen -%attr(755,root,root) %{_sbindir}/dnssec-* %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/dnssec-*.1* +%{_mandir}/man1/named-*.1* +%{_mandir}/man1/nsec3hash.1* %{_mandir}/man5/named.conf.5* %{_mandir}/man5/rndc.conf.5* %{_mandir}/man8/ddns-confgen.8* -%{_mandir}/man8/dnssec-*.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* @@ -601,8 +559,12 @@ fi %attr(770,root,named) %dir %{_var}/run/named -%dir %{_libdir}/named -%attr(755,root,root) %{_libdir}/named/filter-aaaa.so +%files plugins +%defattr(644,root,root,755) +%dir %{_libdir}/bind +%attr(755,root,root) %{_libdir}/bind/filter-a.so +%attr(755,root,root) %{_libdir}/bind/filter-aaaa.so +%{_mandir}/man8/filter-a.8* %{_mandir}/man8/filter-aaaa.8* %files utils @@ -672,8 +634,6 @@ fi %{_includedir}/isccc %{_includedir}/isccfg %{_includedir}/ns -%{_includedir}/pk11 -%{_includedir}/pkcs11 %if %{with static_libs} %files static @@ -686,14 +646,3 @@ fi %{_libdir}/libisccfg.a %{_libdir}/libns.a %endif - -%if %{with ldap} -%files -n openldap-schema-bind -%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