From nobody Thu Oct 20 14:42:12 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 4MtVg85cppz4fVB7; Thu, 20 Oct 2022 14:42:12 +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 4MtVg857yGz41Jh; Thu, 20 Oct 2022 14:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666276932; 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=a6H0lmp/DwZ/jR7LlbxGkTfcUepSdWokFULgvs6xcBk=; b=irMn3mAXiUs5JtCchwqdNScHvQ2dwVbZuLHVOBOi/TT6OXqJmuX824rcx02cPaDUVnLkII KUy9GFDemVsNsdclZChjTaqQWSNHArzhNPVsc6f4aYWWhEsbURamNYl9XBOaBmuwJVuOdS g8F8btbEZfUSpV1sshbe8/Ht4hBwffzqwao9YrUBEjG42ct+UK1xC7ZHp+SwFbKKU7XghG DrxmwVDLLtXi9B65Yr7c4ozjvQfbr2ifSwLax/Vv9LzzTzMhaJS/xG+9guhpZPNgb9U6nl YTsEXmDo3tyRbUNTHizOwfdXhUbDycDbw21kfveLE9D3m1kb6h8vh/eAgM39PQ== 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 4MtVg84C8Fzv0g; Thu, 20 Oct 2022 14:42:12 +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 29KEgCUH065435; Thu, 20 Oct 2022 14:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KEgCn3065434; Thu, 20 Oct 2022 14:42:12 GMT (envelope-from git) Date: Thu, 20 Oct 2022 14:42:12 GMT Message-Id: <202210201442.29KEgCn3065434@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 371278e7b669 - main - security/pkcs11-helper: 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: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 371278e7b66943021159dbfa2c8f77c3ecafcc14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666276932; 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=a6H0lmp/DwZ/jR7LlbxGkTfcUepSdWokFULgvs6xcBk=; b=pU4jVG9SGg3j3XVREvh4/iHWYwLd/2X1axDi/Xi4SYceI4rrRbL3OQ80lGGawVWXDu4iVi JQIhRWtnSqCvNOGtb2UKxxybgxOcYVeP3RqhywphG5r8ahigRsZBMijf4aHNWVjtDdqblb ja+R4bK/ZIWphDQTnf/FC7gnjL+wlU2/REb7ZQR5RFmFqG/+ff4YbcDiJLaANscv6H6c5V d3jp+S3uqf27yJ0C+AnTxkBlW2cDJY9a2hwUigelPTj8Ao0oz7398rifmPwJiFfEPabB8A h+bmu7nbhCuQblpLIdKdlYFu6n/XcXEt/zMRpRTiF8NTDQ4g+p0YSA6uew1ZDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666276932; a=rsa-sha256; cv=none; b=Q+4cljzXr5FnvRmrOCeOwcR8ffjUfQXru3ewmyByFpZ5Lkg/BIsDPSVWJgXC4s4sZ3dMyI SqfyGXBr7nABCGZHeFnbxX4F50TQ3DVdsqG5u8uWoOyLWx1IDjl4o1nV5DTkLQjO22Eixp Mdl72sH2d18CELPpI9hLXqbL0f8rFv5WGc3VaoRBHFRL1BKx4HYU27ERkmj8quYK+R+Gb3 cDNPVHRgKJXmL3YSSMnk/FwBg7OViWaZcjqLFOZPejpVYjOXFwqFU5cfQJOdz7Q8u36BmJ lmUfJ6tIaZhU+sI8pTtCC8nDP1Qk0c/gIQBXfGpMDZzU4+gkFlb3TvO6o2q8Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=371278e7b66943021159dbfa2c8f77c3ecafcc14 commit 371278e7b66943021159dbfa2c8f77c3ecafcc14 Author: Alex Dupre AuthorDate: 2022-10-20 14:40:09 +0000 Commit: Alex Dupre CommitDate: 2022-10-20 14:42:10 +0000 security/pkcs11-helper: fix build with LibreSSL 3.5 Differential Revision: https://reviews.freebsd.org/D37053 --- security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c new file mode 100644 index 000000000000..e0bc64247fc7 --- /dev/null +++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c @@ -0,0 +1,16 @@ +--- lib/pkcs11h-openssl.c.orig 2022-10-20 14:36:14 UTC ++++ lib/pkcs11h-openssl.c +@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) + static int + DSA_meth_set1_name (DSA_METHOD *meth, const char *name) + { ++#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) ++ return 0; ++#else + CK_RV rv; + rv = _pkcs11h_mem_strdup ((void *)&meth->name, name); + return rv == CKR_OK ? 1 : 0; ++#endif + } + #endif +