rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix changed patches

Browse Source
This commit is contained in:
Petr Menšík 2017-06-15 17:50:41 +02:00
parent 08bdf0ebe6
commit 102df25a21
8 changed files with 151 additions and 4573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
bind-9.10-dist-native-pkcs11.patch
View File

@ -1,5 +1,5 @@
diff --git a/bin/Makefile.in b/bin/Makefile.in
index e3aeffb..7654169 100644
index f3cbed3..7d21984 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -10,7 +10,7 @@ srcdir = @srcdir@
@ -12,14 +12,14 @@ index e3aeffb..7654169 100644
TARGETS =
diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
index 4f1bf90..b8dc6fe 100644
index 8c6627a..0427349 100644
--- a/bin/dnssec-pkcs11/Makefile.in
+++ b/bin/dnssec-pkcs11/Makefile.in
@@ -23,18 +23,18 @@ top_srcdir = @top_srcdir@
@@ -14,18 +14,18 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
-CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES}
-CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
+CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES}
CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
@ -41,7 +41,7 @@ index 4f1bf90..b8dc6fe 100644
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
@@ -43,10 +43,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
@@ -34,10 +34,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
# Alphabetically
@ -56,7 +56,7 @@ index 4f1bf90..b8dc6fe 100644
OBJS = dnssectool.@O@
@@ -67,15 +67,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
@@ -58,15 +58,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
@BIND9_MAKE_RULES@
@ -75,7 +75,7 @@ index 4f1bf90..b8dc6fe 100644
export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \
${FINALBUILDCMD}
@@ -83,7 +83,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
@@ -74,7 +74,7 @@ dnssec-signzone.@O@: dnssec-signzone.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/dnssec-signzone.c
@ -84,7 +84,7 @@ index 4f1bf90..b8dc6fe 100644
export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \
${FINALBUILDCMD}
@@ -91,19 +91,19 @@ dnssec-verify.@O@: dnssec-verify.c
@@ -82,19 +82,19 @@ dnssec-verify.@O@: dnssec-verify.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/dnssec-verify.c
@ -108,7 +108,7 @@ index 4f1bf90..b8dc6fe 100644
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
dnssec-importkey.@O@ ${OBJS} ${LIBS}
@@ -114,11 +114,9 @@ docclean manclean maintainer-clean::
@@ -105,14 +105,11 @@ docclean manclean maintainer-clean::
installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -118,15 +118,18 @@ index 4f1bf90..b8dc6fe 100644
for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done
- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
uninstall::
- for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done
for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t ; done
clean distclean::
rm -f ${TARGETS}
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 4f1bf90..e1132ea 100644
index 8c6627a..c070881 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES}
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
-CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
+CDEFINES = -DVERSION=\"${VERSION}\" \
@ -134,7 +137,7 @@ index 4f1bf90..e1132ea 100644
CWARNINGS =
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
index 95e36c1..fb658e9 100644
index 903023b..b40303d 100644
--- a/bin/named-pkcs11/Makefile.in
+++ b/bin/named-pkcs11/Makefile.in
@@ -36,26 +36,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
@ -219,7 +222,7 @@ index 95e36c1..fb658e9 100644
export MAKE_SYMTABLE="yes"; \
export BASEOBJS="${OBJS} ${UOBJS}"; \
${FINALBUILDCMD}
@@ -166,15 +164,9 @@ statschannel.@O@: bind9.xsl.h
@@ -166,22 +164,12 @@ statschannel.@O@: bind9.xsl.h
installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -235,13 +238,21 @@ index 95e36c1..fb658e9 100644
+install:: named-pkcs11@EXEEXT@ installdirs
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-pkcs11@EXEEXT@ ${DESTDIR}${sbindir}
uninstall::
- rm -f ${DESTDIR}${mandir}/man5/named.conf.5
- rm -f ${DESTDIR}${mandir}/man8/lwresd.8
- rm -f ${DESTDIR}${mandir}/man8/named.8
- rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-pkcs11@EXEEXT@
@DLZ_DRIVER_RULES@
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 95e36c1..ba5ec3c 100644
index 903023b..9c14b73 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -51,7 +51,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
@@ -40,7 +40,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
@ -251,10 +262,10 @@ index 95e36c1..ba5ec3c 100644
CWARNINGS =
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
index dac3832..43d8241 100644
index d9aa66b..1900e3c 100644
--- a/bin/pkcs11/Makefile.in
+++ b/bin/pkcs11/Makefile.in
@@ -20,13 +20,13 @@ top_srcdir = @top_srcdir@
@@ -12,13 +12,13 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
@ -272,10 +283,10 @@ index dac3832..43d8241 100644
DEPLIBS = ${ISCDEPLIBS}
diff --git a/configure.in b/configure.in
index a28f773..8f3b8f4 100644
index 0bde24d..6435274 100644
--- a/configure.in
+++ b/configure.in
@@ -982,12 +982,14 @@ AC_SUBST(USE_GSSAPI)
@@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI)
AC_SUBST(DST_GSSAPI_INC)
AC_SUBST(DNS_GSSAPI_LIBS)
DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
@ -290,24 +301,24 @@ index a28f773..8f3b8f4 100644
#
# was --with-randomdev specified?
@@ -1383,11 +1385,11 @@
@@ -1489,11 +1491,11 @@ fi
AC_MSG_CHECKING(for OpenSSL library)
OPENSSL_WARNING=
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
-if test "$want_native_pkcs11" = "yes"
-if test "yes" = "$want_native_pkcs11"
-then
- use_openssl="native_pkcs11"
- AC_MSG_RESULT(use of native PKCS11 instead)
-fi
+# if test "$want_native_pkcs11" = "yes"
+# if test "yes" = "$want_native_pkcs11"
+# then
+# use_openssl="native_pkcs11"
+# AC_MSG_RESULT(use of native PKCS11 instead)
+# fi
if test "$use_openssl" = "auto"
if test "auto" = "$use_openssl"
then
@@ -1395,6 +1397,7 @@ then
@@ -1506,6 +1508,7 @@ then
fi
done
fi
@ -315,7 +326,7 @@ index a28f773..8f3b8f4 100644
OPENSSL_ECDSA=""
OPENSSL_GOST=""
gosttype="raw"
@@ -1417,16 +1420,17 @@ case "$with_gost" in
@@ -1526,16 +1529,17 @@ case "$with_gost" in
;;
esac
@ -338,32 +349,32 @@ index a28f773..8f3b8f4 100644
no)
AC_MSG_RESULT(no)
DST_OPENSSL_INC=""
@@ -1448,11 +1452,11 @@ case "$use_openssl" in
@@ -1557,11 +1561,11 @@ case "$use_openssl" in
If you don't want OpenSSL, use --without-openssl])
;;
*)
- if test "$want_native_pkcs11" = "yes"
- if test "yes" = "$want_native_pkcs11"
- then
- AC_MSG_RESULT()
- AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
- fi
+# if test "$want_native_pkcs11" = "yes"
+# if test "yes" = "$want_native_pkcs11"
+# then
+# AC_MSG_RESULT()
+# AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
+# fi
if test "$use_openssl" = "yes"
if test "yes" = "$use_openssl"
then
# User did not specify a path - guess it
@@ -1776,6 +1780,7 @@ AC_SUBST(OPENSSL_ECDSA)
@@ -1917,6 +1921,7 @@ AC_SUBST(OPENSSL_ECDSA)
AC_SUBST(OPENSSL_GOST)
DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
+DNS_CRYPTO_PK11_LIBS="$DNS_CRYPTO_LIBS"
ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
if test "$with_aes" = "yes"
@@ -2047,6 +2052,7 @@ esac
if test "yes" = "$with_aes"
@@ -2212,6 +2217,7 @@ esac
AC_SUBST(PKCS11LINKOBJS)
AC_SUBST(PKCS11LINKSRCS)
AC_SUBST(CRYPTO)
@ -371,7 +382,7 @@ index a28f773..8f3b8f4 100644
AC_SUBST(PKCS11_ECDSA)
AC_SUBST(PKCS11_GOST)
AC_SUBST(PKCS11_TEST)
@@ -4466,8 +4472,11 @@ AC_CONFIG_FILES([
@@ -5114,8 +5120,11 @@ AC_CONFIG_FILES([
bin/delv/Makefile
bin/dig/Makefile
bin/dnssec/Makefile
@ -383,7 +394,7 @@ index a28f773..8f3b8f4 100644
bin/nsupdate/Makefile
bin/pkcs11/Makefile
bin/python/Makefile
@@ -4548,6 +4557,10 @@ AC_CONFIG_FILES([
@@ -5216,6 +5225,10 @@ AC_CONFIG_FILES([
lib/dns/include/dns/Makefile
lib/dns/include/dst/Makefile
lib/dns/tests/Makefile
@ -394,7 +405,7 @@ index a28f773..8f3b8f4 100644
lib/irs/Makefile
lib/irs/include/Makefile
lib/irs/include/irs/Makefile
@@ -4571,6 +4584,24 @@ AC_CONFIG_FILES([
@@ -5240,6 +5253,24 @@ AC_CONFIG_FILES([
lib/isc/unix/include/Makefile
lib/isc/unix/include/isc/Makefile
lib/isc/unix/include/pkcs11/Makefile
@ -420,10 +431,10 @@ index a28f773..8f3b8f4 100644
lib/isccc/include/Makefile
lib/isccc/include/isccc/Makefile
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 86302bd..318744f 100644
index 318450c..87cde21 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@
# Attempt to disable parallel processing.
.NOTPARALLEL:
.NO_PARALLEL:
@ -433,10 +444,10 @@ index 86302bd..318744f 100644
@BIND9_MAKE_RULES@
diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
index 5f1ce56..830c0d5 100644
index a22b721..a38960b 100644
--- a/lib/dns-pkcs11/Makefile.in
+++ b/lib/dns-pkcs11/Makefile.in
@@ -28,16 +28,16 @@ top_srcdir = @top_srcdir@
@@ -23,16 +23,16 @@ VERSION=@BIND9_VERSION@
USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
@ -458,7 +469,7 @@ index 5f1ce56..830c0d5 100644
LIBS = @LIBS@
@@ -134,7 +134,7 @@ version.@O@: version.c
@@ -136,30 +136,30 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@ -467,10 +478,6 @@ index 5f1ce56..830c0d5 100644
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
@@ -144,23 +144,23 @@ dynamic_db.@O@: dynamic_db.c
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
-libdns.la: ${OBJS}
+libdns-pkcs11.la: ${OBJS}
${LIBTOOL_MODE_LINK} \
@ -491,14 +498,18 @@ index 5f1ce56..830c0d5 100644
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns-pkcs11.@A@ ${DESTDIR}${libdir}
uninstall::
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns.@A@
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns-pkcs11.@A@
clean distclean::
- rm -f libdns.@A@ timestamp
+ rm -f libdns-pkcs11.@A@ timestamp
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
rm -f include/dns/rdatastruct.h
rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h
@@ -190,7 +190,7 @@ code.h: gen
./gen -s ${srcdir} > code.h
@@ -191,7 +191,7 @@ code.h: gen
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: gen.c
- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
@ -507,10 +518,10 @@ index 5f1ce56..830c0d5 100644
rbtdb64.@O@: rbtdb64.c rbtdb.c
diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
index e0b2038..0f919a9 100644
index e5c4db0..c7a623c 100644
--- a/lib/isc-pkcs11/Makefile.in
+++ b/lib/isc-pkcs11/Makefile.in
@@ -31,8 +31,8 @@ CINCLUDES = -I${srcdir}/unix/include \
@@ -20,8 +20,8 @@ CINCLUDES = -I${srcdir}/unix/include \
-I${srcdir}/@ISC_THREAD_DIR@/include \
-I${srcdir}/@ISC_ARCH_DIR@/include \
-I./include \
@ -521,7 +532,7 @@ index e0b2038..0f919a9 100644
CWARNINGS =
# Alphabetically
@@ -111,35 +111,35 @@ version.@O@: version.c
@@ -104,38 +104,38 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@ -562,16 +573,20 @@ index e0b2038..0f919a9 100644
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc-pkcs11.@A@ ${DESTDIR}${libdir}
uninstall::
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc-pkcs11.@A@
clean distclean::
- rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
- libisc-nosymtbl.la timestamp
+ rm -f libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ libisc-pkcs11.la \
+ libisc-pkcs11-nosymtbl.la timestamp
diff --git a/make/includes.in b/make/includes.in
index 1d5e776..877dd38 100644
index f41e3cd..b97534c 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -49,3 +49,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
@@ -40,3 +40,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
TEST_INCLUDES = \
-I${top_srcdir}/lib/tests/include

3463
bind-9.10-openssl-1.1.patch
View File

File diff suppressed because it is too large Load Diff

76
bind-9.10-sdb.patch
View File

@ -1,8 +1,8 @@
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 7654169..b4c9c03 100644
index 7d21984..015ff45 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -19,8 +19,8 @@ srcdir = @srcdir@
@@ -10,8 +10,8 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
@ -14,10 +14,10 @@ index 7654169..b4c9c03 100644
@BIND9_MAKE_RULES@
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
index ba5ec3c..d7ac259 100644
index 9c14b73..36e7916 100644
--- a/bin/named-sdb/Makefile.in
+++ b/bin/named-sdb/Makefile.in
@@ -34,10 +34,10 @@ top_srcdir = @top_srcdir@
@@ -23,10 +23,10 @@ VERSION=@BIND9_VERSION@
#
# Add database drivers here.
#
@ -31,7 +31,7 @@ index ba5ec3c..d7ac259 100644
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
@@ -83,7 +83,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
@@ -72,7 +72,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
SUBDIRS = unix
@ -40,7 +40,7 @@ index ba5ec3c..d7ac259 100644
GEOIPLINKOBJS = geoip.@O@
@@ -144,7 +144,7 @@ server.@O@: server.c
@@ -139,7 +139,7 @@ server.@O@: server.c
-DPRODUCT=\"${PRODUCT}\" \
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
@ -49,30 +49,37 @@ index ba5ec3c..d7ac259 100644
export MAKE_SYMTABLE="yes"; \
export BASEOBJS="${OBJS} ${UOBJS}"; \
${FINALBUILDCMD}
@@ -171,15 +171,9 @@ statschannel.@O@: bind9.xsl.h
@@ -166,22 +166,12 @@ statschannel.@O@: bind9.xsl.h
installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
-
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
- (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
- ${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
+
+install:: named-sdb@EXEEXT@ installdirs
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
uninstall::
- rm -f ${DESTDIR}${mandir}/man5/named.conf.5
- rm -f ${DESTDIR}${mandir}/man8/lwresd.8
- rm -f ${DESTDIR}${mandir}/man8/named.8
- rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
@DLZ_DRIVER_RULES@
diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
index 306295f..a7f3327 100644
index 00002a9..cb9b5f5 100644
--- a/bin/named-sdb/main.c
+++ b/bin/named-sdb/main.c
@@ -91,6 +91,10 @@
@@ -88,6 +88,10 @@
* Include header files for database drivers here.
*/
/* #include "xxdb.h" */
@ -83,7 +90,7 @@ index 306295f..a7f3327 100644
#ifdef CONTRIB_DLZ
/*
@@ -985,6 +989,11 @@ setup(void) {
@@ -1052,6 +1056,11 @@ setup(void) {
ns_main_earlyfatal("isc_app_start() failed: %s",
isc_result_totext(result));
@ -95,7 +102,7 @@ index 306295f..a7f3327 100644
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
ns_g_product, ns_g_version,
@@ -1099,6 +1108,75 @@ setup(void) {
@@ -1173,6 +1182,75 @@ setup(void) {
isc_result_totext(result));
#endif
@ -171,7 +178,7 @@ index 306295f..a7f3327 100644
ns_server_create(ns_g_mctx, &ns_g_server);
#ifdef HAVE_LIBSECCOMP
@@ -1138,6 +1216,11 @@ cleanup(void) {
@@ -1215,6 +1293,11 @@ cleanup(void) {
dns_name_destroy();
@ -184,10 +191,10 @@ index 306295f..a7f3327 100644
ISC_LOG_NOTICE, "exiting");
ns_log_shutdown();
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index ba5ec3c..2c88f46 100644
index 9c14b73..08318a2 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -49,9 +49,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
@@ -38,9 +38,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
@ -199,7 +206,7 @@ index ba5ec3c..2c88f46 100644
CWARNINGS =
@@ -75,11 +75,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
@@ -64,11 +64,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -213,7 +220,7 @@ index ba5ec3c..2c88f46 100644
SUBDIRS = unix
@@ -94,8 +94,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
@@ -83,8 +83,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
zoneconf.@O@ \
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@ -223,7 +230,7 @@ index ba5ec3c..2c88f46 100644
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
@@ -110,8 +109,7 @@ SRCS = builtin.c client.c config.c control.c \
@@ -99,8 +98,7 @@ SRCS = builtin.c client.c config.c control.c \
tkeyconf.c tsigconf.c update.c xfrout.c \
zoneconf.c \
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@ -233,16 +240,16 @@ index ba5ec3c..2c88f46 100644
MANPAGES = named.8 lwresd.8 named.conf.5
@@ -181,7 +179,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
@@ -183,7 +181,5 @@ uninstall::
rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
-@DLZ_DRIVER_RULES@
-
named-symtbl.@O@: named-symtbl.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
index 7f3c5e2..b1bca66 100644
index c7e0868..95ab742 100644
--- a/bin/sdb_tools/Makefile.in
+++ b/bin/sdb_tools/Makefile.in
@@ -32,11 +32,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
@ -277,10 +284,10 @@ index 7f3c5e2..b1bca66 100644
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff --git a/configure.in b/configure.in
index 6dab9dc..f84d161 100644
index 6435274..5e614a7 100644
--- a/configure.in
+++ b/configure.in
@@ -4686,30 +4686,33 @@ AC_CONFIG_FILES([
@@ -5125,6 +5125,8 @@ AC_CONFIG_FILES([
bin/named/unix/Makefile
bin/named-pkcs11/Makefile
bin/named-pkcs11/unix/Makefile
@ -289,24 +296,7 @@ index 6dab9dc..f84d161 100644
bin/nsupdate/Makefile
bin/pkcs11/Makefile
bin/python/Makefile
bin/python/isc/Makefile
bin/python/isc/utils.py
bin/python/isc/tests/Makefile
bin/python/dnssec-checkds.py
bin/python/dnssec-coverage.py
bin/python/dnssec-keymgr.py
bin/python/isc/__init__.py
bin/python/isc/checkds.py
bin/python/isc/coverage.py
bin/python/isc/dnskey.py
bin/python/isc/eventlist.py
bin/python/isc/keydict.py
bin/python/isc/keyevent.py
bin/python/isc/keymgr.py
bin/python/isc/keyseries.py
bin/python/isc/keyzone.py
bin/python/isc/policy.py
bin/python/isc/rndc.py
@@ -5149,6 +5151,7 @@ AC_CONFIG_FILES([
bin/python/isc/tests/dnskey_test.py
bin/python/isc/tests/policy_test.py
bin/rndc/Makefile

958
bind-9.11-docbook-xsl.patch
View File

@ -1,958 +0,0 @@
From 164076e873cf0c40fa622a489e6916ad7250e979 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 7 Dec 2016 10:49:55 +1100
Subject: [PATCH] 4527. [doc] Support DocBook XSL Stylesheets v1.79.1. [RT
#43831]
---
bin/check/named-checkconf.docbook | 2 +-
bin/check/named-checkzone.docbook | 2 +-
bin/confgen/ddns-confgen.docbook | 2 +-
bin/confgen/rndc-confgen.docbook | 2 +-
bin/delv/delv.docbook | 2 +-
bin/dig/dig.docbook | 2 +-
bin/dig/host.docbook | 2 +-
bin/dig/nslookup.docbook | 2 +-
bin/dnssec/dnssec-dsfromkey.docbook | 2 +-
bin/dnssec/dnssec-importkey.docbook | 2 +-
bin/dnssec/dnssec-keyfromlabel.docbook | 2 +-
bin/dnssec/dnssec-keygen.docbook | 2 +-
bin/dnssec/dnssec-revoke.docbook | 2 +-
bin/dnssec/dnssec-settime.docbook | 2 +-
bin/dnssec/dnssec-signzone.docbook | 2 +-
bin/dnssec/dnssec-verify.docbook | 2 +-
bin/named/lwresd.docbook | 2 +-
bin/named/named.conf.docbook | 2 +-
bin/named/named.docbook | 2 +-
bin/nsupdate/nsupdate.docbook | 2 +-
bin/pkcs11/pkcs11-destroy.docbook | 2 +-
bin/pkcs11/pkcs11-keygen.docbook | 2 +-
bin/pkcs11/pkcs11-list.docbook | 2 +-
bin/pkcs11/pkcs11-tokens.docbook | 2 +-
bin/python/dnssec-checkds.docbook | 2 +-
bin/python/dnssec-coverage.docbook | 2 +-
bin/python/dnssec-keymgr.docbook | 2 +-
bin/rndc/rndc.conf.docbook | 2 +-
bin/rndc/rndc.docbook | 2 +-
bin/tools/arpaname.docbook | 2 +-
bin/tools/dnstap-read.docbook | 2 +-
bin/tools/genrandom.docbook | 2 +-
bin/tools/isc-hmac-fixup.docbook | 2 +-
bin/tools/mdig.docbook | 2 +-
bin/tools/named-journalprint.docbook | 2 +-
bin/tools/named-rrchecker.docbook | 2 +-
bin/tools/nsec3hash.docbook | 2 +-
doc/arm/Bv9ARM-book.xml | 2 +-
doc/arm/catz.xml | 2 +-
doc/arm/dlz.xml | 2 +-
doc/arm/dnssec.xml | 2 +-
doc/arm/dyndb.xml | 2 +-
doc/arm/libdns.xml | 2 +-
doc/arm/logging-categories.xml | 2 +-
doc/arm/managed-keys.xml | 2 +-
doc/arm/notes-wrapper.xml | 2 +-
doc/arm/notes.xml | 2 +-
doc/arm/pkcs11.xml | 2 +-
doc/xsl/copyright.xsl | 6 +++---
isc-config.sh.docbook | 2 +-
lib/lwres/man/lwres.docbook | 2 +-
lib/lwres/man/lwres_buffer.docbook | 2 +-
lib/lwres/man/lwres_config.docbook | 2 +-
lib/lwres/man/lwres_context.docbook | 2 +-
lib/lwres/man/lwres_gabn.docbook | 2 +-
lib/lwres/man/lwres_gai_strerror.docbook | 2 +-
lib/lwres/man/lwres_getaddrinfo.docbook | 2 +-
lib/lwres/man/lwres_gethostent.docbook | 2 +-
lib/lwres/man/lwres_getipnode.docbook | 2 +-
lib/lwres/man/lwres_getnameinfo.docbook | 2 +-
lib/lwres/man/lwres_getrrsetbyname.docbook | 2 +-
lib/lwres/man/lwres_gnba.docbook | 2 +-
lib/lwres/man/lwres_hstrerror.docbook | 2 +-
lib/lwres/man/lwres_inetntop.docbook | 2 +-
lib/lwres/man/lwres_noop.docbook | 2 +-
lib/lwres/man/lwres_packet.docbook | 2 +-
lib/lwres/man/lwres_resutil.docbook | 2 +-
67 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 040071e..6f6a496 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-checkconf">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-checkconf">
<info>
<date>2014-01-10</date>
</info>
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index e7c5f60..e3ddbe4 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-checkzone">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-checkzone">
<info>
<date>2014-02-19</date>
</info>
diff --git a/bin/confgen/ddns-confgen.docbook b/bin/confgen/ddns-confgen.docbook
index 523936e..36fc909 100644
--- a/bin/confgen/ddns-confgen.docbook
+++ b/bin/confgen/ddns-confgen.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.ddns-confgen">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.ddns-confgen">
<info>
<date>2014-03-06</date>
</info>
diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index 84eb337..9da257b 100644
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc-confgen">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc-confgen">
<info>
<date>2013-03-14</date>
</info>
diff --git a/bin/delv/delv.docbook b/bin/delv/delv.docbook
index 9c12d33..0b70018 100644
--- a/bin/delv/delv.docbook
+++ b/bin/delv/delv.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.delv">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.delv">
<info>
<date>2014-04-23</date>
</info>
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 1e0047d..a36e716 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dig">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dig">
<info>
<date>2014-02-19</date>
</info>
diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index cdf9df7..3cc4981 100644
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.host">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.host">
<info>
<date>2009-01-20</date>
</info>
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index fea3c0a..c2a8668 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -35,7 +35,7 @@
- SUCH DAMAGE.
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nslookup">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nslookup">
<info>
<date>2014-01-24</date>
</info>
diff --git a/bin/dnssec/dnssec-dsfromkey.docbook b/bin/dnssec/dnssec-dsfromkey.docbook
index b722611..69bd7d7 100644
--- a/bin/dnssec/dnssec-dsfromkey.docbook
+++ b/bin/dnssec/dnssec-dsfromkey.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-dsfromkey">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-dsfromkey">
<info>
<date>2012-05-02</date>
</info>
diff --git a/bin/dnssec/dnssec-importkey.docbook b/bin/dnssec/dnssec-importkey.docbook
index d2457cf..ed579f7 100644
--- a/bin/dnssec/dnssec-importkey.docbook
+++ b/bin/dnssec/dnssec-importkey.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-importkey">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-importkey">
<info>
<date>2014-02-20</date>
</info>
diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index 6400466..aeaca1a 100644
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keyfromlabel">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keyfromlabel">
<info>
<date>2014-02-27</date>
</info>
diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index fd5fda6..f0b5665 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keygen">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keygen">
<info>
<date>2014-02-06</date>
</info>
diff --git a/bin/dnssec/dnssec-revoke.docbook b/bin/dnssec/dnssec-revoke.docbook
index 03b4c3e..a5aab1a 100644
--- a/bin/dnssec/dnssec-revoke.docbook
+++ b/bin/dnssec/dnssec-revoke.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-revoke">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-revoke">
<info>
<date>2014-01-15</date>
</info>
diff --git a/bin/dnssec/dnssec-settime.docbook b/bin/dnssec/dnssec-settime.docbook
index b586b41..72e978c 100644
--- a/bin/dnssec/dnssec-settime.docbook
+++ b/bin/dnssec/dnssec-settime.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-settime">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-settime">
<info>
<date>2015-08-21</date>
</info>
diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 761d343..029b2cd 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-signzone">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-signzone">
<info>
<date>2014-02-18</date>
</info>
diff --git a/bin/dnssec/dnssec-verify.docbook b/bin/dnssec/dnssec-verify.docbook
index 7982aa9..e1ed25f 100644
--- a/bin/dnssec/dnssec-verify.docbook
+++ b/bin/dnssec/dnssec-verify.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-verify">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-verify">
<info>
<date>2014-01-15</date>
</info>
diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 43e54d4..48dda31 100644
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.lwresd">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.lwresd">
<info>
<date>2009-01-20</date>
</info>
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 6731075..402179d 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
<info>
<date>2014-01-08</date>
</info>
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 2e4e2a5..79fe9f1 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named">
<info>
<date>2014-02-19</date>
</info>
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index aef1bab..2c839b2 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nsupdate">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nsupdate">
<info>
<date>2014-04-18</date>
</info>
diff --git a/bin/pkcs11/pkcs11-destroy.docbook b/bin/pkcs11/pkcs11-destroy.docbook
index c69c808..f66bc75 100644
--- a/bin/pkcs11/pkcs11-destroy.docbook
+++ b/bin/pkcs11/pkcs11-destroy.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-destroy">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-destroy">
<info>
<date>2014-01-15</date>
</info>
diff --git a/bin/pkcs11/pkcs11-keygen.docbook b/bin/pkcs11/pkcs11-keygen.docbook
index d7141cf..f4ff131 100644
--- a/bin/pkcs11/pkcs11-keygen.docbook
+++ b/bin/pkcs11/pkcs11-keygen.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-keygen">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-keygen">
<info>
<date>2014-01-15</date>
</info>
diff --git a/bin/pkcs11/pkcs11-list.docbook b/bin/pkcs11/pkcs11-list.docbook
index 3fa6b36..570ef1f 100644
--- a/bin/pkcs11/pkcs11-list.docbook
+++ b/bin/pkcs11/pkcs11-list.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-list">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-list">
<info>
<date>2009-10-05</date>
</info>
diff --git a/bin/pkcs11/pkcs11-tokens.docbook b/bin/pkcs11/pkcs11-tokens.docbook
index 7d13851..93f4bbb 100644
--- a/bin/pkcs11/pkcs11-tokens.docbook
+++ b/bin/pkcs11/pkcs11-tokens.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-tokens">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.pkcs11-tokens">
<info>
<date>2014-01-15</date>
</info>
diff --git a/bin/python/dnssec-checkds.docbook b/bin/python/dnssec-checkds.docbook
index 040d31a..cce5dc3 100644
--- a/bin/python/dnssec-checkds.docbook
+++ b/bin/python/dnssec-checkds.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-checkds">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-checkds">
<info>
<date>2013-01-01</date>
</info>
diff --git a/bin/python/dnssec-coverage.docbook b/bin/python/dnssec-coverage.docbook
index 8d0c350..7400d7e 100644
--- a/bin/python/dnssec-coverage.docbook
+++ b/bin/python/dnssec-coverage.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-coverage">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-coverage">
<info>
<date>2014-01-11</date>
</info>
diff --git a/bin/python/dnssec-keymgr.docbook b/bin/python/dnssec-keymgr.docbook
index 685b073..e072121 100644
--- a/bin/python/dnssec-keymgr.docbook
+++ b/bin/python/dnssec-keymgr.docbook
@@ -6,7 +6,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keymgr">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnssec-keymgr">
<info>
<date>2016-06-03</date>
</info>
diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index 0e51cb4..84284c7 100644
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc.conf">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc.conf">
<info>
<date>2013-03-14</date>
</info>
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index f719a22..f273519 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.rndc">
<info>
<date>2014-08-15</date>
</info>
diff --git a/bin/tools/arpaname.docbook b/bin/tools/arpaname.docbook
index f60291e..7310425 100644
--- a/bin/tools/arpaname.docbook
+++ b/bin/tools/arpaname.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.arpaname">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.arpaname">
<info>
<date>2009-03-03</date>
</info>
diff --git a/bin/tools/dnstap-read.docbook b/bin/tools/dnstap-read.docbook
index bbb43d9..3dfef70 100644
--- a/bin/tools/dnstap-read.docbook
+++ b/bin/tools/dnstap-read.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnstap-read">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.dnstap-read">
<info>
<date>2015-09-13</date>
</info>
diff --git a/bin/tools/genrandom.docbook b/bin/tools/genrandom.docbook
index 1f53df7..f106702 100644
--- a/bin/tools/genrandom.docbook
+++ b/bin/tools/genrandom.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.genrandom">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.genrandom">
<info>
<date>2011-08-08</date>
</info>
diff --git a/bin/tools/isc-hmac-fixup.docbook b/bin/tools/isc-hmac-fixup.docbook
index 79c2ed3..50fffaf 100644
--- a/bin/tools/isc-hmac-fixup.docbook
+++ b/bin/tools/isc-hmac-fixup.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.isc-hmac-fixup">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.isc-hmac-fixup">
<info>
<date>2013-04-28</date>
</info>
diff --git a/bin/tools/mdig.docbook b/bin/tools/mdig.docbook
index 46f3825..75f054b 100644
--- a/bin/tools/mdig.docbook
+++ b/bin/tools/mdig.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.mdig">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.mdig">
<info>
<date>2015-01-05</date>
</info>
diff --git a/bin/tools/named-journalprint.docbook b/bin/tools/named-journalprint.docbook
index 4b2121b..df82c64 100644
--- a/bin/tools/named-journalprint.docbook
+++ b/bin/tools/named-journalprint.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-journalprint">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-journalprint">
<info>
<date>2009-12-04</date>
</info>
diff --git a/bin/tools/named-rrchecker.docbook b/bin/tools/named-rrchecker.docbook
index 59185db..94ba015 100644
--- a/bin/tools/named-rrchecker.docbook
+++ b/bin/tools/named-rrchecker.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-rrchecker">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named-rrchecker">
<info>
<date>2013-11-12</date>
</info>
diff --git a/bin/tools/nsec3hash.docbook b/bin/tools/nsec3hash.docbook
index 7345e0d..ddc0342 100644
--- a/bin/tools/nsec3hash.docbook
+++ b/bin/tools/nsec3hash.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nsec3hash">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.nsec3hash">
<info>
<date>2009-03-02</date>
</info>
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 94c7af6..911bc2e 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<book xmlns="http://docbook.org/ns/docbook" version="5.0">
+<book xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<title>BIND 9 Administrator Reference Manual</title>
<copyright>
diff --git a/doc/arm/catz.xml b/doc/arm/catz.xml
index a0a8362..56bcfa4 100644
--- a/doc/arm/catz.xml
+++ b/doc/arm/catz.xml
@@ -6,7 +6,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="catz-info"><info><title>Catalog Zones</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="catz-info"><info><title>Catalog Zones</title></info>
<para>
A "catalog zone" is a special DNS zone that contains a list of
diff --git a/doc/arm/dlz.xml b/doc/arm/dlz.xml
index 0658dab..89a20f8 100644
--- a/doc/arm/dlz.xml
+++ b/doc/arm/dlz.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="dlz-info"><info><title>DLZ (Dynamically Loadable Zones)</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="dlz-info"><info><title>DLZ (Dynamically Loadable Zones)</title></info>
<para>
DLZ (Dynamically Loadable Zones) is an extension to BIND 9 that allows
diff --git a/doc/arm/dnssec.xml b/doc/arm/dnssec.xml
index 16ec45c..f8e14a3 100644
--- a/doc/arm/dnssec.xml
+++ b/doc/arm/dnssec.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="dnssec.dynamic.zones"><info><title>DNSSEC, Dynamic Zones, and Automatic Signing</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="dnssec.dynamic.zones"><info><title>DNSSEC, Dynamic Zones, and Automatic Signing</title></info>
<para>As of BIND 9.7.0 it is possible to change a dynamic zone
from insecure to signed and back again. A secure zone can use
diff --git a/doc/arm/dyndb.xml b/doc/arm/dyndb.xml
index 6a6ccbd..0d449f0 100644
--- a/doc/arm/dyndb.xml
+++ b/doc/arm/dyndb.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="dyndb-info"><info><title>DynDB (Dynamic Database)</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="dyndb-info"><info><title>DynDB (Dynamic Database)</title></info>
<para>
DynDB is an extension to BIND 9 which, like DLZ
diff --git a/doc/arm/libdns.xml b/doc/arm/libdns.xml
index eded111..fc940a6 100644
--- a/doc/arm/libdns.xml
+++ b/doc/arm/libdns.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="bind9.library"><info><title>BIND 9 DNS Library Support</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="bind9.library"><info><title>BIND 9 DNS Library Support</title></info>
<para>This version of BIND 9 "exports" its internal libraries so
that they can be used by third-party applications more easily (we
diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index 0e2c084..e0e635c 100644
--- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<informaltable xmlns="http://docbook.org/ns/docbook" version="5.0" colsep="0" rowsep="0">
+<informaltable xmlns:db="http://docbook.org/ns/docbook" version="5.0" colsep="0" rowsep="0">
<tgroup cols="2" colsep="0" rowsep="0" tgroupstyle="4Level-table">
<colspec colname="1" colnum="1" colsep="0" colwidth="1.150in"/>
<colspec colname="2" colnum="2" colsep="0" colwidth="3.350in"/>
diff --git a/doc/arm/managed-keys.xml b/doc/arm/managed-keys.xml
index 0be3338..342a72e 100644
--- a/doc/arm/managed-keys.xml
+++ b/doc/arm/managed-keys.xml
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="rfc5011.support"><info><title>Dynamic Trust Anchor Management</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="rfc5011.support"><info><title>Dynamic Trust Anchor Management</title></info>
<para>BIND 9.7.0 introduces support for RFC 5011, dynamic trust
anchor management. Using this feature allows
diff --git a/doc/arm/notes-wrapper.xml b/doc/arm/notes-wrapper.xml
index 2e1e505..95c545c 100644
--- a/doc/arm/notes-wrapper.xml
+++ b/doc/arm/notes-wrapper.xml
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<article xmlns="http://docbook.org/ns/docbook" version="5.0"><info><title/></info>
+<article xmlns:db="http://docbook.org/ns/docbook" version="5.0"><info><title/></info>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notes.xml"/>
</article>
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 165c01f..670ae6c 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -9,7 +9,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0"><info/>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0"><info/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="noteversion.xml"/>
<section xml:id="relnotes_intro"><info><title>Introduction</title></info>
<para>
diff --git a/doc/arm/pkcs11.xml b/doc/arm/pkcs11.xml
index 9e6a6b9..11a125a 100644
--- a/doc/arm/pkcs11.xml
+++ b/doc/arm/pkcs11.xml
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="pkcs11"><info><title>PKCS#11 (Cryptoki) support</title></info>
+<section xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="pkcs11"><info><title>PKCS#11 (Cryptoki) support</title></info>
<para>
PKCS#11 (Public Key Cryptography Standard #11) defines a
diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index c46d55f..991afa3 100644
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -39,13 +39,13 @@
<xsl:variable name="isc.copyright">
<xsl:call-template name="isc.copyright.format">
<xsl:with-param name="text">
- <xsl:for-each select="db:book/db:info/db:copyright | db:refentry/db:docinfo/db:copyright">
+ <xsl:for-each select="book/info/copyright | refentry/docinfo/copyright">
<xsl:text>Copyright (C) </xsl:text>
<xsl:call-template name="copyright.years">
- <xsl:with-param name="years" select="db:year"/>
+ <xsl:with-param name="years" select="year"/>
</xsl:call-template>
<xsl:text> </xsl:text>
- <xsl:value-of select="db:holder"/>
+ <xsl:value-of select="holder"/>
<xsl:value-of select="$isc.copyright.breakline"/>
<xsl:text>&#10;</xsl:text>
</xsl:for-each>
diff --git a/isc-config.sh.docbook b/isc-config.sh.docbook
index f13cd8c..6d1f478 100644
--- a/isc-config.sh.docbook
+++ b/isc-config.sh.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="man.isc-config.sh">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.isc-config.sh">
<info>
<date>2009-02-18</date>
</info>
diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index b409b85..3bb8f03 100644
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook
index f7c543a..ef8ff1f 100644
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook
index 1516af8..ffdb7dc 100644
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook
index 1754e4f..efb3a30 100644
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index 7bcbc2a..1727ae7 100644
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook
index b5d3c62..52d3e7d 100644
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook
index aad61f1..9a86c84 100644
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook
index 21ad2a1..9cc3065 100644
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook
index b0625ba..b290d9f 100644
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook
index a1e7f13..acc2608 100644
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook
index 5d5ee0d..aab909a 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook
index 8d9b0e8..e7011ce 100644
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook
index c1b9056..49e3c21 100644
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook
index ab3920e..7faa467 100644
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index 900e79c..a6b6f6f 100644
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -9,7 +9,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook
index 66c22c2..a7ec451 100644
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index 80c9bd2..a34cf91 100644
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -7,7 +7,7 @@
-->
<!-- Converted by db4-upgrade version 1.0 -->
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0">
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0">
<info>
<date>2007-06-18</date>
</info>
--
2.7.4

18
bind-95-rh452060.patch
View File

@ -1,10 +1,12 @@
diff -up bind-9.5.0-P2/bin/dig/dighost.c.rh452060 bind-9.5.0-P2/bin/dig/dighost.c
--- bind-9.5.0-P2/bin/dig/dighost.c.rh452060 2008-12-01 22:30:01.000000000 +0100
+++ bind-9.5.0-P2/bin/dig/dighost.c 2008-12-01 22:30:07.000000000 +0100
@@ -1280,6 +1280,12 @@ clear_query(dig_query_t *query) {
debug("clear_query(%p)", query);
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index f657c30..ff9a2d2 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1694,6 +1694,13 @@ clear_query(dig_query_t *query) {
if (query->timer != NULL)
isc_timer_detach(&query->timer);
+
+ if (query->waiting_senddone) {
+ debug("send_done not yet called");
+ query->pending_free = ISC_TRUE;
@ -14,7 +16,7 @@ diff -up bind-9.5.0-P2/bin/dig/dighost.c.rh452060 bind-9.5.0-P2/bin/dig/dighost.
lookup = query->lookup;
if (lookup->current_query == query)
@@ -1301,10 +1307,7 @@ clear_query(dig_query_t *query) {
@@ -1719,10 +1726,7 @@ clear_query(dig_query_t *query) {
isc_mempool_put(commctx, query->recvspace);
isc_buffer_invalidate(&query->recvbuf);
isc_buffer_invalidate(&query->lengthbuf);
@ -26,7 +28,7 @@ diff -up bind-9.5.0-P2/bin/dig/dighost.c.rh452060 bind-9.5.0-P2/bin/dig/dighost.
}
/*%
@@ -2175,9 +2178,9 @@ send_done(isc_task_t *_task, isc_event_t
@@ -2811,9 +2815,9 @@ send_done(isc_task_t *_task, isc_event_t *event) {
isc_event_free(&event);
if (query->pending_free)

44
bind-99-libidn.patch
View File

@ -1,8 +1,8 @@
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 5e9febc..b1861a5 100644
index bd219c5..f71685b 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -48,10 +48,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \
@@ -38,10 +38,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \
${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
LIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
@ -15,7 +15,7 @@ index 5e9febc..b1861a5 100644
SUBDIRS =
@@ -69,6 +69,8 @@ HTMLPAGES = dig.html host.html nslookup.html
@@ -59,6 +59,8 @@ HTMLPAGES = dig.html host.html nslookup.html
MANOBJS = ${MANPAGES} ${HTMLPAGES}
@ -25,10 +25,10 @@ index 5e9febc..b1861a5 100644
dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index c54d677..1079421 100644
index 7a7e8e4..b36047f 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1170,8 +1170,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
@@ -1251,8 +1251,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
<command>dig</command> appropriately converts character encoding of
domain name before sending a request to DNS server or displaying a
reply from the server.
@ -40,10 +40,10 @@ index c54d677..1079421 100644
<command>dig</command> runs.
</para>
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 3ca7cb9..f11884e 100644
index 1f8bcf2..f657c30 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -44,6 +44,11 @@
@@ -33,6 +33,11 @@
#include <idn/api.h>
#endif
@ -55,7 +55,7 @@ index 3ca7cb9..f11884e 100644
#include <dns/byaddr.h>
#ifdef DIG_SIGCHASE
#include <dns/callbacks.h>
@@ -168,6 +173,14 @@ static void idn_check_result(idn_result_t r, const char *msg);
@@ -158,6 +163,14 @@ static void idn_check_result(idn_result_t r, const char *msg);
int idnoptions = 0;
#endif
@ -70,7 +70,7 @@ index 3ca7cb9..f11884e 100644
isc_socket_t *keep = NULL;
isc_sockaddr_t keepaddr;
@@ -1404,8 +1417,15 @@ setup_system(void) {
@@ -1448,8 +1461,15 @@ setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only) {
#ifdef WITH_IDN
initialize_idn();
@ -87,7 +87,7 @@ index 3ca7cb9..f11884e 100644
if (keyfile[0] != 0)
setup_file_key();
else if (keysecret[0] != 0)
@@ -2191,12 +2211,14 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2231,8 +2251,11 @@ setup_lookup(dig_lookup_t *lookup) {
idn_result_t mr;
char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
#endif
@ -97,14 +97,10 @@ index 3ca7cb9..f11884e 100644
-#ifdef WITH_IDN
+#if defined (WITH_IDN) || defined (WITH_LIBIDN)
result = dns_name_settotextfilter(output_filter);
result = dns_name_settotextfilter(lookup->idnout ?
output_filter : NULL);
check_result(result, "dns_name_settotextfilter");
#endif
-
REQUIRE(lookup != NULL);
INSIST(!free_now);
@@ -2233,6 +2255,14 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2274,6 +2297,14 @@ setup_lookup(dig_lookup_t *lookup) {
mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
utf8_textname, sizeof(utf8_textname));
idn_check_result(mr, "convert textname to UTF-8");
@ -119,7 +115,7 @@ index 3ca7cb9..f11884e 100644
#endif
/*
@@ -2245,15 +2275,11 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2286,15 +2317,11 @@ setup_lookup(dig_lookup_t *lookup) {
if (lookup->new_search) {
#ifdef WITH_IDN
if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
@ -138,7 +134,7 @@ index 3ca7cb9..f11884e 100644
lookup->origin = NULL; /* Force abs lookup */
lookup->done_as_is = ISC_TRUE;
lookup->need_search = usesearch;
@@ -2261,7 +2287,6 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2302,7 +2329,6 @@ setup_lookup(dig_lookup_t *lookup) {
lookup->origin = ISC_LIST_HEAD(search_list);
lookup->need_search = ISC_FALSE;
}
@ -146,7 +142,7 @@ index 3ca7cb9..f11884e 100644
}
#ifdef WITH_IDN
@@ -2278,6 +2303,20 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2319,6 +2345,20 @@ setup_lookup(dig_lookup_t *lookup) {
IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
idn_textname, sizeof(idn_textname));
idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
@ -167,7 +163,7 @@ index 3ca7cb9..f11884e 100644
#else
if (lookup->origin != NULL) {
debug("trying origin %s", lookup->origin->origin);
@@ -2372,6 +2411,13 @@ setup_lookup(dig_lookup_t *lookup) {
@@ -2389,6 +2429,13 @@ setup_lookup(dig_lookup_t *lookup) {
result = dns_name_fromtext(lookup->name, &b,
dns_rootname, 0,
&lookup->namebuf);
@ -181,7 +177,7 @@ index 3ca7cb9..f11884e 100644
#else
len = (unsigned int) strlen(lookup->textname);
isc_buffer_init(&b, lookup->textname, len);
@@ -4227,7 +4273,7 @@ destroy_libs(void) {
@@ -4377,7 +4424,7 @@ destroy_libs(void) {
void * ptr;
dig_message_t *chase_msg;
#endif
@ -190,7 +186,7 @@ index 3ca7cb9..f11884e 100644
isc_result_t result;
#endif
@@ -4268,6 +4314,10 @@ destroy_libs(void) {
@@ -4418,6 +4465,10 @@ destroy_libs(void) {
result = dns_name_settotextfilter(NULL);
check_result(result, "dns_name_settotextfilter");
#endif
@ -201,7 +197,7 @@ index 3ca7cb9..f11884e 100644
dns_name_destroy();
if (commctx != NULL) {
@@ -4453,6 +4503,97 @@ idn_check_result(idn_result_t r, const char *msg) {
@@ -4603,6 +4654,97 @@ idn_check_result(idn_result_t r, const char *msg) {
}
}
#endif /* WITH_IDN */

4
bind.spec
View File

@ -79,8 +79,6 @@ Patch136:bind-9.10-dist-native-pkcs11.patch
# [ISC-Bugs #42525] non-portable use of strlcat in contrib/sdb/ldap/zone2ldap.c
# introduced by https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=fc9f0ac5778f78003a7acc957a23711811fec122
Patch137:bind-9.10-use-of-strlcat.patch
Patch138:bind-9.10-openssl-1.1.patch
Patch139:bind-9.11-docbook-xsl.patch
Patch140:bind-9.11-rh1410433.patch
Patch141:bind-9.11-rh1236087.patch
@ -320,8 +318,6 @@ This package provides a module which allows commands to be sent to rndc directly
%patch119 -p1 -b .rh693982
%patch130 -p1 -b .libdb
%patch131 -p1 -b .multlib-conflict
%patch138 -p1 -b .rh1390238
%patch139 -p1 -b .rh1397186
%patch140 -p1 -b .rh1410433
%patch141 -p1 -b .rh1236087

10
bind97-rh478718.patch
View File

@ -1,8 +1,8 @@
diff --git a/configure.in b/configure.in
index b79aab0..da67ad5 100644
index 97d9d15..999040d 100644
--- a/configure.in
+++ b/configure.in
@@ -3774,6 +3774,10 @@ if test "$use_atomic" = "yes"; then
@@ -4041,6 +4041,10 @@ if test "yes" = "$use_atomic"; then
AC_MSG_RESULT($arch)
fi
@ -10,14 +10,14 @@ index b79aab0..da67ad5 100644
+ AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
+fi
+
if test "$have_atomic" = "yes"; then
if test "yes" = "$have_atomic"; then
AC_MSG_CHECKING([compiler support for inline assembly code])
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 2c6e2a5..bf34499 100644
index 24b61db..28f49c8 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -285,7 +285,11 @@
@@ -286,7 +286,11 @@
* If the "xaddq" operation (64bit xadd) is available on this architecture,
* ISC_PLATFORM_HAVEXADDQ will be defined.
*/