diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2008-04-23 15:03:02 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2008-04-23 15:03:02 +0000 |
| commit | e70e236de411833e9dcaaca4a4990620f83c20a4 (patch) | |
| tree | 6ff0818abd7f3d969d4c3eb0791c641f343f41f9 /bind-9.4.0-sdb-sqlite-bld.patch | |
| parent | 28d0a5960b2bc2ba4b3ff37d21791fb06d1abf9c (diff) | |
- fixed building of named-sdb (#432497)bind-9_5_0-25_1_b2_fc8
- bind-9.3.2-prctl_set_dumpable.patch is obsoleted
Diffstat (limited to 'bind-9.4.0-sdb-sqlite-bld.patch')
| -rw-r--r-- | bind-9.4.0-sdb-sqlite-bld.patch | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/bind-9.4.0-sdb-sqlite-bld.patch b/bind-9.4.0-sdb-sqlite-bld.patch index 4e8a71a..46c1648 100644 --- a/bind-9.4.0-sdb-sqlite-bld.patch +++ b/bind-9.4.0-sdb-sqlite-bld.patch @@ -1,5 +1,6 @@ ---- bind-9.4.0/bin/named/main-sdb.c.sdb-sqlite-bld 2007-03-12 14:00:05.000000000 +0100 -+++ bind-9.4.0/bin/named/main-sdb.c 2007-03-12 14:02:34.000000000 +0100 +diff -up bind-9.5.0b2/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.0b2/bin/named-sdb/main.c +--- bind-9.5.0b2/bin/named-sdb/main.c.sdb-sqlite-bld 2008-02-14 15:06:44.000000000 +0100 ++++ bind-9.5.0b2/bin/named-sdb/main.c 2008-02-14 15:06:44.000000000 +0100 @@ -74,6 +74,7 @@ /* #include "xxdb.h" */ #include "ldapdb.h" @@ -8,7 +9,7 @@ #include "dirdb.h" /* -@@ -648,6 +649,7 @@ +@@ -646,6 +647,7 @@ setup(void) { ldapdb_clear(); pgsqldb_clear(); @@ -16,7 +17,7 @@ dirdb_clear(); isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, -@@ -737,6 +739,23 @@ +@@ -743,6 +745,23 @@ setup(void) { ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded." ); @@ -40,7 +41,7 @@ result = dirdb_init(); if (result != ISC_R_SUCCESS) { -@@ -781,6 +800,7 @@ +@@ -787,6 +806,7 @@ cleanup(void) { ldapdb_clear(); pgsqldb_clear(); @@ -48,25 +49,27 @@ dirdb_clear(); isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ---- bind-9.4.0/bin/named/Makefile.in.sdb-sqlite-bld 2007-03-12 14:00:05.000000000 +0100 -+++ bind-9.4.0/bin/named/Makefile.in 2007-03-12 14:00:05.000000000 +0100 -@@ -26,10 +26,10 @@ +diff -up bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/named-sdb/Makefile.in +--- bind-9.5.0b2/bin/named-sdb/Makefile.in.sdb-sqlite-bld 2008-02-14 15:06:44.000000000 +0100 ++++ bind-9.5.0b2/bin/named-sdb/Makefile.in 2008-02-14 15:10:56.000000000 +0100 +@@ -26,10 +26,10 @@ top_srcdir = @top_srcdir@ # # Add database drivers here. # --DBDRIVER_OBJS = ldapdb.o pgsqldb.o dirdb.o --DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c -+DBDRIVER_OBJS = ldapdb.o pgsqldb.o sqlitedb.o dirdb.o -+DBDRIVER_SRCS = ldapdb.c pgsqldb.c sqlitedb.c dirdb.c +-DBDRIVER_OBJS = ldapdb.o pgsqldb.o dirdb.o +-DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c ++DBDRIVER_OBJS = ldapdb.o pgsqldb.o dirdb.o sqlitedb.o ++DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c sqlitedb.c DBDRIVER_INCLUDES = --DBDRIVER_LIBS = -lldap -llber -lpq -+DBDRIVER_LIBS = -lldap -llber -lpq -lsqlite3 +-DBDRIVER_LIBS = -lldap -llber -lpq ++DBDRIVER_LIBS = -lldap -llber -lpq -lsqlite3 DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers ---- bind-9.4.0/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2007-03-12 14:00:05.000000000 +0100 -+++ bind-9.4.0/bin/sdb_tools/Makefile.in 2007-03-12 14:00:05.000000000 +0100 -@@ -30,11 +30,11 @@ +diff -up bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.0b2/bin/sdb_tools/Makefile.in +--- bind-9.5.0b2/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2008-02-14 15:06:44.000000000 +0100 ++++ bind-9.5.0b2/bin/sdb_tools/Makefile.in 2008-02-14 15:06:44.000000000 +0100 +@@ -30,11 +30,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@ @@ -81,7 +84,7 @@ MANPAGES = zone2ldap.1 -@@ -54,6 +54,9 @@ +@@ -54,6 +54,9 @@ zone2ldap: zone2ldap.o ${DEPLIBS} zonetodb: zonetodb.o ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS} @@ -91,7 +94,7 @@ ldap2zone: ldap2zone.o ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone.o -lldap -llber ${LIBS} -@@ -68,4 +71,5 @@ +@@ -68,4 +71,5 @@ install:: ${TARGETS} installdirs ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir} ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone ${DESTDIR}${sbindir} ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb ${DESTDIR}${sbindir} |