- update to 9.7.0rc1

- bind97-headers.patch merged
- update default configuration

.cvsignore

@@ -1,2 +1,2 @@
-config-4.tar.bz2
+bind-9.7.0rc1.tar.gz
-bind-9.7.0b3.tar.gz
+config-5.tar.bz2

bind-9.5-sdb.patch

@@ -1,6 +1,6 @@
-diff -up bind-9.7.0b1/bin/Makefile.in.sdb bind-9.7.0b1/bin/Makefile.in
+diff -up bind-9.7.0rc1/bin/Makefile.in.sdb bind-9.7.0rc1/bin/Makefile.in
---- bind-9.7.0b1/bin/Makefile.in.sdb	2009-10-05 14:07:08.000000000 +0200
+--- bind-9.7.0rc1/bin/Makefile.in.sdb	2009-10-05 14:07:08.000000000 +0200
-+++ bind-9.7.0b1/bin/Makefile.in	2009-10-20 11:01:21.011555584 +0200
++++ bind-9.7.0rc1/bin/Makefile.in	2009-12-15 12:58:11.913941164 +0100
 @@ -19,8 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
@@ -12,15 +12,15 @@ diff -up bind-9.7.0b1/bin/Makefile.in.sdb bind-9.7.0b1/bin/Makefile.in
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.7.0b1/bin/named/Makefile.in.sdb bind-9.7.0b1/bin/named/Makefile.in
+diff -up bind-9.7.0rc1/bin/named/Makefile.in.sdb bind-9.7.0rc1/bin/named/Makefile.in
---- bind-9.7.0b1/bin/named/Makefile.in.sdb	2009-10-20 11:01:20.971545269 +0200
+--- bind-9.7.0rc1/bin/named/Makefile.in.sdb	2009-12-15 12:58:11.863950805 +0100
-+++ bind-9.7.0b1/bin/named/Makefile.in	2009-10-20 11:01:35.191543713 +0200
++++ bind-9.7.0rc1/bin/named/Makefile.in	2009-12-15 12:58:57.163938385 +0100
 @@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
  
--CDEFINES =      -DBIND9 @USE_DLZ@ @USE_PKCS11@
+-CDEFINES =      @USE_DLZ@ @USE_PKCS11@
-+CDEFINES =      -DBIND9 @USE_PKCS11@
++CDEFINES =      @USE_PKCS11@
  
  CWARNINGS =
  
@@ -64,9 +64,9 @@ diff -up bind-9.7.0b1/bin/named/Makefile.in.sdb bind-9.7.0b1/bin/named/Makefile.
  	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 -
 -@DLZ_DRIVER_RULES@
-diff -up bind-9.7.0b1/bin/named-sdb/main.c.sdb bind-9.7.0b1/bin/named-sdb/main.c
+diff -up bind-9.7.0rc1/bin/named-sdb/main.c.sdb bind-9.7.0rc1/bin/named-sdb/main.c
---- bind-9.7.0b1/bin/named-sdb/main.c.sdb	2009-10-20 11:01:20.991546005 +0200
+--- bind-9.7.0rc1/bin/named-sdb/main.c.sdb	2009-12-15 12:58:11.893960333 +0100
-+++ bind-9.7.0b1/bin/named-sdb/main.c	2009-10-20 11:01:21.011555584 +0200
++++ bind-9.7.0rc1/bin/named-sdb/main.c	2009-12-15 12:58:11.913941164 +0100
 @@ -75,6 +75,9 @@
   * Include header files for database drivers here.
   */
@@ -157,9 +157,9 @@ diff -up bind-9.7.0b1/bin/named-sdb/main.c.sdb bind-9.7.0b1/bin/named-sdb/main.c
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb bind-9.7.0b1/bin/named-sdb/Makefile.in
+diff -up bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.7.0rc1/bin/named-sdb/Makefile.in
---- bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb	2009-10-20 11:01:20.991546005 +0200
+--- bind-9.7.0rc1/bin/named-sdb/Makefile.in.sdb	2009-12-15 12:58:11.873941824 +0100
-+++ bind-9.7.0b1/bin/named-sdb/Makefile.in	2009-10-20 11:01:21.011555584 +0200
++++ bind-9.7.0rc1/bin/named-sdb/Makefile.in	2009-12-15 12:58:11.913941164 +0100
 @@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
@@ -209,10 +209,10 @@ diff -up bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb bind-9.7.0b1/bin/named-sdb/M
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.7.0b1/configure.in.sdb bind-9.7.0b1/configure.in
+diff -up bind-9.7.0rc1/configure.in.sdb bind-9.7.0rc1/configure.in
---- bind-9.7.0b1/configure.in.sdb	2009-10-16 06:16:17.000000000 +0200
+--- bind-9.7.0rc1/configure.in.sdb	2009-11-11 09:46:47.000000000 +0100
-+++ bind-9.7.0b1/configure.in	2009-10-20 11:01:21.011555584 +0200
++++ bind-9.7.0rc1/configure.in	2009-12-15 12:58:11.913941164 +0100
-@@ -3206,6 +3206,8 @@ AC_CONFIG_FILES([
+@@ -3241,6 +3241,8 @@ AC_CONFIG_FILES([
  	bin/confgen/unix/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
@@ -221,7 +221,7 @@ diff -up bind-9.7.0b1/configure.in.sdb bind-9.7.0b1/configure.in
  	bin/rndc/Makefile
  	bin/dig/Makefile
  	bin/nsupdate/Makefile
-@@ -3227,6 +3229,7 @@ AC_CONFIG_FILES([
+@@ -3262,6 +3264,7 @@ AC_CONFIG_FILES([
  	bin/tests/headerdep_test.sh
  	bin/tools/Makefile
  	bin/dnssec/Makefile

bind.spec

@@ -3,9 +3,8 @@
 #
 
 #%define PATCHVER P1
-#%define PREVER rc1
 #%define VERSION %{version}-%{PATCHVER}
-%define PREVER b3
+%define PREVER rc1
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -21,7 +20,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.9.%{PREVER}%{?dist}
+Release:  0.10.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch107:bind97-dist-pkcs11.patch
-Patch108:bind97-headers.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -230,7 +228,6 @@ mkdir m4
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch107 -p1 -b .dist-pkcs11
-%patch108 -p1 -b .headers
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -304,7 +301,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 # We don't want these
 rm -f doc/rfc/fetch
-rm doc/draft/draft-ietf-enum-e164-gstn-np-05.txt
 
 cp  --preserve=timestamps %{SOURCE5} doc/rfc
 gzip -9 doc/rfc/*
@@ -484,6 +480,43 @@ rm -rf ${RPM_BUILD_ROOT}
 :;
 
 %files
+%defattr(-,root,root,-)
+%{_libdir}/bind
+%config(noreplace) %{_sysconfdir}/sysconfig/named
+%{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
+%{_sbindir}/arpaname
+%{_sbindir}/ddns-confgen
+%{_sbindir}/genrandom
+%{_sbindir}/named-journalprint
+%{_sbindir}/nsec3hash
+%{_sbindir}/dnssec*
+%{_sbindir}/named-check*
+%{_sbindir}/lwresd
+%{_sbindir}/named
+%{_sbindir}/rndc*
+%{_sbindir}/named-compilezone
+%{_mandir}/man1/arpaname.1*
+%{_mandir}/man5/named.conf.5*
+%{_mandir}/man5/rndc.conf.5*
+%{_mandir}/man8/rndc.8*
+%{_mandir}/man8/named.8*
+%{_mandir}/man8/lwresd.8*
+%{_mandir}/man8/dnssec*.8*
+%{_mandir}/man8/named-checkconf.8*
+%{_mandir}/man8/named-checkzone.8*
+%{_mandir}/man8/named-compilezone.8*
+%{_mandir}/man8/rndc-confgen.8*
+%{_mandir}/man8/ddns-confgen.8*
+%{_mandir}/man8/genrandom.8*
+%{_mandir}/man8/named-journalprint.8*
+%{_mandir}/man8/nsec3hash.8*
+%doc CHANGES COPYRIGHT README named.conf.default
+%doc doc/arm doc/misc doc/draft doc/rfc
+%doc sample/
+%doc Copyright
+%doc rfc1912.txt
+
 # Hide configuration
 %defattr(0640,root,named,0750)
 %dir %{_sysconfdir}/named
@@ -511,42 +544,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/logrotate.d/named
 %defattr(-,named,named,-)
 %dir %{_localstatedir}/run/named
-%defattr(-,root,root,-)
-%{_libdir}/bind
-%config(noreplace) %{_sysconfdir}/sysconfig/named
-%{_sysconfdir}/rc.d/init.d/named
-%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
-%{_sbindir}/arpaname
-%{_sbindir}/ddns-confgen
-%{_sbindir}/genrandom
-%{_sbindir}/journalprint
-%{_sbindir}/nsec3hash
-%{_sbindir}/dnssec*
-%{_sbindir}/named-check*
-%{_sbindir}/lwresd
-%{_sbindir}/named
-%{_sbindir}/rndc*
-%{_sbindir}/named-compilezone
-%{_mandir}/man1/arpaname.1*
-%{_mandir}/man5/named.conf.5*
-%{_mandir}/man5/rndc.conf.5*
-%{_mandir}/man8/rndc.8*
-%{_mandir}/man8/named.8*
-%{_mandir}/man8/lwresd.8*
-%{_mandir}/man8/dnssec*.8*
-%{_mandir}/man8/named-checkconf.8*
-%{_mandir}/man8/named-checkzone.8*
-%{_mandir}/man8/named-compilezone.8*
-%{_mandir}/man8/rndc-confgen.8*
-%{_mandir}/man8/ddns-confgen.8*
-%{_mandir}/man8/genrandom.8*
-%{_mandir}/man8/journalprint.8*
-%{_mandir}/man8/nsec3hash.8*
-%doc CHANGES COPYRIGHT README named.conf.default
-%doc doc/arm doc/misc doc/draft doc/rfc
-%doc sample/
-%doc Copyright
-%doc rfc1912.txt
 
 %if %{SDB}
 %files sdb
@@ -592,6 +589,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/isc-config.sh
 
 %files chroot
+%defattr(-,root,root,-)
+%ghost %{chroot_prefix}/dev/null
+%ghost %{chroot_prefix}/dev/random
+%ghost %{chroot_prefix}/dev/zero
+%ghost %{chroot_prefix}/etc/localtime
 %defattr(0640,root,named,0750)
 %dir %{chroot_prefix}
 %dir %{chroot_prefix}/dev
@@ -607,16 +609,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{chroot_prefix}/var/run/named
 %dir %{chroot_prefix}/var/tmp
 %dir %{chroot_prefix}/var/log
-%defattr(-,root,root,-)
-%ghost %{chroot_prefix}/dev/null
-%ghost %{chroot_prefix}/dev/random
-%ghost %{chroot_prefix}/dev/zero
-%ghost %{chroot_prefix}/etc/localtime
 
 %if %{PKCS11}
 %files pkcs11
 %defattr(-,root,root,-)
-%doc README.pkcs11 NSEC3-NOTES
+%doc README.pkcs11
 %{_sbindir}/pkcs11-destroy
 %{_sbindir}/pkcs11-keygen
 %{_sbindir}/pkcs11-list
@@ -624,6 +621,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Dec 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.10.rc1
+- update to 9.7.0rc1
+- bind97-headers.patch merged
+- update default configuration
+
 * Tue Dec 01 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.9.b3
 - update to 9.7.0b3
 

bind97-headers.patch

@@ -1,14 +0,0 @@
-diff -up bind-9.7.0b2/lib/isc/include/isc/Makefile.in.headers bind-9.7.0b2/lib/isc/include/isc/Makefile.in
---- bind-9.7.0b2/lib/isc/include/isc/Makefile.in.headers	2009-11-26 10:16:08.838465689 +0100
-+++ bind-9.7.0b2/lib/isc/include/isc/Makefile.in	2009-11-26 10:16:22.034465882 +0100
-@@ -33,8 +33,8 @@ HEADERS =	app.h assertions.h base64.h bi
- 		httpd.h \
- 		interfaceiter.h @ISC_IPV6_H@ iterated_hash.h lang.h lex.h \
- 		lfsr.h lib.h list.h log.h \
--		magic.h md5.h mem.h msgcat.h msgs.h \
--		mutexblock.h netaddr.h ondestroy.h os.h parseint.h \
-+		magic.h md5.h mem.h msgcat.h msgs.h mutexblock.h \
-+		namespace.h netaddr.h ondestroy.h os.h parseint.h \
- 		print.h quota.h radix.h random.h ratelimiter.h \
- 		refcount.h region.h resource.h \
- 		result.h resultclass.h rwlock.h serial.h sha1.h sha2.h \

sources

@@ -1,2 +1,2 @@
-de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
+4f7e99f8aef6b3d19ef86647c183f502  bind-9.7.0rc1.tar.gz
-9d375b157acf123a81f62bd9e4acb531  bind-9.7.0b3.tar.gz
+4c35a2aac8d8054ea2154906bf57fb52  config-5.tar.bz2