From nobody Wed Dec 06 10:05:01 2023 X-Original-To: dev-commits-ports-all@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 4SlY193WDPz53BLQ; Wed, 6 Dec 2023 10:05:01 +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 4SlY192sZ9z3MrS; Wed, 6 Dec 2023 10:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701857101; 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=ty81FngSDBKU0En1YWuvLwDW8bLyj5Cax26LbrSY8w0=; b=cnqvBW4o+HPhTmpQsgq8Wkxmf4v2H3UdajRXdgCsY+cZrzpF40jzyWHLdcuxQP0REOQoON jJPQvww0Q5IMPirs6B0hUAO+SWzRhBP9sJPvUMSqwcolFV+nCJCK8BODipsUxIAzdnbt8t 2iwinav5zwYZPpg/Z5Mks24p9ntiAfnccgvbWg70rwcp2vzIfMTM4vAXJlRCvtXAMOeSA+ Edn/AvhlDWnURsyu15W+ZeGt7hd01NOa8kU6+ppsyHJY1y96cMXPrpYBJaDEjGXlOuyVJ7 fpZUtspeT7X1DI9EcUnItKzN0YdkuVqbhTsn0upj8Y+OKaupICwIMnJvnSgbLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701857101; a=rsa-sha256; cv=none; b=gQAg5eiWJR59XYkr7w7o+WIhUGsFbyO5QyzPYE5At70YoJnNBGVHMQPh2COuiSZmRZOz5g H/I0VUptn2Nxxd402Q2cWAWpin2ta60+A4lfDdEpqMrK71/JO9vlWS1Z47he2I4rlnjvj5 L3kXstJukH5zMqyLrDcVG/A4OYzSWD63E0IiBKe+XBzX6DejjeUgdwcXE0Uc6gAAck7GBb C17rQEamoln6EmO/OI9hnW2pHSFfk3qUd8aZqpwEjjilnkpCirz2ITWgcRB8vLwNWHPqDa VjfeDP1i2afSA4uz+Gk/B6GNp3okNN5AgCO7bbOANmpZVbug0uNrRLVA80vzTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701857101; 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=ty81FngSDBKU0En1YWuvLwDW8bLyj5Cax26LbrSY8w0=; b=L+gT1GteQBGXfDXhC0jnbz4JIFXcSmXNUvBZJzyBDjj1K1rSmJYyxNRIak/gDuL1vWdfAj bjL7oqPdjJB3y0pD7LlrNyMWJWTZ8gQThIYfDuUGrv34BaHQ4GBQ6cs81cKCx/d6e+mc6m RIz8Z4fHvQoumB86uVRvCdZ1RkNRVd5oWdO7HkC66PBQ/h/XepBkylbvRS8LRO+LiE79cj /XxMKi/halmnVNJU2G7kjA17YqH31Pik4jpdO0BjD6l7tukDlJT42LCgZ0MyXFlkv3wG7Q VEEpl99C+4UQW4JcJIfNWt98kKifqmP572+EDr9W/W5eNwBfyFKCM30EV/7d1g== 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 4SlY191cwszppF; Wed, 6 Dec 2023 10:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6A5177082505; Wed, 6 Dec 2023 10:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6A51bl082502; Wed, 6 Dec 2023 10:05:01 GMT (envelope-from git) Date: Wed, 6 Dec 2023 10:05:01 GMT Message-Id: <202312061005.3B6A51bl082502@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: ac15863de9de - main - security/p5-Net-SSLeay: Fix build with libressl3.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac15863de9de4d8be19412b1332593390f453272 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac15863de9de4d8be19412b1332593390f453272 commit ac15863de9de4d8be19412b1332593390f453272 Author: Felix Palmen AuthorDate: 2023-12-03 10:31:01 +0000 Commit: Felix Palmen CommitDate: 2023-12-06 10:04:15 +0000 security/p5-Net-SSLeay: Fix build with libressl3.8 Import patch to disable Policy Tree API with LibreSSL >= 3.8: https://github.com/openbsd/ports/commit/f6567f938c9bd51bfd99f8426eba6a1590cc6384 Approved by: portmgr (implicit, fix-it) Obtained from: OpenBSD --- security/p5-Net-SSLeay/files/patch-SSLeay.xs | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/security/p5-Net-SSLeay/files/patch-SSLeay.xs b/security/p5-Net-SSLeay/files/patch-SSLeay.xs index 9924ba28fd19..86e7f180e577 100644 --- a/security/p5-Net-SSLeay/files/patch-SSLeay.xs +++ b/security/p5-Net-SSLeay/files/patch-SSLeay.xs @@ -1,4 +1,4 @@ ---- SSLeay.xs.orig 2022-10-17 10:31:55 UTC +--- SSLeay.xs.orig 2022-01-10 19:05:48 UTC +++ SSLeay.xs @@ -685,7 +685,6 @@ static int ssleay_ctx_passwd_cb_invoke(char *buf, int } @@ -323,7 +323,23 @@ int X509_VERIFY_PARAM_add1_host(param, name) -@@ -7197,7 +7193,7 @@ ASN1_OBJECT * +@@ -7010,6 +7006,7 @@ X509_VERIFY_PARAM_get0_peername(param) + + #endif /* OpenSSL 1.0.2-beta2, LibreSSL 2.7.0 */ + ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3080000fL) /* LibreSSL < 3.8.0 */ + void + X509_policy_tree_free(tree) + X509_POLICY_TREE *tree +@@ -7052,6 +7049,7 @@ const X509_POLICY_NODE * + X509_policy_node_get0_parent(node) + const X509_POLICY_NODE *node + ++#endif /* !(LibreSSL >= 3.8.0) */ + #endif + + ASN1_OBJECT * +@@ -7197,7 +7195,7 @@ ASN1_OBJECT * P_X509_get_signature_alg(x) X509 * x CODE: @@ -332,7 +348,7 @@ RETVAL = (X509_get0_tbs_sigalg(x)->algorithm); #else RETVAL = (x->cert_info->signature->algorithm); -@@ -7239,7 +7235,7 @@ X509_get_X509_PUBKEY(x) +@@ -7239,7 +7237,7 @@ X509_get_X509_PUBKEY(x) XPUSHs(sv_2mortal(newSVpv((char*)pc,len))); Safefree(pc); @@ -341,7 +357,7 @@ int SSL_CTX_set_next_protos_advertised_cb(ctx,callback,data=&PL_sv_undef) -@@ -7690,7 +7686,7 @@ OCSP_response_results(rsp,...) +@@ -7690,7 +7688,7 @@ OCSP_response_results(rsp,...) if (!idsv) { /* getall: create new SV with OCSP_CERTID */ unsigned char *pi,*pc; @@ -350,7 +366,7 @@ int len = i2d_OCSP_CERTID((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sir),NULL); #else int len = i2d_OCSP_CERTID(sir->certId,NULL); -@@ -7699,7 +7695,7 @@ OCSP_response_results(rsp,...) +@@ -7699,7 +7697,7 @@ OCSP_response_results(rsp,...) Newx(pc,len,unsigned char); if (!pc) croak("out of memory"); pi = pc;