FreeBSD Bugzilla – Attachment 241583 Details for
Bug 270931
dns/opendnssec2: Update to 2.1.12
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Improved patch to upgrade
opendnssec-2.1.12.diff (text/plain), 4.84 KB, created by
Jaap Akkerhuis
on 2023-04-19 13:28:43 UTC
(
hide
)
Description:
Improved patch to upgrade
Filename:
MIME Type:
Creator:
Jaap Akkerhuis
Created:
2023-04-19 13:28:43 UTC
Size:
4.84 KB
patch
obsolete
>diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile >index 43fadcfde6..817f903832 100644 >--- a/dns/opendnssec2/Makefile >+++ b/dns/opendnssec2/Makefile >@@ -1,9 +1,7 @@ > PORTNAME= opendnssec >-DISTVERSION= 2.1.10 >-PORTREVISION= 2 >+DISTVERSION= 2.1.12 > CATEGORIES= dns > MASTER_SITES= http://dist.opendnssec.org/source/ > > MAINTAINER= jaap@NLnetLabs.nl > COMMENT= Tool suite for maintaining DNSSEC >@@ -61,22 +59,21 @@ pre-build: > ${WRKSRC}/configure > > pre-install-MYSQL-on: >- ${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec >+ ${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' \ >+ ${WRKDIR}/opendnssec > > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \ >+ ${STAGEDIR}${DOCSDIR} > @${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert >- ${INSTALL_DATA} \ >- ${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \ >+ ${INSTALL_DATA} ${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \ > ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert >- ${INSTALL_DATA} \ >- ${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \ >+ ${INSTALL_DATA} ${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \ > ${STAGEDIR}${DOCSDIR} > ${REINPLACE_CMD} -e 's|enforcer/utils/|${DOCSDIR}/|' \ > ${STAGEDIR}${DOCSDIR}/MIGRATION >- ${INSTALL_DATA} \ >- ${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \ >+ ${INSTALL_DATA} ${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \ > ${STAGEDIR}${DOCSDIR} > ${REINPLACE_CMD} -e 's|../src/db/schema|${DOCSDIR}/schema|' \ > -e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \ >diff --git a/dns/opendnssec2/distinfo b/dns/opendnssec2/distinfo >index 7bff5192d8..7bab512360 100644 >--- a/dns/opendnssec2/distinfo >+++ b/dns/opendnssec2/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1631361191 >-SHA256 (opendnssec-2.1.10.tar.gz) = c0a8427de241118dccbf7abc508e4dd53fb75b45e9f386addbadae7ecc092756 >-SIZE (opendnssec-2.1.10.tar.gz) = 1142027 >+TIMESTAMP = 1668601009 >+SHA256 (opendnssec-2.1.12.tar.gz) = 50d7b9b0ccfc6a502784606ca4e5c03680fcf6425fb3947f45d8809ea8503e59 >+SIZE (opendnssec-2.1.12.tar.gz) = 1157828 >diff --git a/dns/opendnssec2/files/patch-libhsm_src_bin_hsmutil.c b/dns/opendnssec2/files/patch-libhsm_src_bin_hsmutil.c >new file mode 100644 >index 0000000000..55c4ef1ad0 >--- /dev/null >+++ b/dns/opendnssec2/files/patch-libhsm_src_bin_hsmutil.c >@@ -0,0 +1,27 @@ >+--- libhsm/src/bin/hsmutil.c.orig 2022-11-08 08:46:49 UTC >++++ libhsm/src/bin/hsmutil.c >+@@ -503,6 +503,7 @@ cmd_dnskey (int argc, char *argv[]) >+ } >+ break; >+ #if (LDNS_REVISION >= ((1<<16)|(7<<8)|(0))) >++#if (LDNS_BUILD_CONFIG_USE_ED25519 > 0) >+ case LDNS_SIGN_ED25519: >+ if (strcmp(key_info->algorithm_name, "EDDSA") != 0) { >+ printf("Not an EDDSA key, the key is of algorithm %s.\n", key_info->algorithm_name); >+@@ -521,6 +522,8 @@ cmd_dnskey (int argc, char *argv[]) >+ return -1; >+ } >+ break; >++#endif >++#if (LDNS_BUILD_CONFIG_USE_ED448 > 0) >+ case LDNS_SIGN_ED448: >+ if (strcmp(key_info->algorithm_name, "EDDSA") != 0) { >+ printf("Not an EDDSA key, the key is of algorithm %s.\n", key_info->algorithm_name); >+@@ -539,6 +542,7 @@ cmd_dnskey (int argc, char *argv[]) >+ return -1; >+ } >+ break; >++#endif >+ #endif >+ default: >+ printf("Invalid algorithm: %i\n", algo); >diff --git a/dns/opendnssec2/files/patch-libhsm_src_lib_libhsm.c b/dns/opendnssec2/files/patch-libhsm_src_lib_libhsm.c >new file mode 100644 >index 0000000000..d1a9385a0d >--- /dev/null >+++ b/dns/opendnssec2/files/patch-libhsm_src_lib_libhsm.c >@@ -0,0 +1,37 @@ >+--- libhsm/src/lib/libhsm.c.orig 2022-11-08 08:46:49 UTC >++++ libhsm/src/lib/libhsm.c >+@@ -2175,13 +2175,17 @@ hsm_sign_buffer(hsm_ctx_t *ctx, >+ sign_buf); >+ break; >+ #if (LDNS_REVISION >= ((1<<16)|(7<<8)|(0))) >++#if (LDNS_BUILD_CONFIG_USE_ED25519 > 0) >+ case LDNS_SIGN_ED25519: >+ data_direct = 1; >+ break; >++#endif >++#if (LDNS_BUILD_CONFIG_USE_ED448 > 0) >+ case LDNS_SIGN_ED448: >+ data_direct = 1; >+ break; >+ #endif >++#endif >+ default: >+ /* log error? or should we not even get here for >+ * unsupported algorithms? */ >+@@ -2225,12 +2229,16 @@ hsm_sign_buffer(hsm_ctx_t *ctx, >+ sign_mechanism.mechanism = CKM_ECDSA; >+ break; >+ #if (LDNS_REVISION >= ((1<<16)|(7<<8)|(0))) >++#ifdef LDNS_BUILD_CONFIG_ED25519 >+ case LDNS_SIGN_ED25519: >+ sign_mechanism.mechanism = CKM_EDDSA; >+ break; >++#endif >++#ifdef LDNS_BUILD_CONFIG_ED448 >+ case LDNS_SIGN_ED448: >+ sign_mechanism.mechanism = CKM_EDDSA; >+ break; >++#endif >+ #endif >+ default: >+ /* log error? or should we not even get here for
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=241583">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
jaap
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 270931
:
241581
|
241583
|
241675