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, 31 insertions, 32 deletions

diff --git a/bind97-exportlib.patch b/bind97-exportlib.patch
index 1f5aa20..6d02144 100644
--- a/bind97-exportlib.patch
+++ b/bind97-exportlib.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
---- bind-9.7.2-P2/isc-config.sh.in.exportlib	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.7.2-P2/isc-config.sh.in	2010-10-20 14:05:25.423861548 +0200
+diff -up bind-9.9.3rc1/isc-config.sh.in.exportlib bind-9.9.3rc1/isc-config.sh.in
+--- bind-9.9.3rc1/isc-config.sh.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/isc-config.sh.in	2013-04-16 14:37:36.221590545 +0200
 @@ -20,6 +20,8 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -27,9 +27,9 @@ diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
  	if test x"$liblwres" = x"true" ; then
  		libs="$libs -llwres"
  	fi
-diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in
---- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib	2010-06-10 01:49:43.000000000 +0200
-+++ bind-9.7.2-P2/lib/export/dns/Makefile.in	2010-10-20 14:08:58.123772859 +0200
+diff -up bind-9.9.3rc1/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc1/lib/export/dns/Makefile.in
+--- bind-9.9.3rc1/lib/export/dns/Makefile.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/lib/export/dns/Makefile.in	2013-04-16 14:37:36.221590545 +0200
 @@ -35,9 +35,9 @@ CDEFINES =	-DUSE_MD5 @USE_OPENSSL@ @USE_
  
  CWARNINGS =
@@ -42,7 +42,7 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  
  LIBS =		@LIBS@
  
-@@ -114,29 +114,29 @@ version.@O@: ${srcdir}/version.c
+@@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c
  		-DLIBAGE=${LIBAGE} \
  		-c ${srcdir}/version.c
  
@@ -78,10 +78,10 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
  	rm -f include/dns/rdatastruct.h
  
-diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in
---- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib	2009-12-06 00:31:40.000000000 +0100
-+++ bind-9.7.2-P2/lib/export/irs/Makefile.in	2010-10-20 14:10:39.893717488 +0200
-@@ -42,9 +42,9 @@ SRCS =		context.c \
+diff -up bind-9.9.3rc1/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc1/lib/export/irs/Makefile.in
+--- bind-9.9.3rc1/lib/export/irs/Makefile.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/lib/export/irs/Makefile.in	2013-04-16 14:37:36.222590542 +0200
+@@ -43,9 +43,9 @@ SRCS =		context.c \
  		gai_sterror.c getaddrinfo.c getnameinfo.c \
  		resconf.c
  
@@ -94,7 +94,7 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  
  LIBS =		@LIBS@
  
-@@ -61,26 +61,26 @@ version.@O@: ${srcdir}/version.c
+@@ -62,26 +62,26 @@ version.@O@: ${srcdir}/version.c
  		-DLIBAGE=${LIBAGE} \
  		-c ${srcdir}/version.c
  
@@ -127,17 +127,17 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  clean distclean::
 -	rm -f libirs.@A@ libirs.la timestamp
 +	rm -f libirs-export.@A@ libirs-export.la timestamp
-diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in
---- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib	2009-12-06 00:31:41.000000000 +0100
-+++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in	2010-10-20 14:10:14.593741247 +0200
+diff -up bind-9.9.3rc1/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc1/lib/export/isccfg/Makefile.in
+--- bind-9.9.3rc1/lib/export/isccfg/Makefile.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/lib/export/isccfg/Makefile.in	2013-04-16 14:55:34.645271169 +0200
 @@ -30,11 +30,11 @@ CINCLUDES =	-I. ${DNS_INCLUDES} -I${expo
  CDEFINES =
  CWARNINGS =
  
 -ISCLIBS =	../isc/libisc.@A@
--DNSLIBS =	../dns/libdns.@A@
+-DNSLIBS =	../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 +ISCLIBS =	../isc/libisc-export.@A@
-+DNSLIBS =	../dns/libdns-export.@A@
++DNSLIBS =	../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
  
  ISCDEPLIBS =	../../lib/isc/libisc.@A@
 -ISCCFGDEPLIBS =	libisccfg.@A@
@@ -178,10 +178,10 @@ diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib
  clean distclean::
 -	rm -f libisccfg.@A@ timestamp
 +	rm -f libisccfg-export.@A@ timestamp
-diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in
---- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib	2010-06-10 01:49:43.000000000 +0200
-+++ bind-9.7.2-P2/lib/export/isc/Makefile.in	2010-10-20 14:05:25.433861543 +0200
-@@ -101,6 +101,10 @@ SRCS =		@ISC_EXTRA_SRCS@ \
+diff -up bind-9.9.3rc1/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc1/lib/export/isc/Makefile.in
+--- bind-9.9.3rc1/lib/export/isc/Makefile.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/lib/export/isc/Makefile.in	2013-04-16 14:37:36.223590540 +0200
+@@ -100,6 +100,10 @@ SRCS =		@ISC_EXTRA_SRCS@ \
  
  LIBS =		@LIBS@
  
@@ -192,7 +192,7 @@ diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  SUBDIRS =	include unix nls @ISC_THREAD_DIR@
  TARGETS =	timestamp
  
-@@ -114,26 +118,26 @@ version.@O@: ${srcdir}/version.c
+@@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c
  		-DLIBAGE=${LIBAGE} \
  		-c ${srcdir}/version.c
  
@@ -225,10 +225,10 @@ diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
  clean distclean::
 -	rm -f libisc.@A@ libisc.la timestamp
 +	rm -f libisc-export.@A@ libisc-export.la timestamp
-diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in
---- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib	2009-12-06 00:31:41.000000000 +0100
-+++ bind-9.7.2-P2/lib/export/samples/Makefile.in	2010-10-20 14:05:25.433861543 +0200
-@@ -30,15 +30,15 @@ CINCLUDES =	-I${srcdir}/include -I../dns
+diff -up bind-9.9.3rc1/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc1/lib/export/samples/Makefile.in
+--- bind-9.9.3rc1/lib/export/samples/Makefile.in.exportlib	2013-04-05 00:21:21.000000000 +0200
++++ bind-9.9.3rc1/lib/export/samples/Makefile.in	2013-04-16 14:37:36.223590540 +0200
+@@ -31,15 +31,15 @@ CINCLUDES =	-I${srcdir}/include -I../dns
  CDEFINES =
  CWARNINGS =
  
@@ -236,16 +236,15 @@ diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/li
 -ISCLIBS =	../isc/libisc.@A@
 -ISCCFGLIBS =	../isccfg/libisccfg.@A@
 -IRSLIBS =	../irs/libirs.@A@
--
--DNSDEPLIBS =	../dns/libdns.@A@
--ISCDEPLIBS =	../isc/libisc.@A@
--ISCCFGDEPLIBS =	../isccfg/libisccfg.@A@
--IRSDEPLIBS =	../irs/libirs.@A@
 +DNSLIBS =	../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
 +ISCLIBS =	../isc/libisc-export.@A@
 +ISCCFGLIBS =	../isccfg/libisccfg-export.@A@
 +IRSLIBS =	../irs/libirs-export.@A@
-+
+ 
+-DNSDEPLIBS =	../dns/libdns.@A@
+-ISCDEPLIBS =	../isc/libisc.@A@
+-ISCCFGDEPLIBS =	../isccfg/libisccfg.@A@
+-IRSDEPLIBS =	../irs/libirs.@A@
 +DNSDEPLIBS =	../dns/libdns-export.@A@
 +ISCDEPLIBS =	../isc/libisc-export.@A@
 +ISCCFGDEPLIBS =	../isccfg/libisccfg-export.@A@