diff options
| author | Adam Tkac <atkac@redhat.com> | 2011-03-03 12:54:23 +0100 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2011-03-03 13:14:28 +0100 |
| commit | 100a9cfcec827f7e21b79311ff3395b48418d3d7 (patch) | |
| tree | c5d759f4048caf2ebf2f68ac0fc18b32ef9e2f1e /bind-9.5-sdb.patch | |
| parent | 3e86a6bcba71abbdfcfde532ae984135d1bc68d4 (diff) | |
| download | bind-100a9cfcec827f7e21b79311ff3395b48418d3d7.tar.gz bind-100a9cfcec827f7e21b79311ff3395b48418d3d7.tar.xz bind-100a9cfcec827f7e21b79311ff3395b48418d3d7.zip | |
Revert "Integrate named with libnmserver library."
This reverts commit 3e86a6bcba71abbdfcfde532ae984135d1bc68d4.
Diffstat (limited to 'bind-9.5-sdb.patch')
| -rw-r--r-- | bind-9.5-sdb.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch index 22c00b1..88dda90 100644 --- a/bind-9.5-sdb.patch +++ b/bind-9.5-sdb.patch @@ -1,6 +1,6 @@ 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-22 16:02:56.029259468 +0100 ++++ 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@ @@ -13,14 +13,14 @@ diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in @BIND9_MAKE_RULES@ 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-22 16:02:55.899255772 +0100 -+++ bind-9.8.0rc1/bin/named/Makefile.in 2011-02-22 16:03:32.580297210 +0100 +--- 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} @DST_OPENSSL_INC@ --CDEFINES = @USE_DLZ@ @USE_PKCS11@ @USE_OPENSSL@ @LIBNMSERVER_CPPFLAGS@ -+CDEFINES = @USE_PKCS11@ @USE_OPENSSL@ @LIBNMSERVER_CPPFLAGS@ +-CDEFINES = @USE_DLZ@ @USE_PKCS11@ @USE_OPENSSL@ ++CDEFINES = @USE_PKCS11@ @USE_OPENSSL@ CWARNINGS = @@ -28,13 +28,13 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ -- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBNMSERVER_LIBS@ @LIBS@ -+ @LIBNMSERVER_LIBS@ @LIBS@ +- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ ++ @LIBS@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \ -- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBNMSERVER_LIBS@ @LIBS@ -+ @LIBNMSERVER_LIBS@ @LIBS@ +- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ ++ @LIBS@ SUBDIRS = unix @@ -65,8 +65,8 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil - -@DLZ_DRIVER_RULES@ 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-22 16:02:55.919256342 +0100 -+++ bind-9.8.0rc1/bin/named-sdb/main.c 2011-02-22 16:02:56.029259468 +0100 +--- 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. */ @@ -77,7 +77,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main /* * Include DLZ drivers if appropriate. -@@ -787,6 +790,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.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main 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); -@@ -870,6 +877,57 @@ setup(void) { +@@ -867,6 +874,57 @@ setup(void) { isc_result_totext(result)); #endif @@ -146,7 +146,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main ns_server_create(ns_g_mctx, &ns_g_server); } -@@ -897,6 +955,10 @@ cleanup(void) { +@@ -894,6 +952,10 @@ cleanup(void) { dns_name_destroy(); @@ -158,8 +158,8 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); 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-22 16:02:55.909256065 +0100 -+++ bind-9.8.0rc1/bin/named-sdb/Makefile.in 2011-02-22 16:02:56.029259468 +0100 +--- 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. @@ -210,9 +210,9 @@ diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb @DLZ_DRIVER_RULES@ diff -up bind-9.8.0rc1/configure.in.sdb bind-9.8.0rc1/configure.in ---- bind-9.8.0rc1/configure.in.sdb 2011-02-22 16:02:55.899255772 +0100 -+++ bind-9.8.0rc1/configure.in 2011-02-22 16:02:56.029259468 +0100 -@@ -3308,9 +3308,12 @@ AC_CONFIG_FILES([ +--- 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 |