current/SOURCES/bind97-dist-pkcs11.patch

diff -Naurp bind-9.9.5/configure.in bind-9.9.5.oden/configure.in
--- bind-9.9.5/configure.in     2014-02-02 14:04:57.222265597 +0100
+++ bind-9.9.5.oden/configure.in        2014-02-02 14:05:06.455266113 +0100
@@ -990,15 +990,16 @@ AC_ARG_WITH(pkcs11,
 case "$use_pkcs11" in
        no|'')
                AC_MSG_RESULT(disabled)
-               USE_PKCS11=''
                PKCS11_TOOLS=''
                ;;
        yes|*)
                AC_MSG_RESULT(using OpenSSL with PKCS11 support)
-               USE_PKCS11='-DUSE_PKCS11'
                PKCS11_TOOLS=pkcs11
                ;;
 esac
+# We don't want to automatically load engine because it needs to have openct,
+# opencryptoki and friends installed.
+USE_PKCS11=''
 AC_SUBST(USE_PKCS11)
 AC_SUBST(PKCS11_TOOLS)
 
1	diff -Naurp bind-9.9.5/configure.in bind-9.9.5.oden/configure.in
2	--- bind-9.9.5/configure.in 2014-02-02 14:04:57.222265597 +0100
3	+++ bind-9.9.5.oden/configure.in 2014-02-02 14:05:06.455266113 +0100
4	@@ -990,15 +990,16 @@ AC_ARG_WITH(pkcs11,
5	case "$use_pkcs11" in
6	no\|'')
7	AC_MSG_RESULT(disabled)
8	- USE_PKCS11=''
9	PKCS11_TOOLS=''
10	;;
11	yes\|*)
12	AC_MSG_RESULT(using OpenSSL with PKCS11 support)
13	- USE_PKCS11='-DUSE_PKCS11'
14	PKCS11_TOOLS=pkcs11
15	;;
16	esac
17	+# We don't want to automatically load engine because it needs to have openct,
18	+# opencryptoki and friends installed.
19	+USE_PKCS11=''
20	AC_SUBST(USE_PKCS11)
21	AC_SUBST(PKCS11_TOOLS)
22