- up to 9.7.0

Changed files:
    bind-pmake.patch -> 1.6
    bind.spec -> 1.295

diff --git a/bind-pmake.patch b/bind-pmake.patch
index d994b5a36de51198eebdf9b9fe5f40dde62b0a78..90c4c69e71ad33e6a1c5df6457054a9e94966f34 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -37,20 +37,31 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
        touch timestamp
  
  installdirs:
-diff -ur bind-9.3.0rc3.orig/lib/isc/Makefile.in bind-9.3.0rc3/lib/isc/Makefile.in
---- bind-9.3.0rc3.orig/lib/isc/Makefile.in     2004-07-20 09:01:58.000000000 +0200
-+++ bind-9.3.0rc3/lib/isc/Makefile.in  2004-09-01 10:52:47.772148808 +0200
-@@ -88,11 +88,11 @@
+--- bind-9.7.0/lib/isc/Makefile.in~    2009-12-18 05:09:55.000000000 +0100
++++ bind-9.7.0/lib/isc/Makefile.in     2010-02-17 08:04:13.849211197 +0100
+@@ -94,21 +94,21 @@
                -DLIBAGE=${LIBAGE} \
                -c ${srcdir}/version.c
  
--libisc.@SA@: ${OBJS}
-+libisc.@SA@: touchfile ${OBJS}
+-libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
++libisc.@SA@: touchfile ${OBJS} ${SYMTBLOBJS}
+       ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
+       ${RANLIB} $@
+ 
+-libisc-nosymtbl.@SA@: ${OBJS}
++libisc-nosymtbl.@SA@: touchfile ${OBJS}
        ${AR} ${ARFLAGS} $@ ${OBJS}
        ${RANLIB} $@
  
--libisc.la: ${OBJS}
-+libisc.la: touchfile ${OBJS}
+-libisc.la: ${OBJS} ${SYMTBLOBJS}
++libisc.la: touchfile ${OBJS} ${SYMTBLOBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+               ${OBJS} ${SYMTBLOBJS} ${LIBS}
+ 
+-libisc-nosymtbl.la: ${OBJS}
++libisc-nosymtbl.la: touchfile ${OBJS}
+       ${LIBTOOL_MODE_LINK} \
+               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
+               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \

diff --git a/bind.spec b/bind.spec
index 66ad8fcf08d62d0fde1d4e9cfe6112295fd56240..d367c9e79d28b8ffd3423ac03fe3b7f1b31647f4 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -21,16 +21,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.1
-%define        plev    P3
+%define        ver             9.7.0
 Name:          bind
-Version:       %{ver}.%{plev}
+Version:       %{ver}
 Release:       1
 Epoch:         7
 License:       BSD-like
 Group:         Networking/Daemons
-Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}-%{plev}/%{name}-%{ver}-%{plev}.tar.gz
-# Source0-md5: a0952d589b3051538033387be4c983f9
+Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}/%{name}-%{ver}.tar.gz
+# Source0-md5: c245b5d1aa0a4f53d9538faa1efe2c3f
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -335,7 +334,7 @@ BIND schema for openldap.
 Schemat BIND dla openldap.
 
 %prep
-%setup -q %{?with_hip:-a6} -n %{name}-%{ver}-%{plev}
+%setup -q %{?with_hip:-a6} -n %{name}-%{ver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -349,7 +348,7 @@ Schemat BIND dla openldap.
 %{__autoconf}
 cp -f /usr/share/automake/config.* .
 %configure \
-       CFLAGS="-D_GNU_SOURCE=1" \
+       CFLAGS="-D_GNU_SOURCE=1 %{rpmcppflags}" \
        --with-idn \
        --with-libtool \
        %{?with_ssl:--with-openssl=%{_prefix}} \
@@ -394,8 +393,10 @@ 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
+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
+ln -sf %{_var}/lib/named%{_sysconfdir}/bind.keys $RPM_BUILD_ROOT/etc/bind.keys
 ln -sf %{_var}/lib/named/named.log     $RPM_BUILD_ROOT%{_var}/log/named
 ln -sf %{_var}/lib/named/named.stats   $RPM_BUILD_ROOT%{_var}/log/named.stats
 
@@ -476,6 +477,7 @@ sed -i -e 's#^\([ \t]*category[ \t]\+load[ \t]\+.*\)$#// \1#g' /var/lib/named/et
 %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
+%attr(640,root,named) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bind.keys
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/named
 
 %attr(755,root,root) %{_sbindir}/*