- up to 9.4.2

[packages/bind.git] / bind.spec

diff --git a/bind.spec b/bind.spec
index 0232c443051f7cfb5a08d85887934571fea1df3e..0f1aee47adffd8963084a1f8fa4a66ab6b9a6fa2 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -5,6 +5,7 @@
 %bcond_without ssl             # build without OpenSSL support
 %bcond_without ipv6            # build without IPv6 support
 %bcond_without ldap            # build without LDAP support
+%bcond_without sql             # build without SQL support
 %bcond_without static_libs     # build without static libraries
 %bcond_without tests           # perform tests
 %bcond_with    hip             # build with HIP RR support
@@ -20,15 +21,15 @@ Summary(tr.UTF-8):  DNS alan adı sunucusu
 Summary(uk.UTF-8):     BIND - cервер системи доменних імен (DNS)
 Summary(zh_CN.UTF-8):  Internet 域名服务器
 Name:          bind
-Version:       9.4.1
-Release:       4
-Epoch:         6
+Version:       9.4.2
+Release:       1
+Epoch:         7
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 09b54d35036cb0423b2e618f21766285
+# Source0-md5: 57953d7264139b9506b9d66174125179
 Source1:       %{name}-conf.tar.gz
-# Source1-md5: 8ee77729f806fcd548fe0cceb34b4a06
+# Source1-md5: 14d2c6befe25e68c713a1deb552668cc
 Source2:       named.init
 Source3:       named.sysconfig
 Source4:       named.logrotate
@@ -38,6 +39,8 @@ Source6:      http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
 # Source6-md5: 49fe799c6eca54ae227b22d57ebc1145
 Source7:       %{name}-hip.tar.gz
 # Source7-md5: 62a8a67f51ff8db9fe815205416a1f62
+Source8:       ftp://rs.internic.net/domain/named.root
+# Source8-md5: 8c212c0260d708f15f75d3adc71f0149
 Patch0:                %{name}-time.patch
 Patch1:                %{name}-autoconf.patch
 Patch2:                %{name}-includedir-libbind.patch
@@ -45,9 +48,7 @@ Patch3:               %{name}-link.patch
 Patch4:                %{name}-pmake.patch
 Patch5:                %{name}-sdb-ldap.patch
 Patch6:                %{name}-noinet6.patch
-Patch7:                %{name}-getifaddrs.patch
-Patch8:                %{name}-dighost_asccheck.patch
-Patch9:                %{name}-chroot-numcpus.patch
+Patch7:                %{name}-chroot-numcpus.patch
 URL:           http://www.isc.org/products/BIND/bind9.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,11 +57,11 @@ BuildRequires:      flex
 BuildRequires: idnkit-devel
 %{?with_hip:BuildRequires:     libxml2-devel}
 BuildRequires: libtool
-%{?with_ldap:BuildRequires:    openldap-devel}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: unixODBC-devel
+%{?with_sql:BuildRequires:     mysql-devel}
+%{?with_sql:BuildRequires:     postgresql-devel}
+%{?with_sql:BuildRequires:     unixODBC-devel}
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
@@ -339,10 +340,10 @@ Schemat BIND dla openldap.
 %{?with_ldap:%patch5 -p1}
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic}
 
+install %{SOURCE8} conf-pld/root.hint
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -358,8 +359,8 @@ cd ../..
        %{?with_ssl:--with-openssl=%{_prefix}} \
        %{?with_ipv6:--enable-ipv6} \
        --enable-libbind \
-       --with-dlz-postgres=yes \
-       --with-dlz-mysql=yes \
+       %{?with_sql:--with-dlz-postgres=yes} \
+       %{?with_sql:--with-dlz-mysql=yes} \
        --with-dlz-bdb=no \
        --with-dlz-filesystem=yes \
        %{?with_ldap:--with-dlz-ldap=yes} \
@@ -448,8 +449,9 @@ fi
 %postun        libs -p /sbin/ldconfig
 
 %triggerpostun -- %{name} < 6:9.4.1
-sed -i -e 's#^\([ \t]*category[ \t]\+cname[ \t]\+.*\)$#// \1#g' /etc/named.conf
-sed -i -e 's#^\([ \t]*category[ \t]\+response-checks[ \t]\+.*\)$#// \1#g' /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)