Attachment #241581 for bug #270931




PORTNAME=	opendnssec
DISTVERSION=	2.1.12
PORTREVISION=	2
CATEGORIES=	dns
MASTER_SITES=	http://dist.opendnssec.org/source/
PKGNAMESUFFIX=	2

MAINTAINER=	jaap@NLnetLabs.nl
COMMENT=	Tool suite for maintaining DNSSEC

		${WRKSRC}/configure

pre-install-MYSQL-on:
	${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' \
		${WRKDIR}/opendnssec

post-install-DOCS-on:
	@${MKDIR} ${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/|} \
		${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/|} \
		${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/|} \
		${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/&|' \

Lines 1-3 Link Here

(-)b/dns/opendnssec2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1631361191	1	TIMESTAMP = 1668601009
2	SHA256 (opendnssec-2.1.10.tar.gz) = c0a8427de241118dccbf7abc508e4dd53fb75b45e9f386addbadae7ecc092756	2	SHA256 (opendnssec-2.1.12.tar.gz) = 50d7b9b0ccfc6a502784606ca4e5c03680fcf6425fb3947f45d8809ea8503e59
3	SIZE (opendnssec-2.1.10.tar.gz) = 1142027	3	SIZE (opendnssec-2.1.12.tar.gz) = 1157828




--- 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);




--- 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

Return to bug 270931

Lines 1-9 Link Here

(-)b/dns/opendnssec2/Makefile (-11 / +8 lines)
1	PORTNAME= opendnssec	1	PORTNAME= opendnssec
2	DISTVERSION= 2.1.10	2	DISTVERSION= 2.1.12
3	PORTREVISION= 2
4	CATEGORIES= dns	3	CATEGORIES= dns
5	MASTER_SITES= http://dist.opendnssec.org/source/	4	MASTER_SITES= http://dist.opendnssec.org/source/
6	PKGNAMESUFFIX= 2
7		5
8	MAINTAINER= jaap@NLnetLabs.nl	6	MAINTAINER= jaap@NLnetLabs.nl
9	COMMENT= Tool suite for maintaining DNSSEC	7	COMMENT= Tool suite for maintaining DNSSEC
Lines 61-82 pre-build: Link Here
61	${WRKSRC}/configure	59	${WRKSRC}/configure
62		60
63	pre-install-MYSQL-on:	61	pre-install-MYSQL-on:
64	${REINPLACE_CMD} -e '/REQUIRE:/ s\|$$\| mysql\|' ${WRKDIR}/opendnssec	62	${REINPLACE_CMD} -e '/REQUIRE:/ s\|$$\| mysql\|' \
		63	${WRKDIR}/opendnssec
65		64
66	post-install-DOCS-on:	65	post-install-DOCS-on:
67	@${MKDIR} ${STAGEDIR}${DOCSDIR}	66	@${MKDIR} ${STAGEDIR}${DOCSDIR}
68	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	67	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} \
		68	${STAGEDIR}${DOCSDIR}
69	@${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert	69	@${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
70	${INSTALL_DATA} \	70	${INSTALL_DATA} ${MIGRATE:S\|^\|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/\|} \
71	${MIGRATE:S\|^\|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/\|} \
72	${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert	71	${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
73	${INSTALL_DATA} \	72	${INSTALL_DATA} ${CONVERT:S\|^\|${WRKSRC}/enforcer/utils/\|} \
74	${CONVERT:S\|^\|${WRKSRC}/enforcer/utils/\|} \
75	${STAGEDIR}${DOCSDIR}	73	${STAGEDIR}${DOCSDIR}
76	${REINPLACE_CMD} -e 's\|enforcer/utils/\|${DOCSDIR}/\|' \	74	${REINPLACE_CMD} -e 's\|enforcer/utils/\|${DOCSDIR}/\|' \
77	${STAGEDIR}${DOCSDIR}/MIGRATION	75	${STAGEDIR}${DOCSDIR}/MIGRATION
78	${INSTALL_DATA} \	76	${INSTALL_DATA} ${SCHEMAS:S\|^\|${WRKSRC}/enforcer/src/db/\|} \
79	${SCHEMAS:S\|^\|${WRKSRC}/enforcer/src/db/\|} \
80	${STAGEDIR}${DOCSDIR}	77	${STAGEDIR}${DOCSDIR}
81	${REINPLACE_CMD} -e 's\|../src/db/schema\|${DOCSDIR}/schema\|' \	78	${REINPLACE_CMD} -e 's\|../src/db/schema\|${DOCSDIR}/schema\|' \
82	-e 's\|mysql_convert.sql\|${DOCSDIR}/1.4-2.0_db_convert/&\|' \	79	-e 's\|mysql_convert.sql\|${DOCSDIR}/1.4-2.0_db_convert/&\|' \

Added Link Here

(-)b/dns/opendnssec2/files/patch-libhsm_src_bin_hsmutil.c (+27 lines)
1	--- libhsm/src/bin/hsmutil.c.orig 2022-11-08 08:46:49 UTC
2	+++ libhsm/src/bin/hsmutil.c
3	@@ -503,6 +503,7 @@ cmd_dnskey (int argc, char *argv[])
4	}
5	break;
6	#if (LDNS_REVISION >= ((1<<16)\|(7<<8)\|(0)))
7	+#if (LDNS_BUILD_CONFIG_USE_ED25519 > 0)
8	case LDNS_SIGN_ED25519:
9	if (strcmp(key_info->algorithm_name, "EDDSA") != 0) {
10	printf("Not an EDDSA key, the key is of algorithm %s.\n", key_info->algorithm_name);
11	@@ -521,6 +522,8 @@ cmd_dnskey (int argc, char *argv[])
12	return -1;
13	}
14	break;
15	+#endif
16	+#if (LDNS_BUILD_CONFIG_USE_ED448 > 0)
17	case LDNS_SIGN_ED448:
18	if (strcmp(key_info->algorithm_name, "EDDSA") != 0) {
19	printf("Not an EDDSA key, the key is of algorithm %s.\n", key_info->algorithm_name);
20	@@ -539,6 +542,7 @@ cmd_dnskey (int argc, char *argv[])
21	return -1;
22	}
23	break;
24	+#endif
25	#endif
26	default:
27	printf("Invalid algorithm: %i\n", algo);

Added Link Here

(-)b/dns/opendnssec2/files/patch-libhsm_src_lib_libhsm.c (+37 lines)
1	--- libhsm/src/lib/libhsm.c.orig 2022-11-08 08:46:49 UTC
2	+++ libhsm/src/lib/libhsm.c
3	@@ -2175,13 +2175,17 @@ hsm_sign_buffer(hsm_ctx_t *ctx,
4	sign_buf);
5	break;
6	#if (LDNS_REVISION >= ((1<<16)\|(7<<8)\|(0)))
7	+#if (LDNS_BUILD_CONFIG_USE_ED25519 > 0)
8	case LDNS_SIGN_ED25519:
9	data_direct = 1;
10	break;
11	+#endif
12	+#if (LDNS_BUILD_CONFIG_USE_ED448 > 0)
13	case LDNS_SIGN_ED448:
14	data_direct = 1;
15	break;
16	#endif
17	+#endif
18	default:
19	/* log error? or should we not even get here for
20	* unsupported algorithms? */
21	@@ -2225,12 +2229,16 @@ hsm_sign_buffer(hsm_ctx_t *ctx,
22	sign_mechanism.mechanism = CKM_ECDSA;
23	break;
24	#if (LDNS_REVISION >= ((1<<16)\|(7<<8)\|(0)))
25	+#ifdef LDNS_BUILD_CONFIG_ED25519
26	case LDNS_SIGN_ED25519:
27	sign_mechanism.mechanism = CKM_EDDSA;
28	break;
29	+#endif
30	+#ifdef LDNS_BUILD_CONFIG_ED448
31	case LDNS_SIGN_ED448:
32	sign_mechanism.mechanism = CKM_EDDSA;
33	break;
34	+#endif
35	#endif
36	default:
37	/* log error? or should we not even get here for