- up to 9.6.1

Changed files:
    bind-autoconf.patch -> 1.3
    bind-link.patch -> 1.6
    bind.spec -> 1.289

diff --git a/bind-autoconf.patch b/bind-autoconf.patch
deleted file mode 100644 (file)
index b74ee80..0000000
--- a/bind-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur bind-9.2.0/configure.in bind-9.2.0-p/configure.in
---- bind-9.2.0/configure.in    Sun Nov 25 02:48:43 2001
-+++ bind-9.2.0-p/configure.in  Tue Nov 27 12:38:26 2001
-@@ -24,7 +24,7 @@
- AC_CANONICAL_HOST
- 
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- 
- AC_SUBST(STD_CINCLUDES)

diff --git a/bind-link.patch b/bind-link.patch
index 5dd766248bfd5e1e9b9c97b18e462cfeb65cb192..e4d1130b68a8f254df7b020b018338dc8bd1e4f6 100644 (file)
--- a/bind-link.patch
+++ b/bind-link.patch
@@ -1,12 +1,12 @@
 diff -Nur bind-9.3.2.orig/configure.in bind-9.3.2.link/configure.in
 --- bind-9.3.2.orig/configure.in       2006-08-05 01:45:48.000000000 +0200
 +++ bind-9.3.2.link/configure.in       2006-08-05 01:45:55.000000000 +0200
-@@ -866,8 +866,8 @@
-       mips-sgi-irix*)
+@@ -1171,8 +1171,8 @@
+       *-linux*)
                ;;
        *)
 -              AC_CHECK_LIB(socket, socket)
--              AC_CHECK_LIB(nsl, inet_ntoa)
+-              AC_CHECK_LIB(nsl, inet_addr)
 +              AC_SEARCH_LIBS(socket, socket)
 +              AC_SEARCH_LIBS(inet_ntoa, nsl)
                ;;

diff --git a/bind.spec b/bind.spec
index 2c3bf0799a74079c7cbf32c90cd6f6ca0632cad3..f8b9a1bfe7581ac5c71d83af6e30ea212976805b 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -22,16 +22,15 @@ Summary(ru.UTF-8):  BIND - cервер системы доменных имен (
 Summary(tr.UTF-8):     DNS alan adı sunucusu
 Summary(uk.UTF-8):     BIND - cервер системи доменних імен (DNS)
 Summary(zh_CN.UTF-8):  Internet 域名服务器
-%define        ver     9.6.0
-%define        plevel  P1
+%define        ver     9.6.1
 Name:          bind
-Version:       %{ver}.%{plevel}
+Version:       %{ver}
 Release:       1
 Epoch:         7
 License:       BSD-like
 Group:         Networking/Daemons
-Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}-%{plevel}/%{name}-%{ver}-%{plevel}.tar.gz
-# Source0-md5: 886b7eae55cfdc8cd8d2ca74a2f99c6e
+Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}/%{name}-%{ver}.tar.gz
+# Source0-md5: 516ac74d8eaaef30ad4c99ada8b715cd
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -47,10 +46,9 @@ Source8:     %{name}-127.0.0.zone
 Source9:       %{name}-localhost.zone
 Source10:      %{name}-named.conf
 Patch0:                %{name}-time.patch
-Patch1:                %{name}-autoconf.patch
-Patch2:                %{name}-link.patch
-Patch3:                %{name}-pmake.patch
-Patch4:                %{name}-sdb-ldap.patch
+Patch1:                %{name}-link.patch
+Patch2:                %{name}-pmake.patch
+Patch3:                %{name}-sdb-ldap.patch
 URL:           https://www.isc.org/software/bind
 BuildRequires: autoconf
 BuildRequires: automake
@@ -334,12 +332,11 @@ BIND schema for openldap.
 Schemat BIND dla openldap.
 
 %prep
-%setup -q %{?with_hip:-a6} -n %{name}-%{ver}-%{plevel}
+%setup -q %{?with_hip:-a6} -n %{name}-%{ver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%{?with_ldap:%patch4 -p1}
+%{?with_ldap:%patch3 -p1}
 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic}
 
 
@@ -553,6 +550,7 @@ sed -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/et
 %{_includedir}/isccc
 %{_includedir}/isccfg
 %{_includedir}/lwres
+%{_mandir}/man1/isc-config.sh.1*
 %{_mandir}/man3/lwres*.3*
 
 %if %{with static_libs}