From nobody Tue Aug 09 10:20:03 2022 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 4M28Fw1ft2z4YRKy; Tue, 9 Aug 2022 10:20:04 +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 4M28Fw18rqz3VWC; Tue, 9 Aug 2022 10:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660040404; 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=lWJyb0YrxC4R0AFXeTu/DrbLEACszn1g4rTIWHH+zOE=; b=MNBESzz9vhUyWF7O9dyBiQpvrRG1tpq8rFaPH141D9VPcKu+U7AjUQGfFamAMpOoIH2vCg o1lAzJc4jZvO4+65Obvnlzgug4y/yX7di+W2CRiyMXSuPrsHwDCkEaYf3va+pOejhLITQV TTmq7929pDQVpXJb01Vxlk6JpDDb/FB8UI0T7VzVvuS9qxFTmIanE3DidhrPS15zddMZOZ E1PG0+hLWqS+E/TojoSWiYJQR15+Uz7lHPhXr/zOA96LdVXvqzuzVw3aBbgUBrd71z5nXW lwbj8x7Dh4YGqX3gZrluUWxgPL7GrWzfKw0i5K86WoTMNlL5o0F+x1aXjCDPCw== 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 4M28Fw0DRMzSbm; Tue, 9 Aug 2022 10:20:04 +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 279AK34B035160; Tue, 9 Aug 2022 10:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279AK32X035157; Tue, 9 Aug 2022 10:20:03 GMT (envelope-from git) Date: Tue, 9 Aug 2022 10:20:03 GMT Message-Id: <202208091020.279AK32X035157@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 29f6daa4544d - main - dns/ldns: Fix EOL 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29f6daa4544d556c847635f40c90f568c31301c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660040404; 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=lWJyb0YrxC4R0AFXeTu/DrbLEACszn1g4rTIWHH+zOE=; b=EzXJOIYFb/4HNWbXn1giLlGviKt1UJldMJ0N+UYIRm9oDPrlDPiuNx9GdjP8AgVShqpJVV DhrCdMQIoYF51NqoPQ1MGy1lAZshH6z4B2AVDZQgJx00OrEu/ZcXZoUGx9xjsHPb/+Q6Ag r7rK8lDTXFqfpyW/jxJiK5dzq1DDcP5deYUksXa+wa4ODb6hf1tS5Ojry1wOlJi32OxuWG 51KUCHYVJwYPcUpHm20MHEe4rH0OpqhWvhymiOEm2iABf2OfpXFmUrGfDpWkhQNaApwsPb xlDHXi9EGfqB5r5uVjk5s7cEMJd7Ry9tlP1MkVdohPB/MpIvJCgjcySx2hMYHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660040404; a=rsa-sha256; cv=none; b=wPmMqat3Gg8ZcpeEkV+T9PJUEafMiIxthYFL9siUfp2zyrpSIdjiu9khuLiGQdwZpt6C+j YXS5mcLswDUOXZDed6eSOA6tUsVOrFsqdZFdOfUDsFhz8cP1z5GY68OluJCJ/e/GE+LO+M /4tI0EITtDSlpiwGjuXgqBOz7Fz4ZQUSpX9Rm8WOBX2yclXWDNe+V+vaelczoTnclT6UNU vX6w7RQZLFD4y7SjaRvqcvt18l4NGsWOpI6A/e2wPrmy7Nb7iBPVGt6cWc9k2mrdOF+k6b BL+VjeQwLAxHjM+VpZvuIje8JIZwllt98vgGvgri8o8im1TpnkIET3xtjV7NCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=29f6daa4544d556c847635f40c90f568c31301c2 commit 29f6daa4544d556c847635f40c90f568c31301c2 Author: Bernard Spil AuthorDate: 2022-08-09 10:18:51 +0000 Commit: Bernard Spil CommitDate: 2022-08-09 10:18:51 +0000 dns/ldns: Fix EOL * Apologies for this very poor patching Reported by: leres --- dns/ldns/files/patch-LibreSSL-3.5 | 184 +++++++++++++++++++------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/dns/ldns/files/patch-LibreSSL-3.5 b/dns/ldns/files/patch-LibreSSL-3.5 index 240caba8f2b4..42af36a139eb 100644 --- a/dns/ldns/files/patch-LibreSSL-3.5 +++ b/dns/ldns/files/patch-LibreSSL-3.5 @@ -1,92 +1,92 @@ -From 887d618239312cc8c11e41c45492eee02a8f28a2 Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Tue, 11 Jan 2022 21:14:24 +0100 -Subject: [PATCH] Use accessors for DSA and RSA objects - -In the upcoming LibreSSL version 3.5, the DSA and RSA structs will -become opaque, so we should use the OpenSSL 1.1 setters and getters -to fix the build. The relevant API has been available since -LibreSSL 2.7. The last LibreSSL version (2.6) not having these -accessors was EOL late 2018, so no users should be affected by this -change. ---- - dnssec.c | 4 ++-- - host2str.c | 4 ++-- - keys.c | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dnssec.c b/dnssec.c -index 63fece52..fbaa518a 100644 ---- dnssec.c.orig -+++ dnssec.c -@@ -381,7 +381,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t len) - BN_free(Y); - return NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - #ifndef S_SPLINT_S - dsa->p = P; - dsa->q = Q; -@@ -468,7 +468,7 @@ ldns_key_buf2rsa_raw(const unsigned char* key, size_t len) - BN_free(modulus); - return NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - #ifndef S_SPLINT_S - rsa->n = modulus; - rsa->e = exponent; -diff --git a/host2str.c b/host2str.c -index a207a913..634c5676 100644 ---- host2str.c.orig -+++ host2str.c -@@ -2451,7 +2451,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) - const BIGNUM *n=NULL, *e=NULL, *d=NULL, - *p=NULL, *q=NULL, *dmp1=NULL, - *dmq1=NULL, *iqmp=NULL; --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - n = rsa->n; - e = rsa->e; - d = rsa->d; -@@ -2504,7 +2504,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) - if(1) { - const BIGNUM *p=NULL, *q=NULL, *g=NULL, - *priv_key=NULL, *pub_key=NULL; --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - #ifndef S_SPLINT_S - p = dsa->p; - q = dsa->q; -diff --git a/keys.c b/keys.c -index 91a3dffd..78bea972 100644 ---- keys.c.orig -+++ keys.c -@@ -861,7 +861,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr) - } - #endif /* splint */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - # ifndef S_SPLINT_S - rsa->n = n; - rsa->e = e; -@@ -982,7 +982,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr)) - } - #endif /* splint */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - # ifndef S_SPLINT_S - dsa->p = p; - dsa->q = q; -@@ -1660,7 +1660,7 @@ ldns_key_rsa2bin(unsigned char *data, RSA *k, uint16_t *size) - if (!k) { - return false; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) - n = k->n; - e = k->e; - #else +From 887d618239312cc8c11e41c45492eee02a8f28a2 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Tue, 11 Jan 2022 21:14:24 +0100 +Subject: [PATCH] Use accessors for DSA and RSA objects + +In the upcoming LibreSSL version 3.5, the DSA and RSA structs will +become opaque, so we should use the OpenSSL 1.1 setters and getters +to fix the build. The relevant API has been available since +LibreSSL 2.7. The last LibreSSL version (2.6) not having these +accessors was EOL late 2018, so no users should be affected by this +change. +--- + dnssec.c | 4 ++-- + host2str.c | 4 ++-- + keys.c | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/dnssec.c b/dnssec.c +index 63fece52..fbaa518a 100644 +--- dnssec.c.orig ++++ dnssec.c +@@ -381,7 +381,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t len) + BN_free(Y); + return NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + #ifndef S_SPLINT_S + dsa->p = P; + dsa->q = Q; +@@ -468,7 +468,7 @@ ldns_key_buf2rsa_raw(const unsigned char* key, size_t len) + BN_free(modulus); + return NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + #ifndef S_SPLINT_S + rsa->n = modulus; + rsa->e = exponent; +diff --git a/host2str.c b/host2str.c +index a207a913..634c5676 100644 +--- host2str.c.orig ++++ host2str.c +@@ -2451,7 +2451,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) + const BIGNUM *n=NULL, *e=NULL, *d=NULL, + *p=NULL, *q=NULL, *dmp1=NULL, + *dmq1=NULL, *iqmp=NULL; +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + n = rsa->n; + e = rsa->e; + d = rsa->d; +@@ -2504,7 +2504,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) + if(1) { + const BIGNUM *p=NULL, *q=NULL, *g=NULL, + *priv_key=NULL, *pub_key=NULL; +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + #ifndef S_SPLINT_S + p = dsa->p; + q = dsa->q; +diff --git a/keys.c b/keys.c +index 91a3dffd..78bea972 100644 +--- keys.c.orig ++++ keys.c +@@ -861,7 +861,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr) + } + #endif /* splint */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + # ifndef S_SPLINT_S + rsa->n = n; + rsa->e = e; +@@ -982,7 +982,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr)) + } + #endif /* splint */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + # ifndef S_SPLINT_S + dsa->p = p; + dsa->q = q; +@@ -1660,7 +1660,7 @@ ldns_key_rsa2bin(unsigned char *data, RSA *k, uint16_t *size) + if (!k) { + return false; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000) + n = k->n; + e = k->e; + #else