Update to 9.9.3rc1

- bind-96-libtool2.patch has been merged
- fix bind tmpfiles.d for named.pid /run migration (#920713)

Signed-off-by: Adam Tkac <atkac@redhat.com>

1 files changed, 38 insertions, 34 deletions

diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 4bbf2a8..270ec9e 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,21 +1,21 @@
-diff -up bind-9.9.2/bin/Makefile.in.sdb bind-9.9.2/bin/Makefile.in
---- bind-9.9.2/bin/Makefile.in.sdb	2012-09-27 02:35:19.000000000 +0200
-+++ bind-9.9.2/bin/Makefile.in	2012-10-11 13:23:43.933988077 +0200
+diff -up bind-9.9.3rc1/bin/Makefile.in.sdb bind-9.9.3rc1/bin/Makefile.in
+--- bind-9.9.3rc1/bin/Makefile.in.sdb	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/bin/Makefile.in	2013-04-16 15:21:22.286944331 +0200
 @@ -19,8 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
 -		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
-+SUBDIRS =	named named-sdb rndc dig dnssec tests tools nsupdate \
++SUBDIRS =	named named-sdb rndc dig dnssec tools tests nsupdate \
 +		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
---- bind-9.9.2/bin/named/Makefile.in.sdb	2012-10-11 13:21:35.877105690 +0200
-+++ bind-9.9.2/bin/named/Makefile.in	2012-10-11 13:21:36.099105521 +0200
-@@ -45,7 +45,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
+diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefile.in
+--- bind-9.9.3rc1/bin/named/Makefile.in.sdb	2013-04-16 15:21:22.102944727 +0200
++++ bind-9.9.3rc1/bin/named/Makefile.in	2013-04-16 15:21:22.286944331 +0200
+@@ -49,7 +49,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
  
@@ -24,7 +24,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
  
  CWARNINGS =
  
-@@ -69,11 +69,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
+@@ -73,11 +73,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -38,7 +38,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
  
  SUBDIRS =	unix
  
-@@ -86,8 +86,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
+@@ -90,8 +90,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
  		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
  		zoneconf.@O@ \
  		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@@ -48,7 +48,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
  
  UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
  
-@@ -100,8 +99,7 @@ SRCS =		builtin.c client.c config.c cont
+@@ -104,8 +103,7 @@ SRCS =		builtin.c client.c config.c cont
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
  		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@@ -58,15 +58,17 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -169,5 +167,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
- 	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+@@ -180,7 +178,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
  	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
  	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
--
+ 
 -@DLZ_DRIVER_RULES@
-diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
---- bind-9.9.2/bin/named-sdb/main.c.sdb	2012-10-11 13:21:36.052105556 +0200
-+++ bind-9.9.2/bin/named-sdb/main.c	2012-10-11 13:21:36.099105521 +0200
+-
+ named-symtbl.@O@: named-symtbl.c
+ 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
+diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main.c
+--- bind-9.9.3rc1/bin/named-sdb/main.c.sdb	2013-04-16 15:21:22.249944411 +0200
++++ bind-9.9.3rc1/bin/named-sdb/main.c	2013-04-16 15:21:22.287944329 +0200
 @@ -83,6 +83,9 @@
   * Include header files for database drivers here.
   */
@@ -77,7 +79,7 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
  
  #ifdef CONTRIB_DLZ
  /*
-@@ -802,6 +805,10 @@ setup(void) {
+@@ -808,6 +811,10 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -86,9 +88,9 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
 +	dirdb_clear();
 +
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
- 		      saved_command_line);
-@@ -914,6 +921,57 @@ setup(void) {
+ 		      ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
+ 		      ns_g_version, saved_command_line);
+@@ -920,6 +927,57 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -146,7 +148,7 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
  	ns_server_create(ns_g_mctx, &ns_g_server);
  }
  
-@@ -945,6 +1003,10 @@ cleanup(void) {
+@@ -951,6 +1009,10 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -157,10 +159,10 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/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.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makefile.in
---- bind-9.9.2/bin/named-sdb/Makefile.in.sdb	2012-10-11 13:21:36.045105563 +0200
-+++ bind-9.9.2/bin/named-sdb/Makefile.in	2012-10-11 13:21:36.100105520 +0200
-@@ -28,10 +28,10 @@ top_srcdir =	@top_srcdir@
+diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb/Makefile.in
+--- bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb	2013-04-16 15:21:22.243944424 +0200
++++ bind-9.9.3rc1/bin/named-sdb/Makefile.in	2013-04-16 15:21:22.287944329 +0200
+@@ -32,10 +32,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
@@ -174,7 +176,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -77,7 +77,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
+@@ -81,7 +81,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
  
  SUBDIRS =	unix
  
@@ -183,7 +185,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
  
  OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
  		controlconf.@O@ interfacemgr.@O@ \
-@@ -132,7 +132,7 @@ config.@O@: config.c bind.keys.h
+@@ -139,7 +139,7 @@ config.@O@: config.c bind.keys.h
  		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
  		-c ${srcdir}/config.c
  
@@ -192,7 +194,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
  	export MAKE_SYMTABLE="yes"; \
  	export BASEOBJS="${OBJS} ${UOBJS}"; \
  	${FINALBUILDCMD}
-@@ -160,14 +160,8 @@ statschannel.@O@: bind9.xsl.h
+@@ -170,15 +170,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -209,10 +211,11 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
  
  @DLZ_DRIVER_RULES@
-diff -up bind-9.9.2/configure.in.sdb bind-9.9.2/configure.in
---- bind-9.9.2/configure.in.sdb	2012-10-11 13:21:36.000000000 +0200
-+++ bind-9.9.2/configure.in	2012-10-11 13:24:35.710940464 +0200
-@@ -3571,11 +3571,14 @@ AC_CONFIG_FILES([
+ 
+diff -up bind-9.9.3rc1/configure.in.sdb bind-9.9.3rc1/configure.in
+--- bind-9.9.3rc1/configure.in.sdb	2013-04-16 15:21:22.208944499 +0200
++++ bind-9.9.3rc1/configure.in	2013-04-16 15:21:19.395950103 +0200
+@@ -3651,12 +3651,15 @@ AC_CONFIG_FILES([
  	bin/dnssec/Makefile
  	bin/named/Makefile
  	bin/named/unix/Makefile
@@ -222,6 +225,7 @@ diff -up bind-9.9.2/configure.in.sdb bind-9.9.2/configure.in
  	bin/pkcs11/Makefile
  	bin/python/Makefile
  	bin/python/dnssec-checkds.py
+ 	bin/python/dnssec-coverage.py
  	bin/rndc/Makefile
 +	bin/sdb_tools/Makefile
  	bin/tests/Makefile