Added native PKCS#11 functionality

Resolves: rhbz#1097752
Signed-off-by: Tomas Hozza <thozza@redhat.com>

1 files changed, 34 insertions, 34 deletions

diff --git a/bind-9.5-sdb.patch b/bind-9.5-sdb.patch
index 270ec9e..99475e6 100644
--- a/bind-9.5-sdb.patch
+++ b/bind-9.5-sdb.patch
@@ -1,30 +1,30 @@
-diff -up bind-9.9.3rc1/bin/Makefile.in.sdb bind-9.9.3rc1/bin/Makefile.in
---- bind-9.9.3rc1/bin/Makefile.in.sdb	2013-04-05 00:21:21.000000000 +0200
-+++ bind-9.9.3rc1/bin/Makefile.in	2013-04-16 15:21:22.286944331 +0200
+diff -up bind-9.9.4-P2/bin/Makefile.in.sdb bind-9.9.4-P2/bin/Makefile.in
+--- bind-9.9.4-P2/bin/Makefile.in.sdb	2013-12-20 01:28:28.000000000 +0100
++++ bind-9.9.4-P2/bin/Makefile.in	2014-07-22 10:29:23.940233449 +0200
 @@ -19,8 +19,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
--SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
+-SUBDIRS =	named named-pkcs11 rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
 -		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
-+SUBDIRS =	named named-sdb rndc dig dnssec tools tests nsupdate \
++SUBDIRS =	named named-pkcs11 named-sdb rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
 +		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
  TARGETS =
  
  @BIND9_MAKE_RULES@
-diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefile.in
---- bind-9.9.3rc1/bin/named/Makefile.in.sdb	2013-04-16 15:21:22.102944727 +0200
-+++ bind-9.9.3rc1/bin/named/Makefile.in	2013-04-16 15:21:22.286944331 +0200
-@@ -49,7 +49,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
+diff -up bind-9.9.4-P2/bin/named/Makefile.in.sdb bind-9.9.4-P2/bin/named/Makefile.in
+--- bind-9.9.4-P2/bin/named/Makefile.in.sdb	2014-07-22 10:29:23.873233351 +0200
++++ bind-9.9.4-P2/bin/named/Makefile.in	2014-07-22 10:30:43.247348398 +0200
+@@ -52,7 +52,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
  		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
  		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
  
--CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @USE_OPENSSL@
-+CDEFINES =      @USE_PKCS11@ @USE_OPENSSL@
+-CDEFINES =      @CONTRIB_DLZ@ @CRYPTO@
++CDEFINES =      @CRYPTO@
  
  CWARNINGS =
  
-@@ -73,11 +73,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
+@@ -79,11 +79,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS}
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
  		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@@ -38,7 +38,7 @@ diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefil
  
  SUBDIRS =	unix
  
-@@ -90,8 +90,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
+@@ -96,8 +96,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O
  		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
  		zoneconf.@O@ \
  		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@@ -48,7 +48,7 @@ diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefil
  
  UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
  
-@@ -104,8 +103,7 @@ SRCS =		builtin.c client.c config.c cont
+@@ -110,8 +109,7 @@ SRCS =		builtin.c client.c config.c cont
  		tkeyconf.c tsigconf.c update.c xfrout.c \
  		zoneconf.c \
  		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@@ -58,7 +58,7 @@ diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefil
  
  MANPAGES =	named.8 lwresd.8 named.conf.5
  
-@@ -180,7 +178,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
+@@ -187,7 +185,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
  	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
  	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
  
@@ -66,9 +66,9 @@ diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefil
 -
  named-symtbl.@O@: named-symtbl.c
  	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
-diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main.c
---- bind-9.9.3rc1/bin/named-sdb/main.c.sdb	2013-04-16 15:21:22.249944411 +0200
-+++ bind-9.9.3rc1/bin/named-sdb/main.c	2013-04-16 15:21:22.287944329 +0200
+diff -up bind-9.9.4-P2/bin/named-sdb/main.c.sdb bind-9.9.4-P2/bin/named-sdb/main.c
+--- bind-9.9.4-P2/bin/named-sdb/main.c.sdb	2014-07-22 10:29:23.919233417 +0200
++++ bind-9.9.4-P2/bin/named-sdb/main.c	2014-07-22 10:29:23.940233449 +0200
 @@ -83,6 +83,9 @@
   * Include header files for database drivers here.
   */
@@ -79,7 +79,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main
  
  #ifdef CONTRIB_DLZ
  /*
-@@ -808,6 +811,10 @@ setup(void) {
+@@ -814,6 +817,10 @@ setup(void) {
  		ns_main_earlyfatal("isc_app_start() failed: %s",
  				   isc_result_totext(result));
  
@@ -90,7 +90,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main
  	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);
-@@ -920,6 +927,57 @@ setup(void) {
+@@ -926,6 +933,57 @@ setup(void) {
  				   isc_result_totext(result));
  #endif
  
@@ -148,7 +148,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main
  	ns_server_create(ns_g_mctx, &ns_g_server);
  }
  
-@@ -951,6 +1009,10 @@ cleanup(void) {
+@@ -957,6 +1015,10 @@ cleanup(void) {
  
  	dns_name_destroy();
  
@@ -159,10 +159,10 @@ diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
  		      ISC_LOG_NOTICE, "exiting");
  	ns_log_shutdown();
-diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb/Makefile.in
---- bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb	2013-04-16 15:21:22.243944424 +0200
-+++ bind-9.9.3rc1/bin/named-sdb/Makefile.in	2013-04-16 15:21:22.287944329 +0200
-@@ -32,10 +32,10 @@ top_srcdir =	@top_srcdir@
+diff -up bind-9.9.4-P2/bin/named-sdb/Makefile.in.sdb bind-9.9.4-P2/bin/named-sdb/Makefile.in
+--- bind-9.9.4-P2/bin/named-sdb/Makefile.in.sdb	2014-07-22 10:29:23.917233415 +0200
++++ bind-9.9.4-P2/bin/named-sdb/Makefile.in	2014-07-22 10:29:23.941233449 +0200
+@@ -34,10 +34,10 @@ top_srcdir =	@top_srcdir@
  #
  # Add database drivers here.
  #
@@ -176,7 +176,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb
  
  DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
  
-@@ -81,7 +81,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
+@@ -87,7 +87,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BI
  
  SUBDIRS =	unix
  
@@ -185,7 +185,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb
  
  OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
  		controlconf.@O@ interfacemgr.@O@ \
-@@ -139,7 +139,7 @@ config.@O@: config.c bind.keys.h
+@@ -146,7 +146,7 @@ config.@O@: config.c bind.keys.h
  		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
  		-c ${srcdir}/config.c
  
@@ -194,7 +194,7 @@ diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb
  	export MAKE_SYMTABLE="yes"; \
  	export BASEOBJS="${OBJS} ${UOBJS}"; \
  	${FINALBUILDCMD}
-@@ -170,15 +170,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3
+@@ -177,15 +177,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3
  
  installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@@ -212,12 +212,12 @@ diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb
  
  @DLZ_DRIVER_RULES@
  
-diff -up bind-9.9.3rc1/configure.in.sdb bind-9.9.3rc1/configure.in
---- bind-9.9.3rc1/configure.in.sdb	2013-04-16 15:21:22.208944499 +0200
-+++ bind-9.9.3rc1/configure.in	2013-04-16 15:21:19.395950103 +0200
-@@ -3651,12 +3651,15 @@ AC_CONFIG_FILES([
- 	bin/dnssec/Makefile
- 	bin/named/Makefile
+diff -up bind-9.9.4-P2/configure.in.sdb bind-9.9.4-P2/configure.in
+--- bind-9.9.4-P2/configure.in.sdb	2014-07-22 10:29:23.909233403 +0200
++++ bind-9.9.4-P2/configure.in	2014-07-22 10:29:23.942233450 +0200
+@@ -3900,12 +3900,15 @@ AC_CONFIG_FILES([
+ 	bin/named-pkcs11/Makefile
+ 	bin/named-pkcs11/unix/Makefile
  	bin/named/unix/Makefile
 +	bin/named-sdb/Makefile
 +	bin/named-sdb/unix/Makefile