From nobody Sun Aug 07 14:42:35 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 4M129l5Rlcz4Y6G1; Sun, 7 Aug 2022 14:42:35 +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 4M129l51zhz3bgy; Sun, 7 Aug 2022 14:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659883355; 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=IKMq3zM+N45GW6HSTcqHtC8eyI1/zndIHxfKPblNaT4=; b=EcLi4J9Yi32WrXa6MYoT2+/maCCKhD7Pd50HP6LvQ1qLDqvCC/79vdqgD5ep9YFRVBnSWk mAJKbuMtpoiCasl83uji5Xa+ROEklyGoBVM0QV0lNL6DqUh34OKuYEuOlj3XLvAwMtXeZ0 zZcfwnyjDW5QRe1G/AFFBUis4tqSR+q3jfLmcH5NZV52wHAKpN76LnqCufFC9JQWAWC1+z hGuSFhAMZV+M2W6K2zScifrNbQvgXBHkUrUCdoTQ3zc7FrhgKp+hYF53cxizWYgsXMMa5P O3BC4gl3RJiey2gf1MDdN87JgKlhb1SPQSa5skO9c/KUmbxDPi8xmZI4nxvGOw== 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 4M129l45VfzGC9; Sun, 7 Aug 2022 14:42:35 +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 277EgZC2087230; Sun, 7 Aug 2022 14:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 277EgZPS087229; Sun, 7 Aug 2022 14:42:35 GMT (envelope-from git) Date: Sun, 7 Aug 2022 14:42:35 GMT Message-Id: <202208071442.277EgZPS087229@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: 0314ae446c30 - main - dns/ldns: Fix build with LibreSSL 3.5 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: 0314ae446c30516d462afeee0b9992836bff921c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659883355; 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=IKMq3zM+N45GW6HSTcqHtC8eyI1/zndIHxfKPblNaT4=; b=itZmnVnmwtBFUPLQm0jmRwXsj0kAZN3JRBBTjT/kreXGa9pGOHC7WZvvSPmLoD48KFZzcm inQta4V+onwkzp/ROJJEFaKh3qHEPMNK4iSLkD5KkvRio6JyHlcuQHrgUwfyC8ZqTgRQPi kd0lMv8RhDllA1nWNf/3F5fltRPj+xCRm4e16orHhpajxI2HDOOa1e/T2KUnH3nr/5wyJ8 uhcCgQpWCUKOGfGsuSL52qhkAwTWdsGOpEP7nS4hjvhOWPqLifxo253TcArZA+YXOVGLEn iRpjW0z7YAK6c5w+g+HGrGNT4XAXXOZvICk/Pv5u7b4etxtzAL6xNWmR5rtYOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659883355; a=rsa-sha256; cv=none; b=QKauv9avhckAYC6Y1P+NGR/7hGgApE3KucTOXGps3ThOdj2oINP+WTvJ9QvoAU2ODIeTSM LhCHjatLBsLVi5uQoiSKXeQU78LZS1prt8MnJ11Z325PKx9p6jQPMkA+oGp5c8Bo7v19QB dHTEyxvtLQOogLlmymzF6R2nXJiPYPUp6Gj8YO+AFA4dmUlF9rZjQlKi5jZdKVhchvy3mL ioqQqh9Fq1y1u/TneuaRdFNgXXJgGzZeMCKzUyTu8+TNTqQC7M6zhgbBNecSe+q3EH8Agv ID66vYDI84OeAJA6hfewalptJX/MvcUptcu5twotI/r0cy2hBCCS0NiMh9yqYw== 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=0314ae446c30516d462afeee0b9992836bff921c commit 0314ae446c30516d462afeee0b9992836bff921c Author: Bernard Spil AuthorDate: 2022-08-07 14:41:38 +0000 Commit: Bernard Spil CommitDate: 2022-08-07 14:41:38 +0000 dns/ldns: Fix build with LibreSSL 3.5 * Merged upstream https://github.com/NLnetLabs/ldns/pull/151 Approved by: Maintainer timeout --- dns/ldns/files/patch-LibreSSL-3.5 | 98 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dns/ldns/files/patch-LibreSSL-3.5 b/dns/ldns/files/patch-LibreSSL-3.5 new file mode 100644 index 000000000000..57f721cc614b --- /dev/null +++ b/dns/ldns/files/patch-LibreSSL-3.5 @@ -0,0 +1,98 @@ +diff --git a/dns/ldns/files/patch-LibreSSL-3.5 b/dns/ldns/files/patch-LibreSSL-3.5 +new file mode 100644 +index 000000000000..42af36a139eb +--- /dev/null ++++ b/dns/ldns/files/patch-LibreSSL-3.5 +@@ -0,0 +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