]> git.pld-linux.org Git - packages/bind.git/blobdiff - bind.spec
- up to 9.10.2.P4; fixes CVE-2015-5722, CVE-2015-5986
[packages/bind.git] / bind.spec
index 945360589ff492dff022cfc7abb157ed9dd561f6..1dd74f4268b4583044d171ef29f0982bd5c97ae0 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -9,10 +9,14 @@
 %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
+%bcond_with    sit             # SIT (Source Identity Token)
+
 %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
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.9.0
-%if 0
-%define                pverdot .P1
-%define                pverdir -P1
+%define                ver     9.10.2
+%if 1
+%define                pverdot .P4
+%define                pverdir -P4
 %else
 %define                pverdot %{nil}
 %define                pverdir %{nil}
@@ -46,7 +50,7 @@ Epoch:                7
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.gz
-# Source0-md5: 9281d0b04f711d28153ba1ab04a54026
+# Source0-md5: 8b1f5064837756c938eadc1537dec5c7
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -57,17 +61,19 @@ Source5:    http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 Source6:       %{name}-hip.tar.gz
 # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62
 Source7:       ftp://rs.internic.net/domain/root.zone
-# Source7-md5: b5e38953f6b64856a0b624626968bed1
+# Source7-md5: ac9396c591da79ee8b9f91b62e68a6dd
 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
@@ -75,14 +81,16 @@ BuildRequires:      bison
 BuildRequires: flex
 %{?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: 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
@@ -95,13 +103,14 @@ Requires(pre):     fileutils
 Requires:      %{name}-libs = %{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
+Conflicts:     logrotate < 3.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                schemadir       /usr/share/openldap/schema
@@ -348,6 +357,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.
@@ -363,8 +375,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}
@@ -383,32 +395,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_disable sit} \
        --enable-threads \
-       --enable-getifaddrs
+       --enable-getifaddrs \
+       --enable-full-report \
+       %{__enable_disable seccomp}
 
 %{__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/usr/lib/tmpfiles.d
+       $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 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
-%{__perl} -pi -e 's/NSLOOKUP 8/NSLOOKUP 1/' $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
@@ -428,7 +445,8 @@ 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
+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}
@@ -437,7 +455,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)
@@ -446,7 +464,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
@@ -463,18 +481,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
@@ -495,11 +516,15 @@ 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 %{?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
@@ -517,8 +542,10 @@ fi
 %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}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/ddns-confgen.8*
@@ -531,13 +558,14 @@ fi
 %{_mandir}/man8/nsec3hash.8*
 %{_mandir}/man8/rndc.8*
 %{_mandir}/man8/rndc-confgen.8*
+%{_mandir}/man8/tsig-keygen.8*
 %lang(ja) %{_mandir}/ja/man8/named*
 
-/usr/lib/tmpfiles.d/%{name}.conf
+%{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(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
@@ -555,11 +583,13 @@ fi
 
 %files utils
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/delv
 %attr(755,root,root) %{_bindir}/dig
 %attr(755,root,root) %{_bindir}/host
 %attr(755,root,root) %{_bindir}/nslookup
 %attr(755,root,root) %{_bindir}/nsupdate
 %{?with_hip:%attr(755,root,root) %{_bindir}/hi2dns}
+%{_mandir}/man1/delv.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/host.1*
 %{_mandir}/man1/nslookup.1*
@@ -581,29 +611,34 @@ 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.140
 %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.161
+%attr(755,root,root) %{_libdir}/libirs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libirs.so.141
 %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.148
 %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.140
 %attr(755,root,root) %{_libdir}/libisccfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.140
 %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}/liblwres.so.141
 
 %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
 %{_libdir}/libbind9.la
 %{_libdir}/libdns.la
+%{_libdir}/libirs.la
 %{_libdir}/libisc.la
 %{_libdir}/libisccc.la
 %{_libdir}/libisccfg.la
@@ -611,10 +646,14 @@ fi
 %{_includedir}/bind9
 %{_includedir}/dns
 %{_includedir}/dst
+%{_includedir}/irs
 %{_includedir}/isc
 %{_includedir}/isccc
 %{_includedir}/isccfg
 %{_includedir}/lwres
+%{_includedir}/pk11
+%{_includedir}/pkcs11
+%{_mandir}/man1/bind9-config.1*
 %{_mandir}/man1/isc-config.sh.1*
 %{_mandir}/man3/lwres*.3*
 
@@ -623,6 +662,7 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libbind9.a
 %{_libdir}/libdns.a
+%{_libdir}/libirs.a
 %{_libdir}/libisc.a
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
This page took 1.307518 seconds and 4 git commands to generate.