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

Contents of /updates/5/bind/current/SOURCES/bind-9.10-sdb.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1104818 - (show annotations) (download)
Fri May 26 13:25:52 2017 UTC (6 years, 10 months ago) by guillomovitch
File size: 8747 byte(s) 
- sync with cauldron packages, to fix multiple security issues
 (CVE-2016-931, CVE-2016-9147, CVE-2016-9444, CVE-2017-3135) (#mga20107)
- also ensure /dev/urandom is available in chroot (#mga12425)
1 diff -Naurp bind-9.10.0-P1/bin/Makefile.in bind-9.10.0-P1.oden/bin/Makefile.in
2 --- bind-9.10.0-P1/bin/Makefile.in 2014-05-05 02:15:51.000000000 +0200
3 +++ bind-9.10.0-P1.oden/bin/Makefile.in 2014-05-09 08:50:24.000000000 +0200
4 @@ -19,8 +19,8 @@ srcdir = @srcdir@
5 VPATH = @srcdir@
6 top_srcdir = @top_srcdir@
7
8 -SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
9 - check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
10 +SUBDIRS = named named-sdb rndc dig delv dnssec tools tests nsupdate \
11 + check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
12 TARGETS =
13
14 @BIND9_MAKE_RULES@
15 diff -Naurp bind-9.10.0-P1/bin/named/Makefile.in bind-9.10.0-P1.oden/bin/named/Makefile.in
16 --- bind-9.10.0-P1/bin/named/Makefile.in 2014-05-09 08:48:11.000000000 +0200
17 +++ bind-9.10.0-P1.oden/bin/named/Makefile.in 2014-05-09 08:50:58.000000000 +0200
18 @@ -51,7 +51,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
19 ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
20 ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
21
22 -CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
23 +CDEFINES = @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
24
25 CWARNINGS =
26
27 @@ -75,11 +75,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
28
29 LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
30 ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
31 - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
32 + @LIBS@
33
34 NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
35 ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
36 - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
37 + @LIBS@
38
39 SUBDIRS = unix
40
41 @@ -94,8 +94,7 @@ OBJS = builtin.@O@ client.@O@ config.@O
42 tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
43 zoneconf.@O@ \
44 lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
45 - lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
46 - ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
47 + lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
48
49 UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
50
51 @@ -110,8 +109,7 @@ SRCS = builtin.c client.c config.c cont
52 tkeyconf.c tsigconf.c update.c xfrout.c \
53 zoneconf.c \
54 lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
55 - lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
56 - ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
57 + lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
58
59 MANPAGES = named.8 lwresd.8 named.conf.5
60
61 @@ -181,7 +179,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
62 rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
63 ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
64
65 -@DLZ_DRIVER_RULES@
66 -
67 named-symtbl.@O@: named-symtbl.c
68 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
69 diff -Naurp bind-9.10.0-P1/bin/named-sdb/main.c bind-9.10.0-P1.oden/bin/named-sdb/main.c
70 --- bind-9.10.0-P1/bin/named-sdb/main.c 2014-05-09 08:48:11.000000000 +0200
71 +++ bind-9.10.0-P1.oden/bin/named-sdb/main.c 2014-05-09 08:48:47.000000000 +0200
72 @@ -85,6 +85,9 @@
73 * Include header files for database drivers here.
74 */
75 /* #include "xxdb.h" */
76 +#include "ldapdb.h"
77 +#include "pgsqldb.h"
78 +#include "dirdb.h"
79
80 #ifdef CONTRIB_DLZ
81 /*
82 @@ -871,6 +874,10 @@ setup(void) {
83 ns_main_earlyfatal("isc_app_start() failed: %s",
84 isc_result_totext(result));
85
86 + ldapdb_clear();
87 + pgsqldb_clear();
88 + dirdb_clear();
89 +
90 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
91 ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>%s",
92 ns_g_product, ns_g_version,
93 @@ -983,6 +990,57 @@ setup(void) {
94 isc_result_totext(result));
95 #endif
96
97 + result = ldapdb_init();
98 + if (result != ISC_R_SUCCESS)
99 + {
100 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
101 + ISC_LOG_ERROR,
102 + "SDB ldap module initialisation failed: %s.",
103 + isc_result_totext(result)
104 + );
105 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
106 + ISC_LOG_ERROR,
107 + "SDB ldap zone database will be unavailable."
108 + );
109 + }else
110 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
111 + ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
112 + );
113 +
114 + result = pgsqldb_init();
115 + if (result != ISC_R_SUCCESS)
116 + {
117 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
118 + ISC_LOG_ERROR,
119 + "SDB pgsql module initialisation failed: %s.",
120 + isc_result_totext(result)
121 + );
122 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
123 + ISC_LOG_ERROR,
124 + "SDB pgsql zone database will be unavailable."
125 + );
126 + }else
127 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
128 + ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
129 + );
130 +
131 + result = dirdb_init();
132 + if (result != ISC_R_SUCCESS)
133 + {
134 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
135 + ISC_LOG_ERROR,
136 + "SDB directory DB module initialisation failed: %s.",
137 + isc_result_totext(result)
138 + );
139 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
140 + ISC_LOG_ERROR,
141 + "SDB directory DB zone database will be unavailable."
142 + );
143 + }else
144 + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
145 + ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
146 + );
147 +
148 ns_server_create(ns_g_mctx, &ns_g_server);
149
150 #ifdef HAVE_LIBSECCOMP
151 @@ -1014,6 +1072,10 @@ cleanup(void) {
152
153 dns_name_destroy();
154
155 + ldapdb_clear();
156 + pgsqldb_clear();
157 + dirdb_clear();
158 +
159 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
160 ISC_LOG_NOTICE, "exiting");
161 ns_log_shutdown();
162 diff -Naurp bind-9.10.0-P1/bin/named-sdb/Makefile.in bind-9.10.0-P1.oden/bin/named-sdb/Makefile.in
163 --- bind-9.10.0-P1/bin/named-sdb/Makefile.in 2014-05-09 08:48:11.000000000 +0200
164 +++ bind-9.10.0-P1.oden/bin/named-sdb/Makefile.in 2014-05-09 08:48:47.000000000 +0200
165 @@ -34,10 +34,10 @@ top_srcdir = @top_srcdir@
166 #
167 # Add database drivers here.
168 #
169 -DBDRIVER_OBJS =
170 -DBDRIVER_SRCS =
171 +DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ dirdb.@O@
172 +DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c
173 DBDRIVER_INCLUDES =
174 -DBDRIVER_LIBS =
175 +DBDRIVER_LIBS = -lldap -llber -lpq
176
177 DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
178
179 @@ -83,7 +83,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI
180
181 SUBDIRS = unix
182
183 -TARGETS = named@EXEEXT@ lwresd@EXEEXT@
184 +TARGETS = named-sdb@EXEEXT@
185
186 GEOIPLINKOBJS = geoip.@O@
187
188 @@ -144,7 +144,7 @@ config.@O@: config.c
189 -DNS_SYSCONFDIR=\"${sysconfdir}\" \
190 -c ${srcdir}/config.c
191
192 -named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
193 +named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
194 export MAKE_SYMTABLE="yes"; \
195 export BASEOBJS="${OBJS} ${UOBJS}"; \
196 ${FINALBUILDCMD}
197 @@ -171,15 +171,9 @@ statschannel.@O@: bind9.xsl.h
198
199 installdirs:
200 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
201 - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
202 - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
203
204 -install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
205 - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
206 - (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
207 - ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
208 - ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
209 - ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
210 +install:: named-sdb@EXEEXT@ installdirs
211 + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
212
213 uninstall::
214 rm -f ${DESTDIR}${mandir}/man5/named.conf.5
215 diff -Naurp bind-9.10.0-P1/configure.in bind-9.10.0-P1.oden/configure.in
216 --- bind-9.10.0-P1/configure.in 2014-05-09 08:48:11.000000000 +0200
217 +++ bind-9.10.0-P1.oden/configure.in 2014-05-09 08:48:47.000000000 +0200
218 @@ -4345,6 +4345,8 @@ AC_CONFIG_FILES([
219 bin/dnssec/Makefile
220 bin/named/Makefile
221 bin/named/unix/Makefile
222 + bin/named-sdb/Makefile
223 + bin/named-sdb/unix/Makefile
224 bin/nsupdate/Makefile
225 bin/pkcs11/Makefile
226 bin/python/Makefile
227 @@ -4363,6 +4365,7 @@ AC_CONFIG_FILES([
228 bin/python/isc/keyzone.py
229 bin/python/isc/tests/dnskey_test.py
230 bin/rndc/Makefile
231 + bin/sdb_tools/Makefile
232 bin/tests/Makefile
233 bin/tests/atomic/Makefile
234 bin/tests/db/Makefile
  ViewVC Help
Powered by ViewVC 1.1.30