Update to 9.10.1-P1 stable

Signed-off-by: Tomas Hozza <thozza@redhat.com>
2015-01-14 12:38:32 +01:00 · 2015-01-14 12:38:32 +01:00 · 4fa9972d29
commit 4fa9972d29
parent e001c1a066
15 changed files with 648 additions and 20628 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,3 +46,6 @@ bind-9.7.2b1.tar.gz
 /bind-9.9.5-P1.tar.gz
 /bind-9.9.6.tar.gz
 /bind-9.9.6-P1.tar.gz
 /bind-9.10.1b2.tar.gz
 /bind-9.10.1.tar.gz
 /bind-9.10.1-P1.tar.gz
--- a/bind-9.10-dist-native-pkcs11.patch
+++ b/bind-9.10-dist-native-pkcs11.patch
@ -1,18 +1,18 @@
 diff --git a/bin/Makefile.in b/bin/Makefile.in
-index 87ca5b2..187ec23 100644
+index e3aeffb..7654169 100644
 --- a/bin/Makefile.in
 +++ b/bin/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
-SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
+-SUBDIRS =	named rndc dig delv dnssec tools tests nsupdate \
-+SUBDIRS =	named named-pkcs11 rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
+SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \
 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
 TARGETS =
 diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
-index 4f1bf90..3da5277 100644
+index 4f1bf90..b8dc6fe 100644
 --- a/bin/dnssec-pkcs11/Makefile.in
 +++ b/bin/dnssec-pkcs11/Makefile.in
@@ -23,18 +23,18 @@ top_srcdir =	@top_srcdir@
@ -30,7 +30,7 @@ index 4f1bf90..3da5277 100644
 -DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 -ISCLIBS =	../../lib/isc/libisc.@A@
 -ISCNOSYMLIBS =	../../lib/isc/libisc-nosymtbl.@A@
-+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @DNS_CRYPTO_PK11_LIBS@
+DNSLIBS =	../../lib/dns-pkcs11/libdns-pkcs11.@A@ @DNS_CRYPTO_LIBS@
 +ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
 +ISCNOSYMLIBS =	../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@
@ -134,7 +134,7 @@ index 4f1bf90..e1132ea 100644
 CWARNINGS =
 diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
-index 10cbdec..c70af88 100644
+index 95e36c1..fb658e9 100644
 --- a/bin/named-pkcs11/Makefile.in
 +++ b/bin/named-pkcs11/Makefile.in
@@ -47,26 +47,26 @@ DLZDRIVER_INCLUDES =	@DLZ_DRIVER_INCLUDES@
@ -188,9 +188,9 @@ index 10cbdec..c70af88 100644
 -TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
 +TARGETS =	named-pkcs11@EXEEXT@
- OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+ GEOIPLINKOBJS = geoip.@O@
- 		controlconf.@O@ interfacemgr.@O@ \
+ 
-@@ -92,8 +92,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+@@ -94,8 +94,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@ \
@ -200,7 +200,7 @@ index 10cbdec..c70af88 100644
 UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
-@@ -106,8 +105,7 @@ SRCS =		builtin.c client.c config.c control.c \
+@@ -110,8 +109,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 \
@ -210,7 +210,7 @@ index 10cbdec..c70af88 100644
 MANPAGES =	named.8 lwresd.8 named.conf.5
-@@ -143,7 +141,7 @@ config.@O@: config.c bind.keys.h
+@@ -144,7 +142,7 @@ config.@O@: config.c
 		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
 		-c ${srcdir}/config.c
@ -219,7 +219,7 @@ index 10cbdec..c70af88 100644
 	export MAKE_SYMTABLE="yes"; \
 	export BASEOBJS="${OBJS} ${UOBJS}"; \
 	${FINALBUILDCMD}
-@@ -174,15 +172,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3.xsl.h
+@@ -171,15 +169,9 @@ statschannel.@O@: bind9.xsl.h
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -239,7 +239,7 @@ index 10cbdec..c70af88 100644
 @DLZ_DRIVER_RULES@
 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index 10cbdec..1be4e2f 100644
+index 95e36c1..ba5ec3c 100644
 --- a/bin/named/Makefile.in
 +++ b/bin/named/Makefile.in
@@ -51,7 +51,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
@ -252,7 +252,7 @@ index 10cbdec..1be4e2f 100644
 CWARNINGS =
 diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
-index 15d3fb5..32cc753 100644
+index dac3832..43d8241 100644
 --- a/bin/pkcs11/Makefile.in
 +++ b/bin/pkcs11/Makefile.in
@@ -20,13 +20,13 @@ top_srcdir =	@top_srcdir@
@ -264,8 +264,8 @@ index 15d3fb5..32cc753 100644
 CDEFINES =
-ISCLIBS =	../../lib/isc/libisc.@A@
+-ISCLIBS =	../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
+ISCLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@ @ISC_OPENSSL_LIBS@
 -ISCDEPLIBS =	../../lib/isc/libisc.@A@
 +ISCDEPLIBS =	../../lib/isc-pkcs11/libisc-pkcs11.@A@
@ -273,34 +273,74 @@ index 15d3fb5..32cc753 100644
 DEPLIBS =	${ISCDEPLIBS}
 diff --git a/configure.in b/configure.in
-index 4ab50d8..917b98b 100644
+index a28f773..8f3b8f4 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -671,10 +671,10 @@ AC_ARG_WITH(pkcs11,
+@@ -982,12 +982,14 @@ AC_SUBST(USE_GSSAPI)
 AC_SUBST(DST_GSSAPI_INC)
 AC_SUBST(DNS_GSSAPI_LIBS)
 DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
 +DNS_CRYPTO_PK11_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_PK11_LIBS"
 #
 # Applications linking with libdns also need to link with these libraries.
 #
 AC_SUBST(DNS_CRYPTO_LIBS)
 +AC_SUBST(DNS_CRYPTO_PK11_LIBS)
 #
 # was --with-randomdev specified?
@@ -1383,10 +1385,10 @@ OPENSSL_WARNING=
 openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
 if test "$use_openssl" = "auto"
 then
-    if test "$want_native_pkcs11" = "yes"
+-	if test "$want_native_pkcs11" = "yes"
-    then
+-	then
-        use_openssl="native_pkcs11"
+-		use_openssl="native_pkcs11"
-    else
+-	else
-+#    if test "$want_native_pkcs11" = "yes"
+#	if test "$want_native_pkcs11" = "yes"
-+#    then
+#	then
-+#        use_openssl="native_pkcs11"
+#		use_openssl="native_pkcs11"
-+#    else
+#	else
- 	    for d in $openssldirs
+ 		for d in $openssldirs
-     	do
+ 		do
- 	    	if test -f $d/include/openssl/opensslv.h
+ 			if test -f $d/include/openssl/opensslv.h
-@@ -683,7 +683,7 @@ then
+@@ -1395,8 +1397,9 @@ then
-     			break
+ 				break
- 		    fi
+ 			fi
-     	done
+ 		done
-    fi
+-	fi
-+#    fi
+#	fi
 fi
 +CRYPTO_PK11=""
 OPENSSL_ECDSA=""
 OPENSSL_GOST=""
-@@ -742,11 +742,11 @@ case "$use_openssl" in
+ gosttype="raw"
@@ -1417,16 +1420,17 @@ case "$with_gost" in
 		;;
 esac
 -case "$use_openssl" in
 -	native_pkcs11)
 -		AC_MSG_RESULT(disabled because of native PKCS11)
 +if test "$want_native_pkcs11" = "yes"
 +then
 		DST_OPENSSL_INC=""
 -		CRYPTO="-DPKCS11CRYPTO"
 +		CRYPTO_PK11="-DPKCS11CRYPTO"
 		OPENSSLGOSTLINKOBJS=""
 		OPENSSLGOSTLINKSRS=""
 		OPENSSLLINKOBJS=""
 		OPENSSLLINKSRCS=""
 -		;;
 +fi
 +
 +case "$use_openssl" in
 	no)
 		AC_MSG_RESULT(no)
 		DST_OPENSSL_INC=""
@@ -1448,11 +1452,11 @@ case "$use_openssl" in
 If you don't want OpenSSL, use --without-openssl])
 		;;
 	*)
@ -317,33 +357,15 @@ index 4ab50d8..917b98b 100644
 		if test "$use_openssl" = "yes"
 		then
 			# User did not specify a path - guess it
-@@ -1026,6 +1026,7 @@ AC_SUBST(OPENSSL_ECDSA)
+@@ -1776,6 +1780,7 @@ AC_SUBST(OPENSSL_ECDSA)
 AC_SUBST(OPENSSL_GOST)
- DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
+ DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
 +DNS_CRYPTO_PK11_LIBS="$DNS_CRYPTO_LIBS"
- #
+ ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
- # Use OpenSSL for hash functions
+ if test "$with_aes" = "yes"
-@@ -1209,7 +1210,7 @@ case "$use_pkcs11" in
+@@ -2047,6 +2052,7 @@ esac
 esac
 AC_SUBST(PKCS11_PROVIDER)
 -
 +CRYPTO_PK11=""
 PKCS11_ECDSA=""
 PKCS11_GOST=""
 AC_MSG_CHECKING(for native PKCS11)
@@ -1217,7 +1218,7 @@ AC_MSG_CHECKING(for native PKCS11)
 case "$want_native_pkcs11" in
 	yes)
 		AC_MSG_RESULT(using native PKCS11 crypto)
 -		CRYPTO="-DPKCS11CRYPTO"
 +		CRYPTO_PK11="-DPKCS11CRYPTO"
 		PKCS11LINKOBJS='${PKCS11LINKOBJS}'
 		PKCS11LINKSRCS='${PKCS11LINKSRCS}'
                 PKCS11_TEST=pkcs11
@@ -1254,6 +1255,7 @@ esac
 AC_SUBST(PKCS11LINKOBJS)
 AC_SUBST(PKCS11LINKSRCS)
 AC_SUBST(CRYPTO)
@ -351,33 +373,19 @@ index 4ab50d8..917b98b 100644
 AC_SUBST(PKCS11_ECDSA)
 AC_SUBST(PKCS11_GOST)
 AC_SUBST(PKCS11_TEST)
-@@ -1465,12 +1467,13 @@ AC_SUBST(USE_GSSAPI)
+@@ -4466,8 +4472,11 @@ AC_CONFIG_FILES([
- AC_SUBST(DST_GSSAPI_INC)
+ 	bin/delv/Makefile
 AC_SUBST(DNS_GSSAPI_LIBS)
 DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS"
 -
 +DNS_CRYPTO_PK11_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_PK11_LIBS"
 #
 # Applications linking with libdns also need to link with these libraries.
 #
 AC_SUBST(DNS_CRYPTO_LIBS)
 +AC_SUBST(DNS_CRYPTO_PK11_LIBS)
 #
 # was --with-randomdev specified?
@@ -4010,7 +4013,10 @@ AC_CONFIG_FILES([
 	bin/confgen/unix/Makefile
 	bin/dig/Makefile
 	bin/dnssec/Makefile
 +	bin/dnssec-pkcs11/Makefile	
 	bin/named/Makefile
 	bin/named/unix/Makefile
 +	bin/named-pkcs11/Makefile
 +	bin/named-pkcs11/unix/Makefile
 	bin/named/unix/Makefile
 	bin/nsupdate/Makefile
 	bin/pkcs11/Makefile
-@@ -4088,11 +4094,19 @@ AC_CONFIG_FILES([
+ 	bin/python/Makefile
@@ -4548,6 +4557,10 @@ AC_CONFIG_FILES([
 	lib/dns/include/dns/Makefile
 	lib/dns/include/dst/Makefile
 	lib/dns/tests/Makefile
@ -385,36 +393,10 @@ index 4ab50d8..917b98b 100644
 +	lib/dns-pkcs11/include/Makefile
 +	lib/dns-pkcs11/include/dns/Makefile
 +	lib/dns-pkcs11/include/dst/Makefile
- 	lib/export/Makefile
+ 	lib/irs/Makefile
- 	lib/export/dns/Makefile
+ 	lib/irs/include/Makefile
- 	lib/export/dns/include/Makefile
+ 	lib/irs/include/irs/Makefile
- 	lib/export/dns/include/dns/Makefile
+@@ -4571,6 +4584,24 @@ AC_CONFIG_FILES([
 	lib/export/dns/include/dst/Makefile
 +	lib/export/dns-pkcs11/Makefile
 +	lib/export/dns-pkcs11/include/Makefile
 +	lib/export/dns-pkcs11/include/dns/Makefile
 +	lib/export/dns-pkcs11/include/dst/Makefile
 	lib/export/irs/Makefile
 	lib/export/irs/include/Makefile
 	lib/export/irs/include/irs/Makefile
@@ -4106,6 +4120,16 @@ AC_CONFIG_FILES([
 	lib/export/isc/unix/Makefile
 	lib/export/isc/unix/include/Makefile
 	lib/export/isc/unix/include/isc/Makefile
 +	lib/export/isc-pkcs11/$thread_dir/Makefile
 +	lib/export/isc-pkcs11/$thread_dir/include/Makefile
 +	lib/export/isc-pkcs11/$thread_dir/include/isc/Makefile
 +	lib/export/isc-pkcs11/Makefile
 +	lib/export/isc-pkcs11/include/Makefile
 +	lib/export/isc-pkcs11/include/isc/Makefile
 +	lib/export/isc-pkcs11/nls/Makefile
 +	lib/export/isc-pkcs11/unix/Makefile
 +	lib/export/isc-pkcs11/unix/include/Makefile
 +	lib/export/isc-pkcs11/unix/include/isc/Makefile
 	lib/export/isccfg/Makefile
 	lib/export/isccfg/include/Makefile
 	lib/export/isccfg/include/isccfg/Makefile
@@ -4134,6 +4158,24 @@ AC_CONFIG_FILES([
 	lib/isc/unix/include/Makefile
 	lib/isc/unix/include/isc/Makefile
 	lib/isc/unix/include/pkcs11/Makefile
@ -440,29 +422,30 @@ index 4ab50d8..917b98b 100644
 	lib/isccc/include/Makefile
 	lib/isccc/include/isccc/Makefile
 diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 8dc1d38..8e48d5e 100644
+index 86302bd..318744f 100644
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres irs tests samples
-+SUBDIRS =	isc isccc dns isccfg bind9 lwres tests isc-pkcs11 dns-pkcs11
+SUBDIRS =	isc isc-pkcs11 isccc dns dns-pkcs11 isccfg bind9 lwres irs tests samples
 TARGETS =
 @BIND9_MAKE_RULES@
 diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in
-index 4204121..d26b84e 100644
+index 5f1ce56..830c0d5 100644
 --- a/lib/dns-pkcs11/Makefile.in
 +++ b/lib/dns-pkcs11/Makefile.in
-@@ -27,16 +27,16 @@ top_srcdir =	@top_srcdir@
+@@ -28,16 +28,16 @@ top_srcdir =	@top_srcdir@
 USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
-CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
+-CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
-+CINCLUDES =	-I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} \
+-		${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
- 		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+CINCLUDES =	-I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} \
 +		${ISC_PKCS11_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 -CDEFINES =	-DUSE_MD5 @CRYPTO@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 +CDEFINES =	-DUSE_MD5 @CRYPTO_PK11@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
@ -477,15 +460,19 @@ index 4204121..d26b84e 100644
 LIBS =		@LIBS@
-@@ -132,27 +132,27 @@ dynamic_db.@O@: dynamic_db.c
+@@ -134,7 +134,7 @@ version.@O@: version.c
- 	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
+ 		-DLIBAGE=${LIBAGE} \
- 	-c ${srcdir}/dynamic_db.c
+ 		-c ${srcdir}/version.c
 -libdns.@SA@: ${OBJS}
 +libdns-pkcs11.@SA@: ${OBJS}
 	${AR} ${ARFLAGS} $@ ${OBJS}
 	${RANLIB} $@
@@ -144,23 +144,23 @@ dynamic_db.@O@: dynamic_db.c
 	-c ${srcdir}/dynamic_db.c
 -libdns.la: ${OBJS}
 +libdns-pkcs11.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
@ -512,7 +499,7 @@ index 4204121..d26b84e 100644
 	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
 	rm -f include/dns/rdatastruct.h
-@@ -182,7 +182,7 @@ code.h:	gen
+@@ -190,7 +190,7 @@ code.h:	gen
 	./gen -s ${srcdir} > code.h
 gen: gen.c
@ -520,152 +507,9 @@ index 4204121..d26b84e 100644
 +	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc-pkcs11/include \
 	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
- rbtdb64.@O@: rbtdb.c
+ rbtdb64.@O@: rbtdb64.c rbtdb.c
 diff --git a/lib/export/Makefile.in b/lib/export/Makefile.in
 index 1fd7216..a8a1342 100644
 --- a/lib/export/Makefile.in
 +++ b/lib/export/Makefile.in
@@ -21,7 +21,7 @@ top_srcdir =	@top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
 -SUBDIRS =	isc dns isccfg irs samples
 +SUBDIRS =	isc dns isccfg irs samples isc-pkcs11 dns-pkcs11
 TARGETS =
 @BIND9_MAKE_RULES@
 diff --git a/lib/export/dns-pkcs11/Makefile.in b/lib/export/dns-pkcs11/Makefile.in
 index e10bf59..669509f 100644
 --- a/lib/export/dns-pkcs11/Makefile.in
 +++ b/lib/export/dns-pkcs11/Makefile.in
@@ -15,7 +15,7 @@
 # $Id$
 top_srcdir =	@top_srcdir@
 -srcdir =	@top_srcdir@/lib/dns
 +srcdir =	@top_srcdir@/lib/dns-pkcs11
 export_srcdir =	@top_srcdir@/lib/export
 # Attempt to disable parallel processing.
@@ -28,16 +28,16 @@ export_srcdir =	@top_srcdir@/lib/export
 @BIND9_MAKE_INCLUDES@
 -CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} -I${export_srcdir}/isc/include \
 -		${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 +CINCLUDES =	-I. -I${top_srcdir}/lib/dns-pkcs11 -Iinclude ${DNS_PKCS11_INCLUDES} -I${export_srcdir}/isc-pkcs11/include \
 +		${ISC_PKCS11_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 -CDEFINES =	-DUSE_MD5 @CRYPTO@ @USE_GSSAPI@
 +CDEFINES =	-DUSE_MD5 @CRYPTO_PK11@ @USE_GSSAPI@
 CWARNINGS =
 -ISCLIBS =	../isc/libisc-export.@A@
 +ISCLIBS =	../isc-pkcs11/libisc-pkcs11-export.@A@
 -ISCDEPLIBS =	../isc/libisc-export.@A@
 +ISCDEPLIBS =	../isc-pkcs11/libisc-pkcs11-export.@A@
 LIBS =		@LIBS@
@@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c
 		-DLIBAGE=${LIBAGE} \
 		-c ${srcdir}/version.c
 -libdns-export.@SA@: ${OBJS}
 +libdns-pkcs11-export.@SA@: ${OBJS}
 	${AR} ${ARFLAGS} $@ ${OBJS}
 	${RANLIB} $@
 -libdns-export.la: ${OBJS}
 +libdns-pkcs11-export.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 -		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \
 +		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-pkcs11-export.la \
 		-rpath ${export_libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 -		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
 +		${OBJS} ${ISCLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS}
 -timestamp: libdns-export.@A@
 +timestamp: libdns-pkcs11-export.@A@
 	touch timestamp
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
 install:: timestamp installdirs
 -	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-pkcs11-export.@A@ \
 	${DESTDIR}${export_libdir}/
 clean distclean::
 -	rm -f libdns-export.@A@ timestamp
 +	rm -f libdns-pkcs11-export.@A@ timestamp
 	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
 	rm -f include/dns/rdatastruct.h
 diff --git a/lib/export/isc-pkcs11/Makefile.in b/lib/export/isc-pkcs11/Makefile.in
 index 70f2a77..25bfd4d 100644
 --- a/lib/export/isc-pkcs11/Makefile.in
 +++ b/lib/export/isc-pkcs11/Makefile.in
@@ -15,7 +15,7 @@
 # $Id: Makefile.in,v 1.8 2010/06/09 23:50:58 tbox Exp $
 top_srcdir =	@top_srcdir@
 -srcdir =	@top_srcdir@/lib/isc
 +srcdir =	@top_srcdir@/lib/isc-pkcs11
 export_srcdir =	@top_srcdir@/lib/export
 @BIND9_VERSION@
@@ -25,9 +25,9 @@ export_srcdir =	@top_srcdir@/lib/export
 CINCLUDES =	-I${srcdir}/unix/include \
 		-I${srcdir}/@ISC_THREAD_DIR@/include \
 		-I${srcdir}/@ISC_ARCH_DIR@/include \
 -		-I${export_srcdir}/isc/include -I${srcdir}/include \
 +		-I${export_srcdir}/isc-pkcs11/include -I${srcdir}/include \
 		@ISC_OPENSSL_INC@
 -CDEFINES =	@CRYPTO@ -DUSE_APPIMPREGISTER -DUSE_MEMIMPREGISTER \
 +CDEFINES =	@CRYPTO_PK11@ -DUSE_APPIMPREGISTER -DUSE_MEMIMPREGISTER \
 		-DUSE_SOCKETIMPREGISTER -DUSE_TASKIMPREGISTER \
 		-DUSE_TIMERIMPREGISTER
 CWARNINGS =
@@ -121,26 +121,26 @@ version.@O@: ${srcdir}/version.c
 		-DLIBAGE=${LIBAGE} \
 		-c ${srcdir}/version.c
 -libisc-export.@SA@: ${OBJS}
 +libisc-pkcs11-export.@SA@: ${OBJS}
 	${AR} ${ARFLAGS} $@ ${OBJS}
 	${RANLIB} $@
 -libisc-export.la: ${OBJS}
 +libisc-pkcs11-export.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 -		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \
 +		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-pkcs11-export.la \
 		-rpath ${export_libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} ${LIBS}
 -timestamp: libisc-export.@A@
 +timestamp: libisc-pkcs11-export.@A@
 	touch timestamp
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
 install:: timestamp installdirs
 -	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-pkcs11-export.@A@ \
 	${DESTDIR}${export_libdir}
 clean distclean::
 -	rm -f libisc-export.@A@ libisc-export.la timestamp
 +	rm -f libisc-pkcs11-export.@A@ libisc-pkcs11-export.la timestamp
 diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
-index 0fbedc3..de2977d 100644
+index e0b2038..0f919a9 100644
 --- a/lib/isc-pkcs11/Makefile.in
 +++ b/lib/isc-pkcs11/Makefile.in
@@ -31,8 +31,8 @@ CINCLUDES =	-I${srcdir}/unix/include \
@ -726,10 +570,10 @@ index 0fbedc3..de2977d 100644
 +	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 f2f1b3f..639477c 100644
+index 1d5e776..877dd38 100644
 --- a/make/includes.in
 +++ b/make/includes.in
-@@ -46,3 +46,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
+@@ -49,3 +49,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
 TEST_INCLUDES = \
 	-I${top_srcdir}/lib/tests/include
--- a/bind-9.10-dyndb.patch
+++ b/bind-9.10-dyndb.patch
@ -1,7 +1,29 @@
-diff -up bind-9.9.5rc2/bin/named/main.c.dyndb bind-9.9.5rc2/bin/named/main.c
+From 9b40e9166ee28f2d00424248fe303045e42b1c93 Mon Sep 17 00:00:00 2001
--- bind-9.9.5rc2/bin/named/main.c.dyndb	2014-01-17 04:27:12.000000000 +0100
+From: Tomas Hozza <thozza@redhat.com>
-+++ bind-9.9.5rc2/bin/named/main.c	2014-01-24 10:45:59.047572064 +0100
+Date: Tue, 29 Jul 2014 15:16:10 +0200
-@@ -45,6 +45,7 @@
+Subject: [PATCH] Dynamic DB database for BIND 9.10
 Signed-off-by: Tomas Hozza <thozza@redhat.com>
 ---
 bin/named/main.c                 |   1 +
 bin/named/server.c               | 100 +++++++++++
 lib/dns/Makefile.in              |  10 +-
 lib/dns/dynamic_db.c             | 367 +++++++++++++++++++++++++++++++++++++++
 lib/dns/include/dns/Makefile.in  |   2 +-
 lib/dns/include/dns/dynamic_db.h |  51 ++++++
 lib/dns/include/dns/log.h        |   1 +
 lib/dns/include/dns/types.h      |   1 +
 lib/dns/log.c                    |   1 +
 lib/isccfg/namedconf.c           |  36 ++++
 10 files changed, 567 insertions(+), 3 deletions(-)
 create mode 100644 lib/dns/dynamic_db.c
 create mode 100644 lib/dns/include/dns/dynamic_db.h
 diff --git a/bin/named/main.c b/bin/named/main.c
 index 8ee9bd8..8f7c7ee 100644
 --- a/bin/named/main.c
 +++ b/bin/named/main.c
@@ -43,6 +43,7 @@
 #include <isccc/result.h>
 #include <dns/dispatch.h>
@ -9,10 +31,11 @@ diff -up bind-9.9.5rc2/bin/named/main.c.dyndb bind-9.9.5rc2/bin/named/main.c
 #include <dns/name.h>
 #include <dns/result.h>
 #include <dns/view.h>
-diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
+diff --git a/bin/named/server.c b/bin/named/server.c
--- bind-9.9.5rc2/bin/named/server.c.dyndb	2014-01-17 04:27:12.000000000 +0100
+index 789ca8a..8e05650 100644
-+++ bind-9.9.5rc2/bin/named/server.c	2014-01-24 10:45:59.048572063 +0100
+--- a/bin/named/server.c
-@@ -63,6 +63,7 @@
+++ b/bin/named/server.c
@@ -70,6 +70,7 @@
 #include <dns/db.h>
 #include <dns/dispatch.h>
 #include <dns/dlz.h>
@ -20,10 +43,10 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 #include <dns/dns64.h>
 #include <dns/forward.h>
 #include <dns/journal.h>
-@@ -1249,6 +1250,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+@@ -1294,6 +1295,70 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
 	return (result);
 }
 static isc_result_t
 +configure_dynamic_db(const cfg_obj_t *dynamic_db, isc_mem_t *mctx,
 +		     const dns_dyndb_arguments_t *dyndb_args)
 +{
@ -88,12 +111,10 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 +	return result;
 +}
 +
-+
+ static isc_result_t
 +static isc_result_t
 disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
 	isc_result_t result;
- 	const cfg_obj_t *algorithms;
+@@ -2314,6 +2379,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
@@ -2071,6 +2138,7 @@ configure_view(dns_view_t *view, cfg_obj
 	const cfg_obj_t *dlz;
 	unsigned int dlzargc;
 	char **dlzargv;
@ -101,16 +122,7 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 	const cfg_obj_t *disabled;
 	const cfg_obj_t *obj;
 	const cfg_listelt_t *element;
-@@ -2355,6 +2423,8 @@ configure_view(dns_view_t *view, cfg_obj
+@@ -3599,6 +3665,37 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 		}
 	}
 +
 +
 	/*
 	 * Obtain configuration parameters that affect the decision of whether
 	 * we can reuse/share an existing cache.
@@ -3264,6 +3334,37 @@ configure_view(dns_view_t *view, cfg_obj
 		dns_view_setrootdelonly(view, ISC_FALSE);
 	/*
@ -148,7 +160,7 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 	 * Setup automatic empty zones.  If recursion is off then
 	 * they are disabled by default.
 	 */
-@@ -4917,6 +5018,7 @@ load_configuration(const char *filename,
+@@ -5365,6 +5462,7 @@ load_configuration(const char *filename, ns_server_t *server,
 		cfg_aclconfctx_detach(&ns_g_aclconfctx);
 	CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
@ -156,7 +168,7 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 	/*
 	 * Parse the global default pseudo-config file.
 	 */
-@@ -6046,6 +6148,8 @@ shutdown_server(isc_task_t *task, isc_ev
+@@ -6571,6 +6669,8 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {
 			dns_view_detach(&view);
 	}
@ -165,10 +177,47 @@ diff -up bind-9.9.5rc2/bin/named/server.c.dyndb bind-9.9.5rc2/bin/named/server.c
 	while ((nsc = ISC_LIST_HEAD(server->cachelist)) != NULL) {
 		ISC_LIST_UNLINK(server->cachelist, nsc, link);
 		dns_cache_detach(&nsc->cache);
-diff -up bind-9.9.5rc2/lib/dns/dynamic_db.c.dyndb bind-9.9.5rc2/lib/dns/dynamic_db.c
+diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
--- bind-9.9.5rc2/lib/dns/dynamic_db.c.dyndb	2014-01-24 10:45:59.049572063 +0100
+index 046abdb..8b62873 100644
-+++ bind-9.9.5rc2/lib/dns/dynamic_db.c	2014-01-24 10:45:59.049572063 +0100
+--- a/lib/dns/Makefile.in
-@@ -0,0 +1,366 @@
+++ b/lib/dns/Makefile.in
@@ -65,7 +65,7 @@ GEOIPLINKOBJS = geoip.@O@
 DNSOBJS =	acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
 		cache.@O@ callbacks.@O@ clientinfo.@O@ compress.@O@ \
 		db.@O@ dbiterator.@O@ dbtable.@O@ diff.@O@ dispatch.@O@ \
 -		dlz.@O@ dns64.@O@ dnssec.@O@ ds.@O@ forward.@O@ \
 +		dlz.@O@ dns64.@O@ dnssec.@O@ ds.@O@ dynamic_db.@O@ forward.@O@ \
 		iptable.@O@ journal.@O@ keydata.@O@ keytable.@O@ \
 		lib.@O@ log.@O@ lookup.@O@ \
 		master.@O@ masterdump.@O@ message.@O@ \
@@ -103,7 +103,7 @@ GEOIOLINKSRCS = geoip.c
 DNSSRCS =	acache.c acl.c adb.c byaddr.c \
 		cache.c callbacks.c clientinfo.c compress.c \
 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
 -		dlz.c dns64.c dnssec.c ds.c forward.c geoip.c \
 +		dlz.c dns64.c dnssec.c ds.c dynamic_db.c forward.c geoip.c \
 		iptable.c journal.c keydata.c keytable.c lib.c log.c \
 		lookup.c master.c masterdump.c message.c \
 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
@@ -142,6 +142,12 @@ libdns.@SA@: ${OBJS}
 	${AR} ${ARFLAGS} $@ ${OBJS}
 	${RANLIB} $@
 +dynamic_db.@O@: dynamic_db.c
 +	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
 +	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
 +	-c ${srcdir}/dynamic_db.c
 +
 +
 libdns.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
 diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
 new file mode 100644
 index 0000000..e32a3c8
 --- /dev/null
 +++ b/lib/dns/dynamic_db.c
@@ -0,0 +1,367 @@
 +/*
 + * Copyright (C) 2008-2011  Red Hat, Inc.
 + *
@ -535,10 +584,26 @@ diff -up bind-9.9.5rc2/lib/dns/dynamic_db.c.dyndb bind-9.9.5rc2/lib/dns/dynamic_
 +
 +	return args->timermgr;
 +}
-diff -up bind-9.9.5rc2/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.9.5rc2/lib/dns/include/dns/dynamic_db.h
+
--- bind-9.9.5rc2/lib/dns/include/dns/dynamic_db.h.dyndb	2014-01-24 10:45:59.049572063 +0100
+diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
-+++ bind-9.9.5rc2/lib/dns/include/dns/dynamic_db.h	2014-01-24 10:45:59.049572063 +0100
+index 667db71..0661291 100644
-@@ -0,0 +1,50 @@
+--- a/lib/dns/include/dns/Makefile.in
 +++ b/lib/dns/include/dns/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
 HEADERS =	acache.h acl.h adb.h bit.h byaddr.h cache.h callbacks.h cert.h \
 		client.h clientinfo.h compress.h \
 -		db.h dbiterator.h dbtable.h diff.h dispatch.h \
 +		db.h dbiterator.h dbtable.h diff.h dispatch.h dynamic_db.h \
 		dlz.h dlz_dlopen.h dns64.h dnssec.h ds.h dsdigest.h \
 		ecdb.h events.h fixedname.h forward.h geoip.h iptable.h \
 		journal.h keydata.h keyflags.h keytable.h keyvalues.h \
 diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
 new file mode 100644
 index 0000000..719fa0f
 --- /dev/null
 +++ b/lib/dns/include/dns/dynamic_db.h
@@ -0,0 +1,51 @@
 +/*
 + * Copyright (C) 2008-2011  Red Hat, Inc.
 + *
@ -589,88 +654,48 @@ diff -up bind-9.9.5rc2/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.9.5rc2/lib/
 +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
 +
 +#endif
-diff -up bind-9.9.5rc2/lib/dns/include/dns/log.h.dyndb bind-9.9.5rc2/lib/dns/include/dns/log.h
+
--- bind-9.9.5rc2/lib/dns/include/dns/log.h.dyndb	2014-01-17 04:27:12.000000000 +0100
+diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
-+++ bind-9.9.5rc2/lib/dns/include/dns/log.h	2014-01-24 10:45:59.049572063 +0100
+index 15f3976..2fb3fed 100644
-@@ -77,6 +77,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
+--- a/lib/dns/include/dns/log.h
- #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
+++ b/lib/dns/include/dns/log.h
@@ -78,6 +78,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
 #define DNS_LOGMODULE_DNSSEC		(&dns_modules[27])
 #define DNS_LOGMODULE_CRYPTO		(&dns_modules[28])
-+#define DNS_LOGMODULE_DYNDB		(&dns_modules[29])
+ #define DNS_LOGMODULE_PACKETS		(&dns_modules[29])
 +#define DNS_LOGMODULE_DYNDB		(&dns_modules[30])
 ISC_LANG_BEGINDECLS
-diff -up bind-9.9.5rc2/lib/dns/include/dns/Makefile.in.dyndb bind-9.9.5rc2/lib/dns/include/dns/Makefile.in
+diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
--- bind-9.9.5rc2/lib/dns/include/dns/Makefile.in.dyndb	2014-01-24 10:45:59.049572063 +0100
+index 7324a97..ba02423 100644
-+++ bind-9.9.5rc2/lib/dns/include/dns/Makefile.in	2014-01-24 12:43:29.234908816 +0100
+--- a/lib/dns/include/dns/types.h
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+++ b/lib/dns/include/dns/types.h
- 
+@@ -64,6 +64,7 @@ typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
 HEADERS =	acache.h acl.h adb.h bit.h byaddr.h cache.h callbacks.h cert.h \
 		client.h clientinfo.h compress.h \
 -		db.h dbiterator.h dbtable.h diff.h dispatch.h \
 +		db.h dbiterator.h dbtable.h diff.h dispatch.h dynamic_db.h \
 		dlz.h dlz_dlopen.h dns64.h dnssec.h ds.h \
 		ecdb.h events.h fixedname.h forward.h iptable.h \
 		journal.h keydata.h keyflags.h keytable.h keyvalues.h \
 diff -up bind-9.9.5rc2/lib/dns/include/dns/types.h.dyndb bind-9.9.5rc2/lib/dns/include/dns/types.h
 --- bind-9.9.5rc2/lib/dns/include/dns/types.h.dyndb	2014-01-17 04:27:12.000000000 +0100
 +++ bind-9.9.5rc2/lib/dns/include/dns/types.h	2014-01-24 10:45:59.050572062 +0100
@@ -60,6 +60,7 @@ typedef struct dns_dbtable			dns_dbtable
 typedef void					dns_dbversion_t;
 typedef struct dns_dlzimplementation		dns_dlzimplementation_t;
 typedef struct dns_dlzdb			dns_dlzdb_t;
-+typedef struct dns_dyndb_arguments		dns_dyndb_arguments_t;
+ typedef ISC_LIST(dns_dlzdb_t)			dns_dlzdblist_t;
 typedef struct dns_sdlzimplementation		dns_sdlzimplementation_t;
 +typedef struct dns_dyndb_arguments		dns_dyndb_arguments_t;
 typedef struct dns_decompress			dns_decompress_t;
 typedef struct dns_dispatch			dns_dispatch_t;
-diff -up bind-9.9.5rc2/lib/dns/log.c.dyndb bind-9.9.5rc2/lib/dns/log.c
+ typedef struct dns_dispatchevent		dns_dispatchevent_t;
--- bind-9.9.5rc2/lib/dns/log.c.dyndb	2014-01-17 04:27:12.000000000 +0100
+diff --git a/lib/dns/log.c b/lib/dns/log.c
-+++ bind-9.9.5rc2/lib/dns/log.c	2014-01-24 10:45:59.050572062 +0100
+index 56b6161..a10c44e 100644
-@@ -83,6 +83,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
+--- a/lib/dns/log.c
- 	{ "dns/dlz",		0 },
+++ b/lib/dns/log.c
@@ -84,6 +84,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
 	{ "dns/dnssec",		0 },
 	{ "dns/crypto",		0 },
 	{ "dns/packets",	0 },
 +	{ "dns/dynamic_db",	0 },
 	{ NULL, 		0 }
 };
-diff -up bind-9.9.5rc2/lib/dns/Makefile.in.dyndb bind-9.9.5rc2/lib/dns/Makefile.in
+diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
--- bind-9.9.5rc2/lib/dns/Makefile.in.dyndb	2014-01-24 10:45:59.001572079 +0100
+index 911612f..0e499af 100644
-+++ bind-9.9.5rc2/lib/dns/Makefile.in	2014-01-24 10:45:59.050572062 +0100
+--- a/lib/isccfg/namedconf.c
-@@ -62,7 +62,7 @@ DNSOBJS =	acache.@O@ acl.@O@ adb.@O@ bya
+++ b/lib/isccfg/namedconf.c
- 		cache.@O@ callbacks.@O@ clientinfo.@O@ compress.@O@ \
+@@ -107,6 +107,7 @@ static cfg_type_t cfg_type_controls;
 		db.@O@ dbiterator.@O@ dbtable.@O@ diff.@O@ dispatch.@O@ \
 		dlz.@O@ dns64.@O@ dnssec.@O@ ds.@O@ forward.@O@ iptable.@O@ \
 -		journal.@O@ keydata.@O@ keytable.@O@ \
 +		dynamic_db.@O@ journal.@O@ keydata.@O@ keytable.@O@ \
 		lib.@O@ log.@O@ lookup.@O@ \
 		master.@O@ masterdump.@O@ message.@O@ \
 		name.@O@ ncache.@O@ nsec.@O@ nsec3.@O@ order.@O@ peer.@O@ \
@@ -92,7 +92,7 @@ DNSSRCS =	acache.c acl.c adb.c byaddr.c
 		cache.c callbacks.c clientinfo.c compress.c \
 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
 		dlz.c dns64.c dnssec.c ds.c forward.c iptable.c journal.c \
 -		keydata.c keytable.c lib.c log.c lookup.c \
 +		dynamic_db.c keydata.c keytable.c lib.c log.c lookup.c \
 		master.c masterdump.c message.c \
 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
 		rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
@@ -125,6 +125,11 @@ version.@O@: version.c
 		-DLIBAGE=${LIBAGE} \
 		-c ${srcdir}/version.c
 +dynamic_db.@O@: dynamic_db.c
 +	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
 +	-DDYNDB_LIBDIR=\"@libdir@/bind/\" \
 +	-c ${srcdir}/dynamic_db.c
 +
 libdns.@SA@: ${OBJS}
 	${AR} ${ARFLAGS} $@ ${OBJS}
 	${RANLIB} $@
 diff -up bind-9.9.5rc2/lib/isccfg/namedconf.c.dyndb bind-9.9.5rc2/lib/isccfg/namedconf.c
 --- bind-9.9.5rc2/lib/isccfg/namedconf.c.dyndb	2014-01-17 04:27:12.000000000 +0100
 +++ bind-9.9.5rc2/lib/isccfg/namedconf.c	2014-01-24 10:45:59.051572062 +0100
@@ -92,6 +92,7 @@ static cfg_type_t cfg_type_controls;
 static cfg_type_t cfg_type_controls_sockaddr;
 static cfg_type_t cfg_type_destinationlist;
 static cfg_type_t cfg_type_dialuptype;
@ -678,15 +703,15 @@ diff -up bind-9.9.5rc2/lib/isccfg/namedconf.c.dyndb bind-9.9.5rc2/lib/isccfg/nam
 static cfg_type_t cfg_type_ixfrdifftype;
 static cfg_type_t cfg_type_key;
 static cfg_type_t cfg_type_logfile;
-@@ -897,6 +898,7 @@ namedconf_or_view_clauses[] = {
+@@ -935,6 +936,7 @@ namedconf_or_view_clauses[] = {
 	{ "key", &cfg_type_key, CFG_CLAUSEFLAG_MULTI },
 	{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
- 	/* only 1 DLZ per view allowed */
+ 	{ "dlz", &cfg_type_dlz, CFG_CLAUSEFLAG_MULTI },
 	{ "dlz", &cfg_type_dlz, 0 },
 +	{ "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI },
 	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
 	{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
 	{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
-@@ -2045,6 +2047,40 @@ static cfg_type_t cfg_type_dialuptype =
+@@ -2155,6 +2157,40 @@ static cfg_type_t cfg_type_dialuptype = {
 	&cfg_rep_string, dialup_enums
 };
@ -727,3 +752,6 @@ diff -up bind-9.9.5rc2/lib/isccfg/namedconf.c.dyndb bind-9.9.5rc2/lib/isccfg/nam
 static const char *notify_enums[] = { "explicit", "master-only", NULL };
 static isc_result_t
 parse_notify_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 -- 
 1.9.3
--- a/bind-9.10-sdb-sqlite-bld.patch
+++ b/bind-9.10-sdb-sqlite-bld.patch
@ -0,0 +1,53 @@
 diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
 index 1894830..445182a 100644
 --- a/bin/named-sdb/Makefile.in
 +++ b/bin/named-sdb/Makefile.in
@@ -34,10 +34,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_INCLUDES =
 -DBDRIVER_LIBS =	-lldap -llber -lpq
 +DBDRIVER_LIBS =	-lldap -llber -lsqlite3 -lpq
 DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
 diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
 index 7f3c5e2..b1bca66 100644
 --- a/bin/sdb_tools/Makefile.in
 +++ b/bin/sdb_tools/Makefile.in
@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
 -TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
 +TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
 -OBJS	=	zone2ldap.@O@ zonetodb.@O@
 +OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
 -SRCS    =       zone2ldap.c zonetodb.c
 +SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
 MANPAGES =      zone2ldap.1
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
 zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
 +zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
 +	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
 +
 clean distclean manclean maintainer-clean::
 	rm -f ${TARGETS} ${OBJS}
@@ -60,4 +63,5 @@ installdirs:
 install:: ${TARGETS} installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
--- a/bind-9.10-sdb.patch
+++ b/bind-9.10-sdb.patch
@ -1,96 +1,116 @@
-diff -up bind-9.9.4-P2/bin/Makefile.in.sdb bind-9.9.4-P2/bin/Makefile.in
+From dc6de005ec4b5488ca4a8db8203b3ce582b62e00 Mon Sep 17 00:00:00 2001
--- bind-9.9.4-P2/bin/Makefile.in.sdb	2013-12-20 01:28:28.000000000 +0100
+From: Tomas Hozza <thozza@redhat.com>
-+++ bind-9.9.4-P2/bin/Makefile.in	2014-07-22 10:29:23.940233449 +0200
+Date: Mon, 24 Nov 2014 13:44:55 +0100
 Subject: [PATCH] distribute SDB
 Signed-off-by: Tomas Hozza <thozza@redhat.com>
 ---
 bin/Makefile.in           |  4 +--
 bin/named-sdb/Makefile.in | 22 +++++--------
 bin/named-sdb/main.c      | 83 +++++++++++++++++++++++++++++++++++++++++++++++
 bin/named/Makefile.in     | 16 ++++-----
 bin/sdb_tools/Makefile.in | 10 ++++--
 configure.in              |  3 ++
 6 files changed, 109 insertions(+), 29 deletions(-)
 diff --git a/bin/Makefile.in b/bin/Makefile.in
 index 7654169..b4c9c03 100644
 --- a/bin/Makefile.in
 +++ b/bin/Makefile.in
@@ -19,8 +19,8 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
-SUBDIRS =	named named-pkcs11 rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
+-SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \
 -		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
-+SUBDIRS =	named named-pkcs11 named-sdb rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
+SUBDIRS =	named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \
 +		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
 TARGETS =
 @BIND9_MAKE_RULES@
-diff -up bind-9.9.4-P2/bin/named/Makefile.in.sdb bind-9.9.4-P2/bin/named/Makefile.in
+diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
--- bind-9.9.4-P2/bin/named/Makefile.in.sdb	2014-07-22 10:29:23.873233351 +0200
+index ba5ec3c..d7ac259 100644
-+++ bind-9.9.4-P2/bin/named/Makefile.in	2014-07-22 10:30:43.247348398 +0200
+--- a/bin/named-sdb/Makefile.in
-@@ -52,7 +52,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
+++ b/bin/named-sdb/Makefile.in
- 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
+@@ -34,10 +34,10 @@ top_srcdir =	@top_srcdir@
- 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
+ #
 # Add database drivers here.
 #
 -DBDRIVER_OBJS =
 -DBDRIVER_SRCS =
 +DBDRIVER_OBJS =	ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
 +DBDRIVER_SRCS =	ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
 DBDRIVER_INCLUDES =
 -DBDRIVER_LIBS =
 +DBDRIVER_LIBS =	-lldap -llber -lsqlite3 -lpq
-CDEFINES =      @CONTRIB_DLZ@ @CRYPTO@
+ DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
 +CDEFINES =      @CRYPTO@
- CWARNINGS =
+@@ -83,7 +83,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
@@ -79,11 +79,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
 NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
 SUBDIRS =	unix
-@@ -96,8 +96,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
+-TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
- 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
+TARGETS =	named-sdb@EXEEXT@
 		zoneconf.@O@ \
 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
 -		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
 -		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
 +		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
- UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
+ GEOIPLINKOBJS = geoip.@O@
-@@ -110,8 +109,7 @@ SRCS =		builtin.c client.c config.c cont
+@@ -144,7 +144,7 @@ config.@O@: config.c
- 		tkeyconf.c tsigconf.c update.c xfrout.c \
+ 		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
- 		zoneconf.c \
+ 		-c ${srcdir}/config.c
 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
 -		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
 -		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
 +		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- MANPAGES =	named.8 lwresd.8 named.conf.5
+-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
 +named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
 	export MAKE_SYMTABLE="yes"; \
 	export BASEOBJS="${OBJS} ${UOBJS}"; \
 	${FINALBUILDCMD}
@@ -171,15 +171,9 @@ statschannel.@O@: bind9.xsl.h
-@@ -187,7 +185,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
+ installdirs:
- 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
+-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
- 
+-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 -@DLZ_DRIVER_RULES@
 -
- named-symtbl.@O@: named-symtbl.c
+-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
- 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
-diff -up bind-9.9.4-P2/bin/named-sdb/main.c.sdb bind-9.9.4-P2/bin/named-sdb/main.c
+-	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
--- bind-9.9.4-P2/bin/named-sdb/main.c.sdb	2014-07-22 10:29:23.919233417 +0200
+-	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
-+++ bind-9.9.4-P2/bin/named-sdb/main.c	2014-07-22 10:29:23.940233449 +0200
+-	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
-@@ -83,6 +83,9 @@
+-	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 +
 +install:: named-sdb@EXEEXT@ installdirs
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
 @DLZ_DRIVER_RULES@
 diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
 index 8f7c7ee..d603506 100644
 --- a/bin/named-sdb/main.c
 +++ b/bin/named-sdb/main.c
@@ -86,6 +86,10 @@
  * Include header files for database drivers here.
  */
 /* #include "xxdb.h" */
 +#include "ldapdb.h"
 +#include "pgsqldb.h"
 +#include "sqlitedb.h"
 +#include "dirdb.h"
 #ifdef CONTRIB_DLZ
 /*
-@@ -814,6 +817,10 @@ setup(void) {
+@@ -926,6 +930,11 @@ setup(void) {
 		ns_main_earlyfatal("isc_app_start() failed: %s",
 				   isc_result_totext(result));
 +	ldapdb_clear();
 +	pgsqldb_clear();
 +	dirdb_clear();
 +	sqlitedb_clear();
 +
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 		      ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
 		      ns_g_version, saved_command_line);
-@@ -926,6 +933,57 @@ setup(void) {
+@@ -1038,6 +1047,75 @@ setup(void) {
 				   isc_result_totext(result));
 #endif
@ -128,6 +148,23 @@ diff -up bind-9.9.4-P2/bin/named-sdb/main.c.sdb bind-9.9.4-P2/bin/named-sdb/main
 +                          ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
 +                         );
 +
 +        result = sqlitedb_init();
 +        if (result != ISC_R_SUCCESS)
 +        {
 +             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_ERROR, 
 +                          "SDB sqlite3 module initialisation failed: %s.",
 +                          isc_result_totext(result)
 +                );
 +            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_ERROR, 
 +                          "SDB sqlite3 zone database will be unavailable."
 +                );
 +        }else
 +            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
 +                         );
 +
 +        result = dirdb_init();
 +        if (result != ISC_R_SUCCESS)
 +        {
@ -144,81 +181,124 @@ diff -up bind-9.9.4-P2/bin/named-sdb/main.c.sdb bind-9.9.4-P2/bin/named-sdb/main
 +            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
 +                         );
 +
 +
 	ns_server_create(ns_g_mctx, &ns_g_server);
 }
-@@ -957,6 +1015,10 @@ cleanup(void) {
+ #ifdef HAVE_LIBSECCOMP
@@ -1073,6 +1151,11 @@ cleanup(void) {
 	dns_name_destroy();
-+        ldapdb_clear();
+	ldapdb_clear();
-+        pgsqldb_clear();
+	pgsqldb_clear();
-+        dirdb_clear();
+	sqlitedb_clear();
 +	dirdb_clear();
 +
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 		      ISC_LOG_NOTICE, "exiting");
 	ns_log_shutdown();
-diff -up bind-9.9.4-P2/bin/named-sdb/Makefile.in.sdb bind-9.9.4-P2/bin/named-sdb/Makefile.in
+diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
--- bind-9.9.4-P2/bin/named-sdb/Makefile.in.sdb	2014-07-22 10:29:23.917233415 +0200
+index ba5ec3c..2c88f46 100644
-+++ bind-9.9.4-P2/bin/named-sdb/Makefile.in	2014-07-22 10:29:23.941233449 +0200
+--- a/bin/named/Makefile.in
-@@ -34,10 +34,10 @@ top_srcdir =	@top_srcdir@
+++ b/bin/named/Makefile.in
- #
+@@ -49,9 +49,9 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
- # Add database drivers here.
+ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- #
+ 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-DBDRIVER_OBJS =
+ 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
-DBDRIVER_SRCS =
+-		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
-+DBDRIVER_OBJS =	ldapdb.@O@ pgsqldb.@O@ dirdb.@O@
+		@DST_OPENSSL_INC@
 +DBDRIVER_SRCS =	ldapdb.c pgsqldb.c dirdb.c
 DBDRIVER_INCLUDES =
 -DBDRIVER_LIBS =
 +DBDRIVER_LIBS =	-lldap -llber -lpq
- DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
+-CDEFINES =      @CONTRIB_DLZ@ @CRYPTO@
 +CDEFINES =      @CRYPTO@
-@@ -87,7 +87,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
+ CWARNINGS =
@@ -75,11 +75,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
 NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
 -		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
 +		@LIBS@
 SUBDIRS =	unix
-TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
+@@ -94,8 +94,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
-+TARGETS =	named-sdb@EXEEXT@
+ 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
 		zoneconf.@O@ \
 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
 -		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
 -		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
 +		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
- OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
+ UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
 		controlconf.@O@ interfacemgr.@O@ \
@@ -146,7 +146,7 @@ config.@O@: config.c bind.keys.h
 		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
 		-c ${srcdir}/config.c
-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+@@ -110,8 +109,7 @@ SRCS =		builtin.c client.c config.c control.c \
-+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
+ 		tkeyconf.c tsigconf.c update.c xfrout.c \
- 	export MAKE_SYMTABLE="yes"; \
+ 		zoneconf.c \
- 	export BASEOBJS="${OBJS} ${UOBJS}"; \
+ 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
- 	${FINALBUILDCMD}
+-		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
-@@ -177,15 +177,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3
+-		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
 +		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
- installdirs:
+ MANPAGES =	named.8 lwresd.8 named.conf.5
 	$(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
+@@ -181,7 +179,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
+ 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
-	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
+ 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
 -	${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}
- @DLZ_DRIVER_RULES@
+-@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
 --- a/bin/sdb_tools/Makefile.in
 +++ b/bin/sdb_tools/Makefile.in
@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
-diff -up bind-9.9.4-P2/configure.in.sdb bind-9.9.4-P2/configure.in
+-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
--- bind-9.9.4-P2/configure.in.sdb	2014-07-22 10:29:23.909233403 +0200
+TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
-+++ bind-9.9.4-P2/configure.in	2014-07-22 10:29:23.942233450 +0200
+ 
-@@ -3900,12 +3900,15 @@ AC_CONFIG_FILES([
+-OBJS	=	zone2ldap.@O@ zonetodb.@O@
 +OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
 -SRCS    =       zone2ldap.c zonetodb.c
 +SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
 MANPAGES =      zone2ldap.1
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
 zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
 +zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
 +	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
 +
 clean distclean manclean maintainer-clean::
 	rm -f ${TARGETS} ${OBJS}
@@ -60,4 +63,5 @@ installdirs:
 install:: ${TARGETS} installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
 +	${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 8f3b8f4..b50aa00 100644
 --- a/configure.in
 +++ b/configure.in
@@ -4477,12 +4477,15 @@ AC_CONFIG_FILES([
 	bin/named/unix/Makefile
 	bin/named-pkcs11/Makefile
 	bin/named-pkcs11/unix/Makefile
 	bin/named/unix/Makefile
 +	bin/named-sdb/Makefile
 +	bin/named-sdb/unix/Makefile
 	bin/nsupdate/Makefile
@ -231,3 +311,6 @@ diff -up bind-9.9.4-P2/configure.in.sdb bind-9.9.4-P2/configure.in
 	bin/tests/Makefile
 	bin/tests/atomic/Makefile
 	bin/tests/db/Makefile
 -- 
 1.9.3
--- a/bind-9.3.2b1-fix_sdb_ldap.patch
+++ b/bind-9.3.2b1-fix_sdb_ldap.patch
@ -1,24 +1,24 @@
-diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.fix_sdb_ldap bind-9.5.1b1/bin/sdb_tools/Makefile.in
+diff -up bind-9.10.1/bin/sdb_tools/Makefile.in.fix_sdb_ldap bind-9.10.1/bin/sdb_tools/Makefile.in
--- bind-9.5.1b1/bin/sdb_tools/Makefile.in.fix_sdb_ldap	2008-07-21 12:14:00.000000000 +0200
+--- bind-9.10.1/bin/sdb_tools/Makefile.in.fix_sdb_ldap	2014-11-24 13:37:37.278774373 +0100
-+++ bind-9.5.1b1/bin/sdb_tools/Makefile.in	2008-07-21 12:17:51.000000000 +0200
+++ bind-9.10.1/bin/sdb_tools/Makefile.in	2014-11-24 13:39:05.781899141 +0100
-@@ -30,11 +30,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
+@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
+-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
-+TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@
+TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
-OBJS	=	zone2ldap.@O@ zonetodb.@O@
+-OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
-+OBJS	=	zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@
+OBJS	=	zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@ zone2sqlite.@O@
-SRCS    =       zone2ldap.c zonetodb.c
+-SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
-+SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c
+SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c
 MANPAGES =      zone2ldap.1
-@@ -48,6 +48,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
+@@ -53,6 +53,9 @@ zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIB
- zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
+ zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
 +ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
 +	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
@ -26,17 +26,18 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.fix_sdb_ldap bind-9.5.1b1/bin/sd
 clean distclean manclean maintainer-clean::
 	rm -f ${TARGETS} ${OBJS}
-@@ -57,5 +60,6 @@ installdirs:
+@@ -62,6 +65,7 @@ installdirs:
 install:: ${TARGETS} installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
-diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sdb_tools/zone2ldap.c
+diff -up bind-9.10.1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.10.1/bin/sdb_tools/zone2ldap.c
--- bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap	2008-07-21 12:14:00.000000000 +0200
+--- bind-9.10.1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap	2014-11-24 13:37:37.260774347 +0100
-+++ bind-9.5.1b1/bin/sdb_tools/zone2ldap.c	2008-07-21 12:14:00.000000000 +0200
+++ bind-9.10.1/bin/sdb_tools/zone2ldap.c	2014-11-24 13:37:37.281774377 +0100
-@@ -24,6 +24,7 @@
+@@ -26,6 +26,7 @@
 #include <isc/hash.h>
 #include <isc/mem.h>
 #include <isc/print.h>
@ -44,7 +45,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 #include <isc/result.h>
 #include <dns/db.h>
-@@ -61,6 +62,9 @@ ldap_info;
+@@ -63,6 +64,9 @@ ldap_info;
 /* usage Info */
 void usage (void);
@ -54,7 +55,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 /* Add to the ldap dit */
 void add_ldap_values (ldap_info * ldinfo);
-@@ -77,7 +81,7 @@ char **hostname_to_dn_list (char *hostna
+@@ -79,7 +83,7 @@ char **hostname_to_dn_list (char *hostna
 int get_attr_list_size (char **tmp);
 /* Get a DN */
@ -63,7 +64,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 /* Add to RR list */
 void add_to_rr_list (char *dn, char *name, char *type, char *data,
-@@ -99,11 +103,27 @@ void
+@@ -101,11 +105,27 @@ void
 init_ldap_conn ();
 void usage();
@ -96,7 +97,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 LDAP *conn;
 unsigned int debug = 0;
-@@ -119,12 +139,12 @@ main (int argc, char **argv)
+@@ -121,12 +141,12 @@ main (int argc, char **argv)
   isc_result_t result;
   char *basedn;
   ldap_info *tmp;
@ -112,7 +113,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
   dns_fixedname_t fixedzone, fixedname;
   dns_rdataset_t rdataset;
   char **dc_list;
-@@ -137,7 +157,7 @@ main (int argc, char **argv)
+@@ -139,7 +159,7 @@ main (int argc, char **argv)
   extern char *optarg;
   extern int optind, opterr, optopt;
   int create_base = 0;
@ -121,7 +122,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
   if ((int) argc < 2)
     {
-@@ -145,7 +165,7 @@ main (int argc, char **argv)
+@@ -147,7 +167,7 @@ main (int argc, char **argv)
       exit (-1);
     }
@ -130,7 +131,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
     {
       switch (topt)
 	{
-@@ -164,8 +184,11 @@ main (int argc, char **argv)
+@@ -166,8 +186,11 @@ main (int argc, char **argv)
 	case 'w':
 	  bindpw = strdup (optarg);
 	  break;
@ -143,7 +144,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 	  break;
 	case 'z':
 	  argzone = strdup (optarg);
-@@ -277,27 +300,62 @@ main (int argc, char **argv)
+@@ -279,27 +302,62 @@ main (int argc, char **argv)
     {
       if (debug)
 	printf ("Creating base zone DN %s\n", argzone);
@ -216,7 +217,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 		}
 	      else
 		{
-@@ -306,8 +364,13 @@ main (int argc, char **argv)
+@@ -308,8 +366,13 @@ main (int argc, char **argv)
 		  else
 		    sprintf (fullbasedn, "%s", ctmp);
 		}
@ -230,7 +231,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 	    }
 	}
-@@ -383,14 +446,14 @@ generate_ldap (dns_name_t * dnsname, dns
+@@ -387,14 +450,14 @@ generate_ldap (dns_name_t * dnsname, dns
   isc_result_check (result, "dns_rdata_totext");
   data[isc_buffer_usedlength (&buff)] = 0;
@ -248,7 +249,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 }
-@@ -430,7 +493,8 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -434,7 +497,8 @@ add_to_rr_list (char *dn, char *name, ch
   int attrlist;
   char ldap_type_buffer[128];
   char charttl[64];
@ -258,7 +259,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
   if ((tmp = locate_by_dn (dn)) == NULL)
     {
-@@ -465,13 +529,13 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -469,13 +533,13 @@ add_to_rr_list (char *dn, char *name, ch
 	    }
 	}
       tmp->attrs[0]->mod_op = LDAP_MOD_ADD;
@ -275,7 +276,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 	  tmp->attrs[1] = NULL;
 	  tmp->attrcnt = 2;
 	  tmp->next = ldap_info_base;
-@@ -480,7 +544,7 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -484,7 +548,7 @@ add_to_rr_list (char *dn, char *name, ch
 	}
       tmp->attrs[1]->mod_op = LDAP_MOD_ADD;
@ -284,7 +285,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
       tmp->attrs[1]->mod_values = (char **) calloc (sizeof (char *), 2);
       if (tmp->attrs[1]->mod_values == (char **)NULL)
-@@ -502,7 +566,7 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -506,7 +570,7 @@ add_to_rr_list (char *dn, char *name, ch
       tmp->attrs[2]->mod_values[1] = NULL;
       tmp->attrs[3]->mod_op = LDAP_MOD_ADD;
@ -293,7 +294,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
       tmp->attrs[3]->mod_values = (char **) calloc (sizeof (char *), 2);
       if (tmp->attrs[3]->mod_values == (char **)NULL)
-@@ -512,10 +576,21 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -516,10 +580,21 @@ add_to_rr_list (char *dn, char *name, ch
       tmp->attrs[3]->mod_values[0] = strdup (charttl);
       tmp->attrs[3]->mod_values[1] = NULL;
@ -317,7 +318,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
       tmp->attrs[4]->mod_values[1] = NULL;
       tmp->attrs[5] = NULL;
-@@ -526,7 +601,7 @@ add_to_rr_list (char *dn, char *name, ch
+@@ -530,7 +605,7 @@ add_to_rr_list (char *dn, char *name, ch
   else
     {
@ -326,7 +327,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 	{
 	  sprintf (ldap_type_buffer, "%sRecord", type);
 	  if (!strncmp
-@@ -595,69 +670,105 @@ char **
+@@ -599,69 +674,105 @@ char **
 hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
 {
   char *tmp;
@ -470,7 +471,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
       else
 	      sprintf(tmp,"dc=%s,", dc_list[x]);
     }
-@@ -683,6 +794,7 @@ void
+@@ -687,6 +798,7 @@ void
 init_ldap_conn ()
 {
   int result;
@ -478,7 +479,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
   conn = ldap_open (ldapsystem, LDAP_PORT);
   if (conn == NULL)
     {
-@@ -692,7 +804,7 @@ init_ldap_conn ()
+@@ -696,7 +808,7 @@ init_ldap_conn ()
     }
   result = ldap_simple_bind_s (conn, binddn, bindpw);
@ -487,7 +488,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 }
 /* Like isc_result_check, only for LDAP */
-@@ -709,8 +821,6 @@ ldap_result_check (const char *msg, char
+@@ -713,8 +825,6 @@ ldap_result_check (const char *msg, char
     }
 }
@ -496,7 +497,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 /* For running the ldap_info run queue. */
 void
 add_ldap_values (ldap_info * ldinfo)
-@@ -718,14 +828,14 @@ add_ldap_values (ldap_info * ldinfo)
+@@ -722,14 +832,14 @@ add_ldap_values (ldap_info * ldinfo)
   int result;
   char dnbuffer[1024];
@ -513,7 +514,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap bind-9.5.1b1/bin/sd
 }
-@@ -736,7 +846,7 @@ void
+@@ -740,7 +850,7 @@ void
 usage ()
 {
   fprintf (stderr,
--- a/bind-9.5-parallel-build.patch
+++ b/bind-9.5-parallel-build.patch
@ -1,7 +1,7 @@
-diff -up bind-9.5.0b1/lib/dns/Makefile.in.parallel bind-9.5.0b1/lib/dns/Makefile.in
+diff -up bind-9.10.1b1/lib/dns/Makefile.in.parallel bind-9.10.1b1/lib/dns/Makefile.in
--- bind-9.5.0b1/lib/dns/Makefile.in.parallel	2008-01-17 18:27:38.000000000 +0100
+--- bind-9.10.1b1/lib/dns/Makefile.in.parallel	2014-07-29 15:48:34.052378742 +0200
-+++ bind-9.5.0b1/lib/dns/Makefile.in	2008-01-17 18:27:45.000000000 +0100
+++ bind-9.10.1b1/lib/dns/Makefile.in	2014-07-29 15:49:34.542474686 +0200
-@@ -19,10 +19,6 @@ srcdir =	@srcdir@
+@@ -17,10 +17,6 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
@ -10,5 +10,5 @@ diff -up bind-9.5.0b1/lib/dns/Makefile.in.parallel bind-9.5.0b1/lib/dns/Makefile
 -.NO_PARALLEL:
 -
 @BIND9_VERSION@
 @BIND9_MAJOR@
 @LIBDNS_API@
--- a/bind-9.5-sdb-sqlite-bld.patch
+++ b/bind-9.5-sdb-sqlite-bld.patch
@ -1,102 +0,0 @@
 diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/main.c
 --- bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld	2011-08-31 14:41:15.646020840 +0200
 +++ bind-9.8.1rc1/bin/named-sdb/main.c	2011-08-31 14:41:35.132019452 +0200
@@ -85,6 +85,7 @@
 /* #include "xxdb.h" */
 #include "ldapdb.h"
 #include "pgsqldb.h"
 +#include "sqlitedb.h"
 #include "dirdb.h"
 #ifdef CONTRIB_DLZ
@@ -792,6 +793,7 @@ setup(void) {
 	ldapdb_clear();
 	pgsqldb_clear();
 +	sqlitedb_clear();
 	dirdb_clear();
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
@@ -921,6 +923,23 @@ setup(void) {
                           ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
                          );
 +        result = sqlitedb_init();
 +        if (result != ISC_R_SUCCESS)
 +        {
 +             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_ERROR, 
 +                          "SDB sqlite3 module initialisation failed: %s.",
 +                          isc_result_totext(result)
 +                );
 +            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_ERROR, 
 +                          "SDB sqlite3 zone database will be unavailable."
 +                );
 +        }else
 +            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 +                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
 +                         );
 +
         result = dirdb_init();
         if (result != ISC_R_SUCCESS)
         {
@@ -971,6 +990,7 @@ cleanup(void) {
         ldapdb_clear();
         pgsqldb_clear();
 +        sqlitedb_clear();
         dirdb_clear();
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/Makefile.in
 --- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld	2011-08-31 14:41:15.646020840 +0200
 +++ bind-9.8.1rc1/bin/named-sdb/Makefile.in	2011-08-31 14:41:15.658020839 +0200
@@ -28,10 +28,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_INCLUDES =
 -DBDRIVER_LIBS =	-lldap -llber -lpq
 +DBDRIVER_LIBS =	-lldap -llber -lpq -lsqlite3
 DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
 diff -up bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/sdb_tools/Makefile.in
 --- bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld	2011-08-31 14:41:15.651020840 +0200
 +++ bind-9.8.1rc1/bin/sdb_tools/Makefile.in	2011-08-31 14:41:15.658020839 +0200
@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} 
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
 -TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@
 +TARGETS =	zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
 -OBJS	=	zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@
 +OBJS	=	zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@ zone2sqlite.@O@
 -SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c
 +SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c
 MANPAGES =      zone2ldap.1
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
 zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
 +zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
 +	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
 +
 ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
 +	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@  ${DESTDIR}${sbindir}
 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
--- a/bind-9.9-native-pkcs11.patch
+++ b/bind-9.9-native-pkcs11.patch
--- a/bind-9.9.1-P2-multlib-conflict.patch
+++ b/bind-9.9.1-P2-multlib-conflict.patch
@ -1,9 +1,8 @@
-diff --git a/config.h.in b/config.h.in
+diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in
-index 71048b6..7382171 100644
+--- bind-9.10.1b1/config.h.in.multlib-conflict	2014-08-04 12:42:19.750274089 +0200
--- a/config.h.in
+++ bind-9.10.1b1/config.h.in	2014-08-04 12:43:19.334332434 +0200
-+++ b/config.h.in
+@@ -495,7 +495,7 @@ int sigwait(const unsigned int *set, int
-@@ -440,7 +440,7 @@ int sigwait(const unsigned int *set, int *sig);
+ #undef PREFER_GOSTASN1
 #undef PORT_NONBLOCK
 /* The size of `void *', as computed by sizeof. */
 -#undef SIZEOF_VOID_P
@ -11,11 +10,10 @@ index 71048b6..7382171 100644
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
-diff --git a/configure.in b/configure.in
+diff -up bind-9.10.1b1/configure.in.multlib-conflict bind-9.10.1b1/configure.in
-index 1a34bb6..1c29465 100644
+--- bind-9.10.1b1/configure.in.multlib-conflict	2014-08-04 12:42:19.751274090 +0200
--- a/configure.in
+++ bind-9.10.1b1/configure.in	2014-08-04 12:47:50.157648387 +0200
-+++ b/configure.in
+@@ -2952,7 +2952,9 @@ int getnameinfo(const struct sockaddr *,
@@ -2370,7 +2370,9 @@ int getnameinfo(const struct sockaddr *, socklen_t, char *,
 		size_t, char *, size_t, int);],
 [ return (0);],
 	[AC_MSG_RESULT(size_t for buflen; int for flags)
@ -26,11 +24,10 @@ index 1a34bb6..1c29465 100644
 	 AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
 [AC_MSG_RESULT(not match any subspecies; assume standard definition)
 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
-diff --git a/isc-config.sh.in b/isc-config.sh.in
+diff -up bind-9.10.1b1/isc-config.sh.in.multlib-conflict bind-9.10.1b1/isc-config.sh.in
-index 10df275..9b30482 100644
+--- bind-9.10.1b1/isc-config.sh.in.multlib-conflict	2014-06-23 06:47:35.000000000 +0200
--- a/isc-config.sh.in
+++ bind-9.10.1b1/isc-config.sh.in	2014-08-04 12:42:19.752274091 +0200
-+++ b/isc-config.sh.in
+@@ -21,7 +21,18 @@ prefix=@prefix@
@@ -21,7 +21,19 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=
 includedir=@includedir@
@ -47,11 +44,10 @@ index 10df275..9b30482 100644
 +		sec_libdir=/usr/lib64
 +		;;
 +esac
 +
 usage()
 {
-@@ -133,6 +145,16 @@ if test x"$echo_libs" = x"true"; then
+@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then
 	if test x"${exec_prefix_set}" = x"true"; then
 		includes="-L${exec_prefix}/lib"
 	else
--- a/bind-99-libidn.patch
+++ b/bind-99-libidn.patch
@ -1,46 +1,7 @@
-From 19809fe6154ea0471a2c4fa3bd66787facf7704a Mon Sep 17 00:00:00 2001
+diff -up bind-9.10.1b1/bin/dig/dig.docbook.libidn bind-9.10.1b1/bin/dig/dig.docbook
-From: Tomas Hozza <thozza@redhat.com>
+--- bind-9.10.1b1/bin/dig/dig.docbook.libidn	2014-06-23 06:47:35.000000000 +0200
-Date: Mon, 26 May 2014 15:25:34 +0200
+++ bind-9.10.1b1/bin/dig/dig.docbook	2014-07-29 15:30:42.808679630 +0200
-Subject: [PATCH] Use libidn instead of bundled idnkit
+@@ -1012,8 +1012,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
 Signed-off-by: Tomas Hozza <thozza@redhat.com>
 ---
 bin/dig/Makefile.in |   6 +-
 bin/dig/dig.docbook |   4 +-
 bin/dig/dighost.c   | 168 ++++++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 162 insertions(+), 16 deletions(-)
 diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
 index 5bc4db0..3864e06 100644
 --- a/bin/dig/Makefile.in
 +++ b/bin/dig/Makefile.in
@@ -48,10 +48,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \
 		${LWRESDEPLIBS}
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
 -		${ISCLIBS} @IDNLIBS@ @LIBS@
 +		${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
 NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
 -		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
 +		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
 SUBDIRS =
@@ -69,6 +69,8 @@ HTMLPAGES =	dig.html host.html nslookup.html
 MANOBJS =	${MANPAGES} ${HTMLPAGES}
 +EXT_CFLAGS = -DWITH_LIBIDN
 +
 @BIND9_MAKE_RULES@
 dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
 index 7a01ec0..c3a7976 100644
 --- a/bin/dig/dig.docbook
 +++ b/bin/dig/dig.docbook
@@ -970,8 +970,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.
@ -51,10 +12,9 @@ index 7a01ec0..c3a7976 100644
       The IDN support is disabled if the variable is set when 
       <command>dig</command> runs.
     </para>
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
+diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
-index 56d763c..5a40051 100644
+--- bind-9.10.1b1/bin/dig/dighost.c.libidn	2014-06-23 06:47:35.000000000 +0200
--- a/bin/dig/dighost.c
+++ bind-9.10.1b1/bin/dig/dighost.c	2014-07-29 15:44:43.114012448 +0200
 +++ b/bin/dig/dighost.c
@@ -44,6 +44,11 @@
 #include <idn/api.h>
 #endif
@ -67,7 +27,7 @@ index 56d763c..5a40051 100644
 #include <dns/byaddr.h>
 #ifdef DIG_SIGCHASE
 #include <dns/callbacks.h>
-@@ -158,6 +163,14 @@ static void		idn_check_result(idn_result_t r, const char *msg);
+@@ -158,6 +163,14 @@ static void		idn_check_result(idn_result
 int  idnoptions	= 0;
 #endif
@ -82,17 +42,7 @@ index 56d763c..5a40051 100644
 isc_socket_t *keep = NULL;
 isc_sockaddr_t keepaddr;
-@@ -1210,6 +1223,9 @@ setup_system(void) {
+@@ -1355,8 +1371,15 @@ setup_system(void) {
 	dig_searchlist_t *domain = NULL;
 	lwres_result_t lwresult;
 	unsigned int lwresflags;
 +#ifdef WITH_LIBIDN
 +	isc_result_t result;
 +#endif
 	debug("setup_system()");
@@ -1268,8 +1284,15 @@ setup_system(void) {
 #ifdef WITH_IDN
 	initialize_idn();
@ -109,7 +59,7 @@ index 56d763c..5a40051 100644
 	if (keyfile[0] != 0)
 		setup_file_key();
 	else if (keysecret[0] != 0)
-@@ -2028,12 +2051,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2106,12 +2129,14 @@ setup_lookup(dig_lookup_t *lookup) {
 	idn_result_t mr;
 	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
 #endif
@ -126,7 +76,7 @@ index 56d763c..5a40051 100644
 	REQUIRE(lookup != NULL);
 	INSIST(!free_now);
-@@ -2070,6 +2095,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2148,6 +2173,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");
@ -141,7 +91,7 @@ index 56d763c..5a40051 100644
 #endif
 	/*
-@@ -2082,15 +2115,11 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2160,15 +2193,11 @@ setup_lookup(dig_lookup_t *lookup) {
 	if (lookup->new_search) {
 #ifdef WITH_IDN
 		if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
@ -160,7 +110,7 @@ index 56d763c..5a40051 100644
 			lookup->origin = NULL; /* Force abs lookup */
 			lookup->done_as_is = ISC_TRUE;
 			lookup->need_search = usesearch;
-@@ -2098,7 +2127,6 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2176,7 +2205,6 @@ setup_lookup(dig_lookup_t *lookup) {
 			lookup->origin = ISC_LIST_HEAD(search_list);
 			lookup->need_search = ISC_FALSE;
 		}
@ -168,7 +118,7 @@ index 56d763c..5a40051 100644
 	}
 #ifdef WITH_IDN
-@@ -2115,6 +2143,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2193,6 +2221,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");
@ -189,7 +139,7 @@ index 56d763c..5a40051 100644
 #else
 	if (lookup->origin != NULL) {
 		debug("trying origin %s", lookup->origin->origin);
-@@ -2170,6 +2212,13 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2248,6 +2290,13 @@ setup_lookup(dig_lookup_t *lookup) {
 			result = dns_name_fromtext(lookup->name, &b,
 						   dns_rootname, 0,
 						   &lookup->namebuf);
@ -203,7 +153,7 @@ index 56d763c..5a40051 100644
 #else
 			len = strlen(lookup->textname);
 			isc_buffer_init(&b, lookup->textname, len);
-@@ -3788,7 +3837,7 @@ destroy_libs(void) {
+@@ -4031,7 +4080,7 @@ destroy_libs(void) {
 	void * ptr;
 	dig_message_t *chase_msg;
 #endif
@ -212,7 +162,7 @@ index 56d763c..5a40051 100644
 	isc_result_t result;
 #endif
-@@ -3829,6 +3878,10 @@ destroy_libs(void) {
+@@ -4072,6 +4121,10 @@ destroy_libs(void) {
 	result = dns_name_settotextfilter(NULL);
 	check_result(result, "dns_name_settotextfilter");
 #endif
@ -223,7 +173,7 @@ index 56d763c..5a40051 100644
 	dns_name_destroy();
 	if (commctx != NULL) {
-@@ -4008,6 +4061,97 @@ idn_check_result(idn_result_t r, const char *msg) {
+@@ -4251,6 +4304,97 @@ idn_check_result(idn_result_t r, const c
 	}
 }
 #endif /* WITH_IDN */
@ -321,6 +271,28 @@ index 56d763c..5a40051 100644
 #ifdef DIG_SIGCHASE
 void
-- 
+diff -up bind-9.10.1b1/bin/dig/Makefile.in.libidn bind-9.10.1b1/bin/dig/Makefile.in
-1.9.0
+--- bind-9.10.1b1/bin/dig/Makefile.in.libidn	2014-06-23 06:47:35.000000000 +0200
 +++ bind-9.10.1b1/bin/dig/Makefile.in	2014-07-29 15:47:00.566230478 +0200
@@ -48,10 +48,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS}
 		${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
 LIBS =		${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
 -		${ISCLIBS} @IDNLIBS@ @LIBS@
 +		${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
 NOSYMLIBS =	${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
 -		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
 +		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
 SUBDIRS =
@@ -69,6 +69,8 @@ HTMLPAGES =	dig.html host.html nslookup.
 MANOBJS =	${MANPAGES} ${HTMLPAGES}
 +EXT_CFLAGS = -DWITH_LIBIDN
 +
 @BIND9_MAKE_RULES@
 dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
--- a/bind.spec
+++ b/bind.spec
@ -3,7 +3,7 @@
 #
 %global PATCHVER P1
-#%%global PREVER rc2
+#%%global PREVER b2
 %global VERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 %{?!SDB:       %global SDB       1}
@ -23,8 +23,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  ISC
-Version:  9.9.6
+Version:  9.10.1
-Release:  6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -68,7 +68,6 @@ Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch109:bind97-rh478718.patch
 Patch110:bind97-rh570851.patch
 Patch111:bind97-exportlib.patch
 Patch112:bind97-rh645544.patch
 Patch119:bind97-rh693982.patch
 Patch123:bind98-rh735103.patch
@ -78,18 +77,16 @@ Patch131:bind-9.9.1-P2-multlib-conflict.patch
 Patch133:bind99-rh640538.patch
 Patch134:bind97-rh669163.patch
 Patch135:bind99-rh985918.patch
-# Native PKCS#11 functionality from 9.10
+# distribute native-pkcs#11 functionality
-Patch136:bind-9.9-native-pkcs11.patch
+Patch136:bind-9.10-dist-native-pkcs11.patch
 Patch137:bind-9.9-dist-native-pkcs11.patch
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
-Patch12: bind-9.5-sdb.patch
+Patch12: bind-9.10-sdb.patch
 Patch62: bind-9.5-sdb-sqlite-bld.patch
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
-Patch104: bind-99-dyndb.patch
+Patch104: bind-9.10-dyndb.patch
 # IDN paches
 # [ISC-Bugs #36101] IDN support in host/dig/nslookup using GNU libidn(2)
@ -246,6 +243,7 @@ Group:    Development/Libraries
 Obsoletes:bind-libbind-devel < 31:9.3.3-4.fc7
 Provides: bind-libbind-devel = 31:9.3.3-4.fc7
 Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: bind-lite-devel%{?_isa} = %{epoch}:%{version}-%{release}
 %description devel
 The bind-devel package contains full version of the header files and libraries
@ -302,28 +300,22 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %endif
 %patch73 -p1 -b .libidn
 %patch87 -p1 -b .parallel
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch109 -p1 -b .rh478718
 %patch110 -p1 -b .rh570851
 %patch111 -p1 -b .exportlib
 %patch112 -p1 -b .rh645544
 %patch119 -p1 -b .rh693982
 %patch123 -p1 -b .rh735103
 %patch125 -p1 -b .buildfix
 %patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
 %patch136 -p1 -b .native_pkcs11
 %if %{PKCS11}
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
 cp -r lib/isc{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
-cp -r lib/export/isc{,-pkcs11}
+%patch136 -p1 -b .dist_pkcs11
 cp -r lib/export/dns{,-pkcs11}
 %patch137 -p1 -b .dist_pkcs11
 %endif
 %if %{SDB}
@ -350,14 +342,9 @@ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/sdb_tools
 cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
 cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %patch12 -p1 -b .sdb
 %endif
 %if %{SDB}
 %patch17 -p1 -b .fix_sdb_ldap
 %endif
-%if %{SDB}
+
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
 %patch133 -p1 -b .rh640538
 %patch134 -p1 -b .rh669163
 %patch135 -p1 -b .rh985918
@ -368,9 +355,9 @@ for i in bin/named{,-sdb}/{,unix}/Makefile.in; do
  sed -i 's|fpie|fPIE|g' $i
 done
 %endif
 :;
 %build
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 export CPPFLAGS="$CPPFLAGS -DDIG_SIGCHASE"
@ -543,12 +530,10 @@ install -m 644 %{SOURCE12} contrib/sdb/pgsql/
 %endif
 # Install isc/errno2result.h header
-install -m 644 lib/isc/unix/errno2result.h ${RPM_BUILD_ROOT}%{_includedir}/isc
+install -m 644 lib/isc/unix/errno2result.h ${RPM_BUILD_ROOT}%{_includedir}/bind9/isc
 # Files required to run test-suite outside of build tree:
 cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9
 cp -fp lib/dns/include/dns/forward.h ${RPM_BUILD_ROOT}/%{_includedir}/dns
 cp -fp lib/isc/unix/include/isc/keyboard.h ${RPM_BUILD_ROOT}/%{_includedir}/isc
 # Remove libtool .la files:
 find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
@ -779,10 +764,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/NetworkManager/dispatcher.d/13-named
 %{_sbindir}/named-journalprint
 %{_sbindir}/named-checkconf
 %{_sbindir}/named-rrchecker
 %{_sbindir}/lwresd
 %{_sbindir}/named
 %{_sbindir}/rndc*
 %{_sbindir}/tsig-keygen
 %{_libexecdir}/generate-rndc-key.sh
 %{_mandir}/man1/named-rrchecker.1*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
 %{_mandir}/man8/rndc.8*
@ -790,6 +778,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/lwresd.8*
 %{_mandir}/man8/named-checkconf.8*
 %{_mandir}/man8/rndc-confgen.8*
 %{_mandir}/man8/tsig-keygen.8*
 %{_mandir}/man8/named-journalprint.8*
 %doc CHANGES README named.conf.default
 %doc doc/arm/*html doc/arm/*pdf
@ -813,9 +802,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(0640,root,named,0750)
 %ghost %config(noreplace) %{_sysconfdir}/rndc.key
 # ^- rndc.key now created on first install only if it does not exist
 # %%verify(not size,not md5) %%config(noreplace) %%attr(0640,root,named) /etc/rndc.conf
 # ^- Let the named internal default rndc.conf be used -
 #    rndc.conf not required unless it differs from default.
 %ghost %config(noreplace) %{_sysconfdir}/rndc.conf
 # ^- The default rndc.conf which uses rndc.key is in named's default internal config -
 #    so rndc.conf is not necessary.
@ -844,19 +830,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libbind9.so.90*
+%{_libdir}/libbind9.so.140*
-%{_libdir}/libdns.so.104*
+%{_libdir}/libisccc.so.140*
-%{_libdir}/libisc.so.95*
+%{_libdir}/liblwres.so.141*
 %{_libdir}/libisccc.so.90*
 %{_libdir}/libisccfg.so.90*
 %{_libdir}/liblwres.so.91*
 %files libs-lite
 %defattr(-,root,root,-)
-%{_libdir}/libdns-export.so.104*
+%{_libdir}/libdns.so.146*
-%{_libdir}/libirs-export.so.91*
+%{_libdir}/libirs.so.141*
-%{_libdir}/libisc-export.so.95*
+%{_libdir}/libisc.so.142*
-%{_libdir}/libisccfg-export.so.90*
+%{_libdir}/libisccfg.so.140*
 %files license
 %defattr(-,root,root,-)
@ -866,6 +849,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/dig
 %{_bindir}/delv
 %{_bindir}/host
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
@ -881,6 +865,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/host.1*
 %{_mandir}/man1/nsupdate.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/delv.1*
 %{_mandir}/man1/nslookup.1*
 %{_mandir}/man1/arpaname.1*
 %{_mandir}/man8/ddns-confgen.8*
@ -897,13 +882,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libbind9.so
 %{_libdir}/libdns.so
 %{_libdir}/libisc.so
 %{_libdir}/libisccc.so
 %{_libdir}/libisccfg.so
 %{_libdir}/liblwres.so
-%{_includedir}/bind9
+%{_includedir}/bind9/config.h
-%exclude %{_includedir}/bind9/pkcs11
+%{_includedir}/bind9/bind9
 %{_includedir}/bind9/isccc
 %{_includedir}/bind9/lwres
 %{_mandir}/man1/isc-config.sh.1*
 %{_mandir}/man1/bind9-config.1*
 %{_mandir}/man3/lwres*
@ -913,15 +897,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %files lite-devel
 %defattr(-,root,root,-)
-%{_libdir}/libdns-export.so
+%{_libdir}/libdns.so
-%{_libdir}/libirs-export.so
+%{_libdir}/libirs.so
-%{_libdir}/libisc-export.so
+%{_libdir}/libisc.so
-%{_libdir}/libisccfg-export.so
+%{_libdir}/libisccfg.so
-%{_includedir}/dns
+%{_includedir}/bind9/dns
-%{_includedir}/dst
+%{_includedir}/bind9/dst
-%{_includedir}/irs
+%{_includedir}/bind9/irs
-%{_includedir}/isc
+%{_includedir}/bind9/isc
-%{_includedir}/isccfg
+%{_includedir}/bind9/isccfg
 %files chroot
 %defattr(-,root,root,-)
@ -1002,22 +986,22 @@ rm -rf ${RPM_BUILD_ROOT}
 %files pkcs11-libs
 %defattr(-,root,root,-)
-%{_libdir}/libdns-pkcs11.so.104*
+%{_libdir}/libdns-pkcs11.so.146*
-%{_libdir}/libisc-pkcs11.so.95*
+%{_libdir}/libisc-pkcs11.so.142*
 %{_libdir}/libdns-pkcs11-export.so.104*
 %{_libdir}/libisc-pkcs11-export.so.95*
 %files pkcs11-devel
 %defattr(-,root,root,-)
 %{_includedir}/bind9/pk11
 %{_includedir}/bind9/pkcs11
 %{_libdir}/libdns-pkcs11.so
 %{_libdir}/libisc-pkcs11.so
 %{_libdir}/libdns-pkcs11-export.so
 %{_libdir}/libisc-pkcs11-export.so
 %endif
 %changelog
 * Tue Jan 13 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.1-1.P1
 - Update to 9.10.1-P1 stable
 * Fri Dec 12 2014 Tomas Hozza <thozza@redhat.com> - 32:9.9.6-6.P1
 - Drop downstream patch for nslookup/host rejected by upstream
--- a/bind98-rh735103.patch
+++ b/bind98-rh735103.patch
@ -1,7 +1,7 @@
-diff -up bind-9.8.1rc1/lib/isc/unix/socket.c.rh735103 bind-9.8.1rc1/lib/isc/unix/socket.c
+diff -up bind-9.10.1b1/lib/isc/unix/socket.c.rh735103 bind-9.10.1b1/lib/isc/unix/socket.c
--- bind-9.8.1rc1/lib/isc/unix/socket.c.rh735103	2011-07-29 04:19:20.000000000 +0200
+--- bind-9.10.1b1/lib/isc/unix/socket.c.rh735103	2014-06-23 06:47:35.000000000 +0200
-+++ bind-9.8.1rc1/lib/isc/unix/socket.c	2011-09-07 18:49:54.100215897 +0200
+++ bind-9.10.1b1/lib/isc/unix/socket.c	2014-07-29 16:25:27.172818662 +0200
-@@ -57,6 +57,20 @@
+@@ -67,6 +67,20 @@
 #include <isc/util.h>
 #include <isc/xml.h>
@ -22,18 +22,16 @@ diff -up bind-9.8.1rc1/lib/isc/unix/socket.c.rh735103 bind-9.8.1rc1/lib/isc/unix
 #ifdef ISC_PLATFORM_HAVESYSUNH
 #include <sys/un.h>
 #endif
-@@ -76,15 +90,6 @@
+@@ -86,13 +100,6 @@
 #include "errno2result.h"
 -/* See task.c about the following definition: */
 -#ifdef BIND9
 -#ifdef ISC_PLATFORM_USETHREADS
 -#define USE_WATCHER_THREAD
 -#else
 -#define USE_SHARED_MANAGER
 -#endif	/* ISC_PLATFORM_USETHREADS */
 -#endif	/* BIND9 */
 -
 #ifndef USE_WATCHER_THREAD
 #include "socket_p.h"
--- a/bind99-buildfix.patch
+++ b/bind99-buildfix.patch
@ -5,8 +5,8 @@ diff -up bind-9.9.4b1/bin/tests/system/Makefile.in.buildfix bind-9.9.4b1/bin/tes
 @BIND9_MAKE_INCLUDES@
-SUBDIRS =	builtin dlzexternal filter-aaaa lwresd rpz rrl \
+-SUBDIRS =	builtin dlzexternal filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
-+SUBDIRS =	builtin filter-aaaa lwresd rpz rrl \
+SUBDIRS =	builtin filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
 		rsabigexponent tkey tsiggss
 TARGETS =
 @BIND9_MAKE_RULES@
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 e4315fdea56983570d3a33702e925088  config-12.tar.bz2
-ca9d8f4d26e740668d361bfc50d90fc7  bind-9.9.6-P1.tar.gz
+bdb9af9db9d389f8b8b3db6e0bc1bfee  bind-9.10.1-P1.tar.gz
`@ -1,2 +1,2 @@`
	`e4315fdea56983570d3a33702e925088 config-12.tar.bz2`	`e4315fdea56983570d3a33702e925088 config-12.tar.bz2`
	`ca9d8f4d26e740668d361bfc50d90fc7 bind-9.9.6-P1.tar.gz`	`bdb9af9db9d389f8b8b3db6e0bc1bfee bind-9.10.1-P1.tar.gz`