From nobody Sun Apr 23 17:19:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q4FNz4Qhhz46C4v; Sun, 23 Apr 2023 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q4FNz3HzMz3slD; Sun, 23 Apr 2023 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682270355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHY25Spt2iXjboEzFZ7BFjkJQPxANfpO6A1NoWxMj68=; b=UqfwFs+yzq++u1wjk0qSG3/7tKiudmPgFqqnRzEBSJpm8ljZhcVzeet4/N0XaLL8N9URf/ QYLLkEXwvasyajfql1E26J8NdiyCxxriOXrSaQCSpSgqpjaQ+l/ptbLC/ik2j88U2Pxk05 WOTKEjbDtnZHiH84Vc9VscB6dGYR5Kk7J4Tn+ZBxWHDLrqb4vYiZN5dhHVYSKH2M1iszyM e5WFxGVR+xktZ/BzzymeZ1lCdMAOjrcb13wRmAbByUJMphox7P5rv0jiYuv8QsXtqpLQ0h LIFx2zxxNhGPyZDb0j7XLyfvKneJ0l5f/5QeYziSP6VPokp/bgYRI5GKxo27Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682270355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHY25Spt2iXjboEzFZ7BFjkJQPxANfpO6A1NoWxMj68=; b=NO+q8AgPy1aWLx0up4pM0lxOllHDp4rRs/ySqe/YoJzmxR6dzIBEJloNjqi1gyUd62OlDL TOHC5wFYyOS0UK418bmT1WxSL+xCy3aN3XmwX9uVCKYaWt0QTMeXM81DadNECsVyj1zwD4 EvwN09H1h++w1BKzQ8cOrJjQs238vaUWjCkYEu0NYgpRuKLPeuFZcd0R8+DmX57D60TbyK MpHyyr7krfEScKM1ualAH8vnKVcvhJrR1t4w13Fn5gDwsEIxymGZUkEMgadJeO9Md/BoR/ /5K6VG8c1iB7QzbFCNPLQmEhVJtBZ0ZREUKp5V+nYbZXIlBuXuDkVl4oY/iYLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682270355; a=rsa-sha256; cv=none; b=QApzXr0g9R4roSfFfpKeoy5rvaT9mSA53GbCNKanlJSLkdBT8bEGFxcrT0LiVh7xalRPmL jxvFupqZ60XyHEVnetHZYGQCGM6VT8qWs/yeYwUBTWjxnBHAErSANODE9QQyOCYU6Bybtw 9T2ExNWR2k69mzRpjXls6qYSJFCeB2Wrjjz9p+hAloICODGrbq9rjt6C5/akJhKD5qmDrE ecNLf4CkF0y4QpLQztnldEpk1v6j6J/IGEHj7iFMIRoHPikLMI7KTeXxLAggUeFYHIq/UO 1wIlnlgmaK64lwSlEC4++5vGOHj6KlWof006DlDLSpAQQoqROMsZhZfB+CrZ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q4FNz2LfhzrlV; Sun, 23 Apr 2023 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33NHJFGZ061660; Sun, 23 Apr 2023 17:19:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33NHJFgO061659; Sun, 23 Apr 2023 17:19:15 GMT (envelope-from git) Date: Sun, 23 Apr 2023 17:19:15 GMT Message-Id: <202304231719.33NHJFgO061659@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: dae0316326d9 - main - dns/opendnssec2: update to 2.1.12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dae0316326d93d331f90a11ea8564b5441b8db29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=dae0316326d93d331f90a11ea8564b5441b8db29 commit dae0316326d93d331f90a11ea8564b5441b8db29 Author: Jaap Akkerhuis AuthorDate: 2023-04-23 12:39:57 +0000 Commit: Robert Clausecker CommitDate: 2023-04-23 17:17:06 +0000 dns/opendnssec2: update to 2.1.12 Changelog: https://www.opendnssec.org/2022/11/opendnssec-2-1-12 PR: 270931 --- dns/opendnssec2/Makefile | 18 +++++------ dns/opendnssec2/distinfo | 6 ++-- .../files/patch-libhsm_src_bin_hsmutil.c | 27 ++++++++++++++++ .../files/patch-libhsm_src_lib_libhsm.c | 37 ++++++++++++++++++++++ 4 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile index 43fadcfde6d7..3dda04cc712c 100644 --- a/dns/opendnssec2/Makefile +++ b/dns/opendnssec2/Makefile @@ -1,6 +1,5 @@ PORTNAME= opendnssec -DISTVERSION= 2.1.10 -PORTREVISION= 2 +DISTVERSION= 2.1.12 CATEGORIES= dns MASTER_SITES= http://dist.opendnssec.org/source/ PKGNAMESUFFIX= 2 @@ -61,22 +60,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 7bff5192d8f8..7bab5123602a 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 000000000000..55c4ef1ad0f3 --- /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 000000000000..d1a9385a0d63 --- /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