diff options
Diffstat (limited to 'bind-9.10-dist-native-pkcs11.patch')
| -rw-r--r-- | bind-9.10-dist-native-pkcs11.patch | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index 41cf91f..8c94b1b 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 0bde24d..6435274 100644 +index 69c09d2..90527d7 100644 --- a/configure.in +++ b/configure.in @@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI) @@ -301,7 +301,7 @@ index 0bde24d..6435274 100644 # # was --with-randomdev specified? -@@ -1489,11 +1491,11 @@ fi +@@ -1495,11 +1497,11 @@ fi AC_MSG_CHECKING(for OpenSSL library) OPENSSL_WARNING= openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw" @@ -318,7 +318,7 @@ index 0bde24d..6435274 100644 if test "auto" = "$use_openssl" then -@@ -1506,6 +1508,7 @@ then +@@ -1512,6 +1514,7 @@ then fi done fi @@ -326,7 +326,7 @@ index 0bde24d..6435274 100644 OPENSSL_ECDSA="" OPENSSL_GOST="" gosttype="raw" -@@ -1526,16 +1529,17 @@ case "$with_gost" in +@@ -1532,16 +1535,17 @@ case "$with_gost" in ;; esac @@ -349,7 +349,7 @@ index 0bde24d..6435274 100644 no) AC_MSG_RESULT(no) DST_OPENSSL_INC="" -@@ -1557,11 +1561,11 @@ case "$use_openssl" in +@@ -1563,11 +1567,11 @@ case "$use_openssl" in If you don't want OpenSSL, use --without-openssl]) ;; *) @@ -366,7 +366,7 @@ index 0bde24d..6435274 100644 if test "yes" = "$use_openssl" then # User did not specify a path - guess it -@@ -1917,6 +1921,7 @@ AC_SUBST(OPENSSL_ECDSA) +@@ -1923,6 +1927,7 @@ AC_SUBST(OPENSSL_ECDSA) AC_SUBST(OPENSSL_GOST) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" @@ -374,7 +374,7 @@ index 0bde24d..6435274 100644 ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" -@@ -2212,6 +2217,7 @@ esac +@@ -2218,6 +2223,7 @@ esac AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKSRCS) AC_SUBST(CRYPTO) @@ -382,7 +382,7 @@ index 0bde24d..6435274 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_TEST) -@@ -5114,8 +5120,11 @@ AC_CONFIG_FILES([ +@@ -5131,8 +5137,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -394,7 +394,7 @@ index 0bde24d..6435274 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5216,6 +5225,10 @@ AC_CONFIG_FILES([ +@@ -5233,6 +5242,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -405,7 +405,7 @@ index 0bde24d..6435274 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -5240,6 +5253,24 @@ AC_CONFIG_FILES([ +@@ -5257,6 +5270,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -444,7 +444,7 @@ index 318450c..87cde21 100644 @BIND9_MAKE_RULES@ diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in -index a22b721..a38960b 100644 +index 257d5e5..4abcc49 100644 --- a/lib/dns-pkcs11/Makefile.in +++ b/lib/dns-pkcs11/Makefile.in @@ -23,16 +23,16 @@ VERSION=@BIND9_VERSION@ @@ -469,7 +469,7 @@ index a22b721..a38960b 100644 LIBS = @LIBS@ -@@ -136,30 +136,30 @@ version.@O@: version.c +@@ -135,15 +135,15 @@ version.@O@: version.c -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -487,10 +487,23 @@ index a22b721..a38960b 100644 - ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS} + ${OBJS} ${ISCLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS} --timestamp: libdns.@A@ -+timestamp: libdns-pkcs11.@A@ + include: gen + ${MAKE} include/dns/enumtype.h +@@ -169,25 +169,25 @@ code.h: gen + ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } + + gen: gen.c +- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ ++ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc-pkcs11/include \ + ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} + +-timestamp: include libdns.@A@ ++timestamp: include libdns-pkcs11.@A@ touch timestamp +-testdirs: libdns.@A@ ++testdirs: libdns-pkcs11.@A@ + installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} @@ -508,17 +521,8 @@ index a22b721..a38960b 100644 rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h rm -f include/dns/rdatastruct.h rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h -@@ -191,7 +191,7 @@ code.h: gen - ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } - - gen: gen.c -- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc-pkcs11/include \ - ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} - - rbtdb64.@O@: rbtdb64.c rbtdb.c diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in -index e5c4db0..c7a623c 100644 +index 3e0a7e3..3a6665f 100644 --- a/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in @@ -20,8 +20,8 @@ CINCLUDES = -I${srcdir}/unix/include \ @@ -532,7 +536,7 @@ index e5c4db0..c7a623c 100644 CWARNINGS = # Alphabetically -@@ -104,38 +104,38 @@ version.@O@: version.c +@@ -104,40 +104,40 @@ version.@O@: version.c -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -566,6 +570,9 @@ index e5c4db0..c7a623c 100644 +timestamp: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ touch timestamp +-testdirs: libisc.@A@ libisc-nosymtbl.@A@ ++testdirs: libisc-pkcs11.@A@ libisc-pkcs11-nosymtbl.@A@ + installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} |