X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbind.git;a=blobdiff_plain;f=bind.spec;h=88ef5a8f358a395e3d0bbe0153a1b2acc93583dc;hp=033f510a1d5a7d431557655e2483e28f4ab7cdc7;hb=a8bf3d0ba9a6bb477cafe54a9f9fa145bf2e5739;hpb=b5a2a4785c06c7fb3dc3b44273d3b6f0f7999d5d diff --git a/bind.spec b/bind.spec index 033f510..88ef5a8 100644 --- a/bind.spec +++ b/bind.spec @@ -9,12 +9,22 @@ %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 -# -%define ver 9.7.2 +%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 +%ifarch %{x8664} +%define with_epoll 1 +%endif +%else +%bcond_without epoll # disable epoll support +%endif + +%define ver 9.8.1 %if 1 -%define pverdot .P2 -%define pverdir -P2 +%define pverdot .P1 +%define pverdir -P1 %else %define pverdot %{nil} %define pverdir %{nil} @@ -31,12 +41,12 @@ Summary(uk.UTF-8): BIND - cервер системи доменних імен ( Summary(zh_CN.UTF-8): Internet 域名服务器 Name: bind Version: %{ver}%{pverdot} -Release: 3 +Release: 4 Epoch: 7 License: BSD-like Group: Networking/Daemons Source0: ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz -# Source0-md5: e74de6ec9c2cd27576794c873bd85f4a +# Source0-md5: afa41f8203d50bedad65071f9b6f96d7 Source1: named.init Source2: named.sysconfig Source3: named.logrotate @@ -46,30 +56,34 @@ 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: bc0749601d8e62108af42114c87aafb6 Source8: %{name}-127.0.0.zone Source9: %{name}-localhost.zone Source10: %{name}-named.conf +Source11: %{name}.tmpfiles 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 URL: https://www.isc.org/software/bind -BuildRequires: autoconf +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: bison BuildRequires: flex -BuildRequires: idnkit-devel %{?with_kerberos5:BuildRequires: heimdal-devel} -%{?with_hip:BuildRequires: libxml2-devel} +BuildRequires: idnkit-devel BuildRequires: libtool -%{?with_ldap:BuildRequires: openldap-devel} -%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +%{?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} -%{?with_sql:BuildRequires: unixODBC-devel} +BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.268 +%{?with_sql:BuildRequires: unixODBC-devel} Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -87,6 +101,7 @@ 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,8 +361,10 @@ Schemat BIND dla openldap. %patch1 -p1 %patch2 -p1 %{?with_ldap:%patch3 -p1} +%patch4 -p1 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic} +%{?with_edns_cli:%patch5 -p0} %build %{__libtoolize} @@ -358,7 +375,7 @@ cp -f /usr/share/automake/config.* . CFLAGS="-D_GNU_SOURCE=1 %{rpmcppflags}" \ --with-idn \ --with-libtool \ - %{?with_ssl:--with-openssl=%{_prefix}} \ + %{?with_ssl:--with-openssl} \ %{?with_ipv6:--enable-ipv6} \ %{?with_kerberos5:--with-gssapi} \ %{?with_sql:--with-dlz-postgres=yes} \ @@ -369,6 +386,7 @@ cp -f /usr/share/automake/config.* . --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 @@ -382,7 +400,8 @@ 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,lwresd},log}} \ + $RPM_BUILD_ROOT/usr/lib/tmpfiles.d %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -391,15 +410,15 @@ 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 -install bin/tests/named.conf EXAMPLE-CONFIG-named -install bin/tests/ndc.conf EXAMPLE-CONFIG-ndc -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/named -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/named -install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/named -install %{SOURCE7} $RPM_BUILD_ROOT%{_var}/lib/named/root.hint -install %{SOURCE8} $RPM_BUILD_ROOT%{_var}/lib/named/M/127.0.0.zone -install %{SOURCE9} $RPM_BUILD_ROOT%{_var}/lib/named/M/localhost.zone -install %{SOURCE10} $RPM_BUILD_ROOT%{_var}/lib/named%{_sysconfdir}/named.conf +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 +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}/ ln -sf %{_var}/lib/named%{_sysconfdir}/named.conf $RPM_BUILD_ROOT/etc/named.conf @@ -409,12 +428,14 @@ 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 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf + %if %{with ldap} install -d $RPM_BUILD_ROOT%{schemadir} -install %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema +cp -p %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema %endif -%{?with_hip:install bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}} +%{?with_hip:install -p bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}} rm -f $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8 echo ".so man8/named-checkzone.8" > $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8 @@ -435,7 +456,7 @@ rm -rf $RPM_BUILD_ROOT if [ -f %{_sysconfdir}/named.boot ]; then cp -f %{_sysconfdir}/named.boot /etc/named.boot.2conf mv -f %{_sysconfdir}/named.boot /etc/named.rpmsave - echo "Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave." 1>&2 + echo >&2 "Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave." fi %groupadd -g 58 named %useradd -u 58 -g 58 -d /tmp -s /bin/false -c "BIND user" named @@ -471,10 +492,9 @@ fi %triggerpostun -- %{name} < 7:9.4.2-2 /sbin/chkconfig named reset -#triggerpostun -- %{name} < 6:9.4.1 -sed -i -e 's#^\([ \t]*category[ \t]\+cname[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf -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 +%{__sed} -i -e 's#^\([ \t]*category[ \t]\+cname[ \t]\+.*\)$#// \1#g' /var/lib/named/etc/named.conf +%{__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 %files %defattr(644,root,root,755) @@ -514,6 +534,8 @@ sed -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/et %{_mandir}/man8/rndc-confgen.8* %lang(ja) %{_mandir}/ja/man8/named* +/usr/lib/tmpfiles.d/%{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