diff options
Diffstat (limited to 'bind-9.10-dist-native-pkcs11.patch')
| -rw-r--r-- | bind-9.10-dist-native-pkcs11.patch | 147 |
1 files changed, 81 insertions, 66 deletions
diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index a4e8dc2..41cf91f 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -1,5 +1,5 @@ diff --git a/bin/Makefile.in b/bin/Makefile.in -index e3aeffb..7654169 100644 +index f3cbed3..7d21984 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -10,7 +10,7 @@ srcdir = @srcdir@ @@ -12,14 +12,14 @@ index e3aeffb..7654169 100644 TARGETS = diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in -index 4f1bf90..b8dc6fe 100644 +index 8c6627a..0427349 100644 --- a/bin/dnssec-pkcs11/Makefile.in +++ b/bin/dnssec-pkcs11/Makefile.in -@@ -23,18 +23,18 @@ top_srcdir = @top_srcdir@ +@@ -14,18 +14,18 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ --CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} +-CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ +CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \ @@ -41,7 +41,7 @@ index 4f1bf90..b8dc6fe 100644 DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} -@@ -43,10 +43,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ +@@ -34,10 +34,10 @@ LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@ # Alphabetically @@ -56,7 +56,7 @@ index 4f1bf90..b8dc6fe 100644 OBJS = dnssectool.@O@ -@@ -67,15 +67,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} +@@ -58,15 +58,15 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @BIND9_MAKE_RULES@ @@ -75,7 +75,7 @@ index 4f1bf90..b8dc6fe 100644 export BASEOBJS="dnssec-keygen.@O@ ${OBJS}"; \ ${FINALBUILDCMD} -@@ -83,7 +83,7 @@ dnssec-signzone.@O@: dnssec-signzone.c +@@ -74,7 +74,7 @@ dnssec-signzone.@O@: dnssec-signzone.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ -c ${srcdir}/dnssec-signzone.c @@ -84,7 +84,7 @@ index 4f1bf90..b8dc6fe 100644 export BASEOBJS="dnssec-signzone.@O@ ${OBJS}"; \ ${FINALBUILDCMD} -@@ -91,19 +91,19 @@ dnssec-verify.@O@: dnssec-verify.c +@@ -82,19 +82,19 @@ dnssec-verify.@O@: dnssec-verify.c ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ -c ${srcdir}/dnssec-verify.c @@ -108,7 +108,7 @@ index 4f1bf90..b8dc6fe 100644 ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ dnssec-importkey.@O@ ${OBJS} ${LIBS} -@@ -114,11 +114,9 @@ docclean manclean maintainer-clean:: +@@ -105,14 +105,11 @@ docclean manclean maintainer-clean:: installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -118,15 +118,18 @@ index 4f1bf90..b8dc6fe 100644 for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done - for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done + uninstall:: +- for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done + for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t ; done + clean distclean:: - rm -f ${TARGETS} diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in -index 4f1bf90..e1132ea 100644 +index 8c6627a..c070881 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in -@@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@ +@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@ - CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} + CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ -CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \ +CDEFINES = -DVERSION=\"${VERSION}\" \ @@ -134,7 +137,7 @@ index 4f1bf90..e1132ea 100644 CWARNINGS = diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in -index 95e36c1..fb658e9 100644 +index 903023b..b40303d 100644 --- a/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in @@ -36,26 +36,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ @@ -189,7 +192,7 @@ index 95e36c1..fb658e9 100644 +TARGETS = named-pkcs11@EXEEXT@ GEOIPLINKOBJS = geoip.@O@ - + @@ -83,8 +83,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ zoneconf.@O@ \ @@ -219,7 +222,7 @@ index 95e36c1..fb658e9 100644 export MAKE_SYMTABLE="yes"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -@@ -166,15 +164,9 @@ statschannel.@O@: bind9.xsl.h +@@ -166,22 +164,12 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -235,13 +238,21 @@ index 95e36c1..fb658e9 100644 +install:: named-pkcs11@EXEEXT@ installdirs + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-pkcs11@EXEEXT@ ${DESTDIR}${sbindir} + uninstall:: +- rm -f ${DESTDIR}${mandir}/man5/named.conf.5 +- rm -f ${DESTDIR}${mandir}/man8/lwresd.8 +- rm -f ${DESTDIR}${mandir}/man8/named.8 +- rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@ +- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@ ++ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-pkcs11@EXEEXT@ + @DLZ_DRIVER_RULES@ diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in -index 95e36c1..ba5ec3c 100644 +index 903023b..9c14b73 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in -@@ -51,7 +51,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ +@@ -40,7 +40,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ @@ -251,10 +262,10 @@ index 95e36c1..ba5ec3c 100644 CWARNINGS = diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in -index dac3832..43d8241 100644 +index d9aa66b..1900e3c 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in -@@ -20,13 +20,13 @@ top_srcdir = @top_srcdir@ +@@ -12,13 +12,13 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ @@ -272,10 +283,10 @@ index dac3832..43d8241 100644 DEPLIBS = ${ISCDEPLIBS} diff --git a/configure.in b/configure.in -index a28f773..8f3b8f4 100644 +index 0bde24d..6435274 100644 --- a/configure.in +++ b/configure.in -@@ -982,12 +982,14 @@ AC_SUBST(USE_GSSAPI) +@@ -1116,12 +1116,14 @@ AC_SUBST(USE_GSSAPI) AC_SUBST(DST_GSSAPI_INC) AC_SUBST(DNS_GSSAPI_LIBS) DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS" @@ -290,24 +301,24 @@ index a28f773..8f3b8f4 100644 # # was --with-randomdev specified? -@@ -1383,11 +1385,11 @@ +@@ -1489,11 +1491,11 @@ fi AC_MSG_CHECKING(for OpenSSL library) OPENSSL_WARNING= openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw" --if test "$want_native_pkcs11" = "yes" +-if test "yes" = "$want_native_pkcs11" -then - use_openssl="native_pkcs11" - AC_MSG_RESULT(use of native PKCS11 instead) -fi -+# if test "$want_native_pkcs11" = "yes" -+# then -+# use_openssl="native_pkcs11" -+# AC_MSG_RESULT(use of native PKCS11 instead) -+# fi ++# if test "yes" = "$want_native_pkcs11" ++# then ++# use_openssl="native_pkcs11" ++# AC_MSG_RESULT(use of native PKCS11 instead) ++# fi - if test "$use_openssl" = "auto" + if test "auto" = "$use_openssl" then -@@ -1395,6 +1397,7 @@ then +@@ -1506,6 +1508,7 @@ then fi done fi @@ -315,7 +326,7 @@ index a28f773..8f3b8f4 100644 OPENSSL_ECDSA="" OPENSSL_GOST="" gosttype="raw" -@@ -1417,16 +1420,17 @@ case "$with_gost" in +@@ -1526,16 +1529,17 @@ case "$with_gost" in ;; esac @@ -338,32 +349,32 @@ index a28f773..8f3b8f4 100644 no) AC_MSG_RESULT(no) DST_OPENSSL_INC="" -@@ -1448,11 +1452,11 @@ case "$use_openssl" in +@@ -1557,11 +1561,11 @@ case "$use_openssl" in If you don't want OpenSSL, use --without-openssl]) ;; *) -- if test "$want_native_pkcs11" = "yes" +- if test "yes" = "$want_native_pkcs11" - then - AC_MSG_RESULT() - AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) - fi -+# if test "$want_native_pkcs11" = "yes" -+# then -+# AC_MSG_RESULT() -+# AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) -+# fi - if test "$use_openssl" = "yes" ++# if test "yes" = "$want_native_pkcs11" ++# then ++# AC_MSG_RESULT() ++# AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) ++# fi + if test "yes" = "$use_openssl" then # User did not specify a path - guess it -@@ -1776,6 +1780,7 @@ AC_SUBST(OPENSSL_ECDSA) +@@ -1917,6 +1921,7 @@ AC_SUBST(OPENSSL_ECDSA) AC_SUBST(OPENSSL_GOST) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" +DNS_CRYPTO_PK11_LIBS="$DNS_CRYPTO_LIBS" ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" - if test "$with_aes" = "yes" -@@ -2047,6 +2052,7 @@ esac + if test "yes" = "$with_aes" +@@ -2212,6 +2217,7 @@ esac AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKSRCS) AC_SUBST(CRYPTO) @@ -371,7 +382,7 @@ index a28f773..8f3b8f4 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_TEST) -@@ -4466,8 +4472,11 @@ AC_CONFIG_FILES([ +@@ -5114,8 +5120,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -383,7 +394,7 @@ index a28f773..8f3b8f4 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -4548,6 +4557,10 @@ AC_CONFIG_FILES([ +@@ -5216,6 +5225,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -394,7 +405,7 @@ index a28f773..8f3b8f4 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -4571,6 +4584,24 @@ AC_CONFIG_FILES([ +@@ -5240,6 +5253,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -420,10 +431,10 @@ index a28f773..8f3b8f4 100644 lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile diff --git a/lib/Makefile.in b/lib/Makefile.in -index 86302bd..318744f 100644 +index 318450c..87cde21 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in -@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ +@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ # Attempt to disable parallel processing. .NOTPARALLEL: .NO_PARALLEL: @@ -433,10 +444,10 @@ index 86302bd..318744f 100644 @BIND9_MAKE_RULES@ diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in -index 5f1ce56..830c0d5 100644 +index a22b721..a38960b 100644 --- a/lib/dns-pkcs11/Makefile.in +++ b/lib/dns-pkcs11/Makefile.in -@@ -28,16 +28,16 @@ top_srcdir = @top_srcdir@ +@@ -23,16 +23,16 @@ VERSION=@BIND9_VERSION@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@ @@ -458,7 +469,7 @@ index 5f1ce56..830c0d5 100644 LIBS = @LIBS@ -@@ -134,7 +134,7 @@ version.@O@: version.c +@@ -136,30 +136,30 @@ version.@O@: version.c -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -467,10 +478,6 @@ index 5f1ce56..830c0d5 100644 ${AR} ${ARFLAGS} $@ ${OBJS} ${RANLIB} $@ -@@ -144,23 +144,23 @@ dynamic_db.@O@: dynamic_db.c - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ - -libdns.la: ${OBJS} +libdns-pkcs11.la: ${OBJS} ${LIBTOOL_MODE_LINK} \ @@ -479,26 +486,30 @@ index 5f1ce56..830c0d5 100644 -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS} + ${OBJS} ${ISCLIBS} @DNS_CRYPTO_PK11_LIBS@ ${LIBS} - + -timestamp: libdns.@A@ +timestamp: libdns-pkcs11.@A@ touch timestamp - + installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} - + install:: timestamp installdirs - ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns.@A@ ${DESTDIR}${libdir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns-pkcs11.@A@ ${DESTDIR}${libdir} - + + uninstall:: +- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns.@A@ ++ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libdns-pkcs11.@A@ + clean distclean:: - rm -f libdns.@A@ timestamp + rm -f libdns-pkcs11.@A@ timestamp 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 -@@ -190,7 +190,7 @@ code.h: gen - ./gen -s ${srcdir} > code.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 \ @@ -507,10 +518,10 @@ index 5f1ce56..830c0d5 100644 rbtdb64.@O@: rbtdb64.c rbtdb.c diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in -index e0b2038..0f919a9 100644 +index e5c4db0..c7a623c 100644 --- a/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in -@@ -31,8 +31,8 @@ CINCLUDES = -I${srcdir}/unix/include \ +@@ -20,8 +20,8 @@ CINCLUDES = -I${srcdir}/unix/include \ -I${srcdir}/@ISC_THREAD_DIR@/include \ -I${srcdir}/@ISC_ARCH_DIR@/include \ -I./include \ @@ -521,7 +532,7 @@ index e0b2038..0f919a9 100644 CWARNINGS = # Alphabetically -@@ -111,35 +111,35 @@ version.@O@: version.c +@@ -104,38 +104,38 @@ version.@O@: version.c -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -562,16 +573,20 @@ index e0b2038..0f919a9 100644 - ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc-pkcs11.@A@ ${DESTDIR}${libdir} + uninstall:: +- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc.@A@ ++ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libisc-pkcs11.@A@ + clean distclean:: - rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \ - libisc-nosymtbl.la timestamp + 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 1d5e776..877dd38 100644 +index f41e3cd..b97534c 100644 --- a/make/includes.in +++ b/make/includes.in -@@ -49,3 +49,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ +@@ -40,3 +40,13 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ TEST_INCLUDES = \ -I${top_srcdir}/lib/tests/include |