- update to 9.7.0b1bind-9_7_0-0_6_b1_fc13

- add bind-pkcs11 subpackage to support PKCS11 compatible keystores for
    DNSSEC keys

1 files changed, 41 insertions, 41 deletions

diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch
index 4966fd1..b249f2f 100644
--- a/bind-96-dyndb.patch
+++ b/bind-96-dyndb.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c
---- bind-9.7.0a3/bin/named/main.c.dyndb	2009-09-01 20:40:25.000000000 +0200
-+++ bind-9.7.0a3/bin/named/main.c	2009-09-16 10:47:35.744643926 +0200
+diff -up bind-9.7.0b1/bin/named/main.c.dyndb bind-9.7.0b1/bin/named/main.c
+--- bind-9.7.0b1/bin/named/main.c.dyndb	2009-10-05 19:30:49.000000000 +0200
++++ bind-9.7.0b1/bin/named/main.c	2009-10-20 10:39:55.439045751 +0200
 @@ -45,6 +45,7 @@
  #include <isccc/result.h>
  
@@ -9,7 +9,7 @@ diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c
  #include <dns/name.h>
  #include <dns/result.h>
  #include <dns/view.h>
-@@ -844,6 +845,8 @@ setup(void) {
+@@ -853,6 +854,8 @@ setup(void) {
  
  static void
  cleanup(void) {
@@ -18,9 +18,9 @@ diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c
  	destroy_managers();
  
  	ns_server_destroy(&ns_g_server);
-diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c
---- bind-9.7.0a3/bin/named/server.c.dyndb	2009-09-10 03:49:29.000000000 +0200
-+++ bind-9.7.0a3/bin/named/server.c	2009-09-16 10:47:35.744643926 +0200
+diff -up bind-9.7.0b1/bin/named/server.c.dyndb bind-9.7.0b1/bin/named/server.c
+--- bind-9.7.0b1/bin/named/server.c.dyndb	2009-10-12 22:48:11.000000000 +0200
++++ bind-9.7.0b1/bin/named/server.c	2009-10-20 10:39:55.439045751 +0200
 @@ -58,6 +58,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
@@ -156,7 +156,7 @@ diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c
  	/*
  	 * Parse the global default pseudo-config file.
  	 */
-@@ -4944,6 +5044,8 @@ loadconfig(ns_server_t *server) {
+@@ -4945,6 +5045,8 @@ loadconfig(ns_server_t *server) {
  static isc_result_t
  reload(ns_server_t *server) {
  	isc_result_t result;
@@ -165,9 +165,9 @@ diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c
  	CHECK(loadconfig(server));
  
  	result = load_zones(server, ISC_FALSE);
-diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c
---- /dev/null	2009-09-16 12:27:54.710000266 +0200
-+++ bind-9.7.0a3/lib/dns/dynamic_db.c	2009-09-16 10:47:35.744643926 +0200
+diff -up /dev/null bind-9.7.0b1/lib/dns/dynamic_db.c
+--- /dev/null	2009-10-20 12:29:23.540001947 +0200
++++ bind-9.7.0b1/lib/dns/dynamic_db.c	2009-10-20 10:39:55.439045751 +0200
 @@ -0,0 +1,364 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -533,9 +533,9 @@ diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c
 +
 +	return args->timermgr;
 +}
-diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h
---- /dev/null	2009-09-16 12:27:54.710000266 +0200
-+++ bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h	2009-09-16 10:47:35.744643926 +0200
+diff -up /dev/null bind-9.7.0b1/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-10-20 12:29:23.540001947 +0200
++++ bind-9.7.0b1/lib/dns/include/dns/dynamic_db.h	2009-10-20 10:39:55.439045751 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2008-2009  Red Hat, Inc.
@@ -587,9 +587,9 @@ diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/include/dns/log.h
---- bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb	2009-01-18 00:47:43.000000000 +0100
-+++ bind-9.7.0a3/lib/dns/include/dns/log.h	2009-09-16 10:47:35.744643926 +0200
+diff -up bind-9.7.0b1/lib/dns/include/dns/log.h.dyndb bind-9.7.0b1/lib/dns/include/dns/log.h
+--- bind-9.7.0b1/lib/dns/include/dns/log.h.dyndb	2009-01-18 00:47:43.000000000 +0100
++++ bind-9.7.0b1/lib/dns/include/dns/log.h	2009-10-20 10:39:55.439045751 +0200
 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
@@ -598,21 +598,21 @@ diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/inclu
  
  ISC_LANG_BEGINDECLS
  
-diff -up bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/include/dns/Makefile.in
---- bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
-+++ bind-9.7.0a3/lib/dns/include/dns/Makefile.in	2009-09-16 10:47:35.744643926 +0200
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+diff -up bind-9.7.0b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0b1/lib/dns/include/dns/Makefile.in
+--- bind-9.7.0b1/lib/dns/include/dns/Makefile.in.dyndb	2009-10-09 01:48:10.000000000 +0200
++++ bind-9.7.0b1/lib/dns/include/dns/Makefile.in	2009-10-20 10:42:34.949043781 +0200
+@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
+ @BIND9_VERSION@
  
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \
 -		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
 +		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/include/dns/types.h
---- bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb	2009-09-01 02:22:27.000000000 +0200
-+++ bind-9.7.0a3/lib/dns/include/dns/types.h	2009-09-16 10:47:35.744643926 +0200
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h \
+ 		keyflags.h keytable.h keyvalues.h lib.h log.h \
+ 		master.h masterdump.h message.h name.h ncache.h nsec.h \
+diff -up bind-9.7.0b1/lib/dns/include/dns/types.h.dyndb bind-9.7.0b1/lib/dns/include/dns/types.h
+--- bind-9.7.0b1/lib/dns/include/dns/types.h.dyndb	2009-09-01 02:22:27.000000000 +0200
++++ bind-9.7.0b1/lib/dns/include/dns/types.h	2009-10-20 10:39:55.439045751 +0200
 @@ -60,6 +60,7 @@ typedef struct dns_dbtable			dns_dbtable
  typedef void					dns_dbversion_t;
  typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
@@ -621,9 +621,9 @@ diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/inc
  typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
  typedef struct dns_decompress			dns_decompress_t;
  typedef struct dns_dispatch			dns_dispatch_t;
-diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c
---- bind-9.7.0a3/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
-+++ bind-9.7.0a3/lib/dns/log.c	2009-09-16 10:47:35.744643926 +0200
+diff -up bind-9.7.0b1/lib/dns/log.c.dyndb bind-9.7.0b1/lib/dns/log.c
+--- bind-9.7.0b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.7.0b1/lib/dns/log.c	2009-10-20 10:39:55.439045751 +0200
 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
@@ -632,9 +632,9 @@ diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c
  	{ NULL, 		0 }
  };
  
-diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in
---- bind-9.7.0a3/lib/dns/Makefile.in.dyndb	2009-09-16 10:47:35.714664894 +0200
-+++ bind-9.7.0a3/lib/dns/Makefile.in	2009-09-16 10:47:35.744643926 +0200
+diff -up bind-9.7.0b1/lib/dns/Makefile.in.dyndb bind-9.7.0b1/lib/dns/Makefile.in
+--- bind-9.7.0b1/lib/dns/Makefile.in.dyndb	2009-10-20 10:39:55.429046304 +0200
++++ bind-9.7.0b1/lib/dns/Makefile.in	2009-10-20 10:43:14.571543754 +0200
 @@ -57,8 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
  DNSOBJS =	acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
  		cache.@O@ callbacks.@O@ compress.@O@ \
@@ -645,7 +645,7 @@ diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in
 +		journal.@O@ keydata.@O@ keytable.@O@ lib.@O@ log.@O@ lookup.@O@ \
  		master.@O@ masterdump.@O@ message.@O@ \
  		name.@O@ ncache.@O@ nsec.@O@ nsec3.@O@ order.@O@ peer.@O@ \
- 		portlist.@O@ \
+ 		portlist.@O@ private.@O@ \
 @@ -84,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
  DNSSRCS =	acache.c acl.c adb.c byaddr.c \
  		cache.c callbacks.c compress.c \
@@ -667,9 +667,9 @@ diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in
  libdns.@SA@: ${OBJS}
  	${AR} ${ARFLAGS} $@ ${OBJS}
  	${RANLIB} $@
-diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/namedconf.c
---- bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb	2009-09-02 18:10:03.000000000 +0200
-+++ bind-9.7.0a3/lib/isccfg/namedconf.c	2009-09-16 10:52:11.257143715 +0200
+diff -up bind-9.7.0b1/lib/isccfg/namedconf.c.dyndb bind-9.7.0b1/lib/isccfg/namedconf.c
+--- bind-9.7.0b1/lib/isccfg/namedconf.c.dyndb	2009-10-13 01:48:02.000000000 +0200
++++ bind-9.7.0b1/lib/isccfg/namedconf.c	2009-10-20 10:39:55.439045751 +0200
 @@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -678,7 +678,7 @@ diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/named
  static cfg_type_t cfg_type_ixfrdifftype;
  static cfg_type_t cfg_type_key;
  static cfg_type_t cfg_type_logfile;
-@@ -791,6 +792,7 @@ namedconf_or_view_clauses[] = {
+@@ -798,6 +799,7 @@ namedconf_or_view_clauses[] = {
  	{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
  	/* only 1 DLZ per view allowed */
  	{ "dlz", &cfg_type_dynamically_loadable_zones, 0 },
@@ -686,7 +686,7 @@ diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/named
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
  	{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
-@@ -1561,6 +1563,40 @@ static cfg_type_t cfg_type_dialuptype = 
+@@ -1571,6 +1573,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };