diff options
author | Petr Menšík <pemensik@redhat.com> | 2017-08-01 11:44:10 +0200 |
---|---|---|
committer | Petr Menšík <pemensik@redhat.com> | 2017-08-14 12:17:30 +0200 |
commit | 7584e54e6ce9531a3d5863c0fdd8fedea9214a66 (patch) | |
tree | 0a16a6b7b86952110f4f1ab72047f33dcf7e4a9f /bind-9.10-dist-native-pkcs11.patch | |
parent | 79d28ed32a9be4fd6a1ec589ad2e53abc71cafdb (diff) | |
download | bind-7584e54e6ce9531a3d5863c0fdd8fedea9214a66.tar.gz bind-7584e54e6ce9531a3d5863c0fdd8fedea9214a66.tar.xz bind-7584e54e6ce9531a3d5863c0fdd8fedea9214a66.zip |
Update to 9.11.2
Diffstat (limited to 'bind-9.10-dist-native-pkcs11.patch')
-rw-r--r-- | bind-9.10-dist-native-pkcs11.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index 8c94b1b..fd3f0bc 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -283,7 +283,7 @@ index d9aa66b..1900e3c 100644 DEPLIBS = ${ISCDEPLIBS} diff --git a/configure.in b/configure.in -index 69c09d2..90527d7 100644 +index 9e1016d..0940743 100644 --- a/configure.in +++ b/configure.in @@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI) @@ -382,7 +382,7 @@ index 69c09d2..90527d7 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_TEST) -@@ -5131,8 +5137,11 @@ AC_CONFIG_FILES([ +@@ -5137,8 +5143,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -394,7 +394,7 @@ index 69c09d2..90527d7 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5233,6 +5242,10 @@ AC_CONFIG_FILES([ +@@ -5239,6 +5248,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -405,7 +405,7 @@ index 69c09d2..90527d7 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -5257,6 +5270,24 @@ AC_CONFIG_FILES([ +@@ -5263,6 +5276,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -522,14 +522,14 @@ index 257d5e5..4abcc49 100644 rm -f include/dns/rdatastruct.h rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in -index 3e0a7e3..3a6665f 100644 +index bd8b109..3a6665f 100644 --- a/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in @@ -20,8 +20,8 @@ CINCLUDES = -I${srcdir}/unix/include \ -I${srcdir}/@ISC_THREAD_DIR@/include \ -I${srcdir}/@ISC_ARCH_DIR@/include \ -I./include \ -- -I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES} +- -I${srcdir}/include ${DNS_INCLUDES} @ISC_OPENSSL_INC@ -CDEFINES = @CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\" + -I${srcdir}/include ${DNS_PKCS11_INCLUDES} +CDEFINES = @CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"${PROVIDER}\" |