diff options
Diffstat (limited to 'bind-9.5-sdb.patch')
| -rw-r--r-- | bind-9.5-sdb.patch | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch index 3371710..88dda90 100644 --- a/bind-9.5-sdb.patch +++ b/bind-9.5-sdb.patch @@ -1,6 +1,6 @@ -diff -up bind-9.7.2b1/bin/Makefile.in.sdb bind-9.7.2b1/bin/Makefile.in ---- bind-9.7.2b1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200 -+++ bind-9.7.2b1/bin/Makefile.in 2010-08-03 14:19:16.513711718 +0200 +diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in +--- bind-9.8.0rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200 ++++ bind-9.8.0rc1/bin/Makefile.in 2011-02-21 16:28:51.678648382 +0100 @@ -19,8 +19,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ @@ -12,15 +12,15 @@ diff -up bind-9.7.2b1/bin/Makefile.in.sdb bind-9.7.2b1/bin/Makefile.in TARGETS = @BIND9_MAKE_RULES@ -diff -up bind-9.7.2b1/bin/named/Makefile.in.sdb bind-9.7.2b1/bin/named/Makefile.in ---- bind-9.7.2b1/bin/named/Makefile.in.sdb 2010-08-03 14:19:16.363679615 +0200 -+++ bind-9.7.2b1/bin/named/Makefile.in 2010-08-03 14:19:16.523713862 +0200 +diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefile.in +--- bind-9.8.0rc1/bin/named/Makefile.in.sdb 2011-02-21 16:28:51.618648508 +0100 ++++ bind-9.8.0rc1/bin/named/Makefile.in 2011-02-21 16:29:11.808606048 +0100 @@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} + ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ --CDEFINES = @USE_DLZ@ @USE_PKCS11@ -+CDEFINES = @USE_PKCS11@ +-CDEFINES = @USE_DLZ@ @USE_PKCS11@ @USE_OPENSSL@ ++CDEFINES = @USE_PKCS11@ @USE_OPENSSL@ CWARNINGS = @@ -58,16 +58,16 @@ diff -up bind-9.7.2b1/bin/named/Makefile.in.sdb bind-9.7.2b1/bin/named/Makefile. MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -166,5 +164,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i +@@ -169,5 +167,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 - -@DLZ_DRIVER_RULES@ -diff -up bind-9.7.2b1/bin/named-sdb/main.c.sdb bind-9.7.2b1/bin/named-sdb/main.c ---- bind-9.7.2b1/bin/named-sdb/main.c.sdb 2010-08-03 14:19:16.423692459 +0200 -+++ bind-9.7.2b1/bin/named-sdb/main.c 2010-08-03 14:19:16.523713862 +0200 -@@ -75,6 +75,9 @@ +diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main.c +--- bind-9.8.0rc1/bin/named-sdb/main.c.sdb 2011-02-21 16:28:51.638648466 +0100 ++++ bind-9.8.0rc1/bin/named-sdb/main.c 2011-02-21 16:28:51.678648382 +0100 +@@ -81,6 +81,9 @@ * Include header files for database drivers here. */ /* #include "xxdb.h" */ @@ -77,7 +77,7 @@ diff -up bind-9.7.2b1/bin/named-sdb/main.c.sdb bind-9.7.2b1/bin/named-sdb/main.c /* * Include DLZ drivers if appropriate. -@@ -768,6 +771,10 @@ setup(void) { +@@ -784,6 +787,10 @@ setup(void) { ns_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); @@ -88,7 +88,7 @@ diff -up bind-9.7.2b1/bin/named-sdb/main.c.sdb bind-9.7.2b1/bin/named-sdb/main.c 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); -@@ -851,6 +858,57 @@ setup(void) { +@@ -867,6 +874,57 @@ setup(void) { isc_result_totext(result)); #endif @@ -146,7 +146,7 @@ diff -up bind-9.7.2b1/bin/named-sdb/main.c.sdb bind-9.7.2b1/bin/named-sdb/main.c ns_server_create(ns_g_mctx, &ns_g_server); } -@@ -878,6 +936,10 @@ cleanup(void) { +@@ -894,6 +952,10 @@ cleanup(void) { dns_name_destroy(); @@ -157,9 +157,9 @@ diff -up bind-9.7.2b1/bin/named-sdb/main.c.sdb bind-9.7.2b1/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.2b1/bin/named-sdb/Makefile.in.sdb bind-9.7.2b1/bin/named-sdb/Makefile.in ---- bind-9.7.2b1/bin/named-sdb/Makefile.in.sdb 2010-08-03 14:19:16.413690320 +0200 -+++ bind-9.7.2b1/bin/named-sdb/Makefile.in 2010-08-03 14:19:16.523713862 +0200 +diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb/Makefile.in +--- bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb 2011-02-21 16:28:51.628648487 +0100 ++++ bind-9.8.0rc1/bin/named-sdb/Makefile.in 2011-02-21 16:28:51.678648382 +0100 @@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@ # # Add database drivers here. @@ -192,7 +192,7 @@ diff -up bind-9.7.2b1/bin/named-sdb/Makefile.in.sdb bind-9.7.2b1/bin/named-sdb/M export MAKE_SYMTABLE="yes"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -@@ -157,14 +157,8 @@ statschannel.@O@: bind9.xsl.h +@@ -160,14 +160,8 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -209,23 +209,19 @@ diff -up bind-9.7.2b1/bin/named-sdb/Makefile.in.sdb bind-9.7.2b1/bin/named-sdb/M + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir} @DLZ_DRIVER_RULES@ -diff -up bind-9.7.2b1/configure.in.sdb bind-9.7.2b1/configure.in ---- bind-9.7.2b1/configure.in.sdb 2010-06-22 06:02:39.000000000 +0200 -+++ bind-9.7.2b1/configure.in 2010-08-03 14:20:20.707451485 +0200 -@@ -3266,6 +3266,8 @@ AC_CONFIG_FILES([ - bin/confgen/unix/Makefile +diff -up bind-9.8.0rc1/configure.in.sdb bind-9.8.0rc1/configure.in +--- bind-9.8.0rc1/configure.in.sdb 2011-02-03 06:50:05.000000000 +0100 ++++ bind-9.8.0rc1/configure.in 2011-02-21 16:30:15.788470563 +0100 +@@ -3285,9 +3285,12 @@ AC_CONFIG_FILES([ + bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile + bin/named-sdb/Makefile + bin/named-sdb/unix/Makefile - bin/rndc/Makefile - bin/dig/Makefile bin/nsupdate/Makefile -@@ -3290,6 +3292,7 @@ AC_CONFIG_FILES([ - bin/tests/virtual-time/conf.sh - bin/tools/Makefile - bin/dnssec/Makefile -+ bin/sdb_tools/Makefile bin/pkcs11/Makefile - doc/Makefile - doc/arm/Makefile + bin/rndc/Makefile ++ bin/sdb_tools/Makefile + bin/tests/Makefile + bin/tests/atomic/Makefile + bin/tests/db/Makefile |