/[packages]/cauldron/bind/current/SOURCES/bind-9.10-sdb.patch
ViewVC logotype

Contents of /cauldron/bind/current/SOURCES/bind-9.10-sdb.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1429736 - (show annotations) (download)
Sun Aug 18 10:33:51 2019 UTC (3 months, 3 weeks ago) by guillomovitch
File size: 11582 byte(s)
- new version 9.11.9
- sync patches with Fedora
- add native-enabled PKCSS#11 version, from Fedora

1 diff --git a/bin/Makefile.in b/bin/Makefile.in
2 index ce7a2da..4e6a824 100644
3 --- a/bin/Makefile.in
4 +++ b/bin/Makefile.in
5 @@ -11,8 +11,8 @@ srcdir = @srcdir@
6 VPATH = @srcdir@
7 top_srcdir = @top_srcdir@
8
9 -SUBDIRS = named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
10 - check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
11 +SUBDIRS = named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools nsupdate \
12 + check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
13 TARGETS =
14
15 @BIND9_MAKE_RULES@
16 diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
17 index 9660965..184fbb2 100644
18 --- a/bin/named-sdb/Makefile.in
19 +++ b/bin/named-sdb/Makefile.in
20 @@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
21 #
22 # Add database drivers here.
23 #
24 -DBDRIVER_OBJS =
25 -DBDRIVER_SRCS =
26 +DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
27 +DBDRIVER_SRCS = ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
28 DBDRIVER_INCLUDES =
29 -DBDRIVER_LIBS =
30 +DBDRIVER_LIBS = -lldap -llber -lsqlite3 -lpq
31
32 DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
33
34 @@ -80,7 +80,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
35
36 SUBDIRS = unix
37
38 -TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
39 +TARGETS = named-sdb@EXEEXT@ feature-test-sdb@EXEEXT@
40
41 GEOIPLINKOBJS = geoip.@O@
42 GEOIP2LINKOBJS = geoip.@O@
43 @@ -154,7 +154,7 @@ server.@O@: server.c
44 -DPRODUCT=\"${PRODUCT}\" \
45 -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
46
47 -named@EXEEXT@: ${OBJS} ${DEPLIBS}
48 +named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
49 export MAKE_SYMTABLE="yes"; \
50 export BASEOBJS="${OBJS} ${UOBJS}"; \
51 ${FINALBUILDCMD}
52 @@ -168,7 +168,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
53 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
54 -c ${top_srcdir}/bin/tests/system/feature-test.c
55
56 -feature-test@EXEEXT@: feature-test.@O@
57 +feature-test-sdb@EXEEXT@: feature-test.@O@
58 ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
59 -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
60
61 @@ -190,8 +190,6 @@ statschannel.@O@: bind9.xsl.h
62
63 installdirs:
64 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
65 - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
66 - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
67
68 install-man5: named.conf.5
69 ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
70 @@ -201,16 +199,11 @@ install-man8: named.8 lwresd.8
71
72 install-man: install-man5 install-man8
73
74 -install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
75 - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
76 - (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
77 +install:: ${TARGETS} installdirs
78 + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
79
80 uninstall::
81 - rm -f ${DESTDIR}${mandir}/man5/named.conf.5
82 - rm -f ${DESTDIR}${mandir}/man8/lwresd.8
83 - rm -f ${DESTDIR}${mandir}/man8/named.8
84 - rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
85 - ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
86 + ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
87
88 @DLZ_DRIVER_RULES@
89
90 diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
91 index 108b8d6..a943421 100644
92 --- a/bin/named-sdb/main.c
93 +++ b/bin/named-sdb/main.c
94 @@ -93,6 +93,10 @@
95 * Include header files for database drivers here.
96 */
97 /* #include "xxdb.h" */
98 +#include "ldapdb.h"
99 +#include "pgsqldb.h"
100 +#include "sqlitedb.h"
101 +#include "dirdb.h"
102
103 #ifdef CONTRIB_DLZ
104 /*
105 @@ -1069,6 +1073,11 @@ setup(void) {
106 ns_main_earlyfatal("isc_app_start() failed: %s",
107 isc_result_totext(result));
108
109 + ldapdb_clear();
110 + pgsqldb_clear();
111 + dirdb_clear();
112 + sqlitedb_clear();
113 +
114 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
115 ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
116 ns_g_product, ns_g_version,
117 @@ -1269,6 +1278,75 @@ setup(void) {
118 isc_result_totext(result));
119 #endif
120
121 + result = ldapdb_init();
122 + if (result != ISC_R_SUCCESS)
123 + {
124 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
125 + ISC_LOG_ERROR,
126 + "SDB ldap module initialisation failed: %s.",
127 + isc_result_totext(result)
128 + );
129 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
130 + ISC_LOG_ERROR,
131 + "SDB ldap zone database will be unavailable."
132 + );
133 + }else
134 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
135 + ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
136 + );
137 +
138 + result = pgsqldb_init();
139 + if (result != ISC_R_SUCCESS)
140 + {
141 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
142 + ISC_LOG_ERROR,
143 + "SDB pgsql module initialisation failed: %s.",
144 + isc_result_totext(result)
145 + );
146 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
147 + ISC_LOG_ERROR,
148 + "SDB pgsql zone database will be unavailable."
149 + );
150 + }else
151 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
152 + ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
153 + );
154 +
155 + result = sqlitedb_init();
156 + if (result != ISC_R_SUCCESS)
157 + {
158 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
159 + ISC_LOG_ERROR,
160 + "SDB sqlite3 module initialisation failed: %s.",
161 + isc_result_totext(result)
162 + );
163 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
164 + ISC_LOG_ERROR,
165 + "SDB sqlite3 zone database will be unavailable."
166 + );
167 + }else
168 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
169 + ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
170 + );
171 +
172 + result = dirdb_init();
173 + if (result != ISC_R_SUCCESS)
174 + {
175 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
176 + ISC_LOG_ERROR,
177 + "SDB directory DB module initialisation failed: %s.",
178 + isc_result_totext(result)
179 + );
180 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
181 + ISC_LOG_ERROR,
182 + "SDB directory DB zone database will be unavailable."
183 + );
184 + }else
185 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
186 + ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
187 + );
188 +
189 +
190 ns_server_create(ns_g_mctx, &ns_g_server);
191
192 #ifdef HAVE_LIBSECCOMP
193 @@ -1311,6 +1389,11 @@ cleanup(void) {
194
195 dns_name_destroy();
196
197 + ldapdb_clear();
198 + pgsqldb_clear();
199 + sqlitedb_clear();
200 + dirdb_clear();
201 +
202 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
203 ISC_LOG_NOTICE, "exiting");
204 ns_log_shutdown();
205 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
206 index 9660965..03f7c05 100644
207 --- a/bin/named/Makefile.in
208 +++ b/bin/named/Makefile.in
209 @@ -45,10 +45,10 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
210 CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
211 ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
212 ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
213 - ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
214 + ${MAXMINDDB_CFLAGS} \
215 @DST_OPENSSL_INC@
216
217 -CDEFINES = @CONTRIB_DLZ@ @CRYPTO@
218 +CDEFINES = @CRYPTO@
219
220 CWARNINGS =
221
222 @@ -72,11 +72,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
223
224 LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
225 ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
226 - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
227 + @LIBS@
228
229 NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
230 ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
231 - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
232 + @LIBS@
233
234 SUBDIRS = unix
235
236 @@ -94,8 +94,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
237 tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
238 zoneconf.@O@ \
239 lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
240 - lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
241 - ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
242 + lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
243
244 UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
245
246 @@ -113,8 +112,7 @@ SRCS = builtin.c client.c config.c control.c \
247 tkeyconf.c tsigconf.c update.c xfrout.c \
248 zoneconf.c \
249 lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
250 - lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
251 - ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
252 + lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
253
254 MANPAGES = named.8 lwresd.8 named.conf.5
255
256 @@ -212,7 +210,5 @@ uninstall::
257 rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
258 ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
259
260 -@DLZ_DRIVER_RULES@
261 -
262 named-symtbl.@O@: named-symtbl.c
263 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
264 diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
265 index c7e0868..95ab742 100644
266 --- a/bin/sdb_tools/Makefile.in
267 +++ b/bin/sdb_tools/Makefile.in
268 @@ -32,11 +32,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
269 LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
270 ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
271
272 -TARGETS = zone2ldap@EXEEXT@ zonetodb@EXEEXT@
273 +TARGETS = zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
274
275 -OBJS = zone2ldap.@O@ zonetodb.@O@
276 +OBJS = zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
277
278 -SRCS = zone2ldap.c zonetodb.c
279 +SRCS = zone2ldap.c zonetodb.c zone2sqlite.c
280
281 MANPAGES = zone2ldap.1
282
283 @@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
284 zonetodb@EXEEXT@: zonetodb.@O@ ${DEPLIBS}
285 ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
286
287 +zone2sqlite@EXEEXT@: zone2sqlite.@O@ ${DEPLIBS}
288 + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
289 +
290 clean distclean manclean maintainer-clean::
291 rm -f ${TARGETS} ${OBJS}
292
293 @@ -60,4 +63,5 @@ installdirs:
294 install:: ${TARGETS} installdirs
295 ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
296 ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@ ${DESTDIR}${sbindir}
297 + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
298 ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
299 diff --git a/configure.ac b/configure.ac
300 index d8147ae..930cd1c 100644
301 --- a/configure.ac
302 +++ b/configure.ac
303 @@ -5532,6 +5532,8 @@ AC_CONFIG_FILES([
304 bin/named/unix/Makefile
305 bin/named-pkcs11/Makefile
306 bin/named-pkcs11/unix/Makefile
307 + bin/named-sdb/Makefile
308 + bin/named-sdb/unix/Makefile
309 bin/nsupdate/Makefile
310 bin/pkcs11/Makefile
311 bin/python/Makefile
312 @@ -5556,6 +5558,7 @@ AC_CONFIG_FILES([
313 bin/python/isc/tests/dnskey_test.py
314 bin/python/isc/tests/policy_test.py
315 bin/rndc/Makefile
316 + bin/sdb_tools/Makefile
317 bin/tests/Makefile
318 bin/tests/headerdep_test.sh
319 bin/tests/optional/Makefile

  ViewVC Help
Powered by ViewVC 1.1.26