packages: bind/bind-pmake.patch, bind/bind.spec - up to 9.7.0

[arekm]

Author: arekm                        Date: Wed Feb 17 07:21:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 9.7.0

---- Files affected:
packages/bind:
   bind-pmake.patch (1.5 -> 1.6) , bind.spec (1.294 -> 1.295) 

---- Diffs:

================================================================
Index: packages/bind/bind-pmake.patch
diff -u packages/bind/bind-pmake.patch:1.5 packages/bind/bind-pmake.patch:1.6
--- packages/bind/bind-pmake.patch:1.5	Wed Jan  7 21:24:48 2009
+++ packages/bind/bind-pmake.patch	Wed Feb 17 08:20:58 2010
@@ -37,20 +37,31 @@
  	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. at SA@: ${OBJS}
-+libisc. at SA@: touchfile ${OBJS}
+-libisc. at SA@: ${OBJS} ${SYMTBLOBJS}
++libisc. at SA@: touchfile ${OBJS} ${SYMTBLOBJS}
+ 	${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
+ 	${RANLIB} $@
+ 
+-libisc-nosymtbl. at SA@: ${OBJS}
++libisc-nosymtbl. at 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} \

================================================================
Index: packages/bind/bind.spec
diff -u packages/bind/bind.spec:1.294 packages/bind/bind.spec:1.295
--- packages/bind/bind.spec:1.294	Tue Jan 19 19:07:57 2010
+++ packages/bind/bind.spec	Wed Feb 17 08:20:58 2010
@@ -22,16 +22,15 @@
 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
@@ -336,7 +335,7 @@
 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
@@ -350,7 +349,7 @@
 %{__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}} \
@@ -395,8 +394,10 @@
 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
 
@@ -477,6 +478,7 @@
 %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}/*
@@ -593,6 +595,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.295  2010/02/17 07:20:58  arekm
+- up to 9.7.0
+
 Revision 1.294  2010/01/19 18:07:57  arekm
 - up to 9.6.1-P3 (fixes CVE identifiers: CVE-2009-4022, CVE-2010-0097, CERT advisories: VU#418861, VU#360341)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bind/bind-pmake.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bind/bind.spec?r1=1.294&r2=1.295&f=u