From nobody Fri Mar 15 13:56:38 2024 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 4Tx5QH0JbVz5DStb; Fri, 15 Mar 2024 13:56:39 +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 4Tx5QG6cW8z4P4W; Fri, 15 Mar 2024 13:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710510998; 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=QzCNl3LQHRlJL7ndjctrrDKodQ17Jt8vhL81xSf3eHY=; b=JPhfGX92IQyJx+thaOGcZyem23PrOxdPD9WTF0hmXBNn+NRUzmuQ9UIaVF0Cz+a4ypDltl NkkfsRSg+f5t3f5Who8gLaSYiLSYYYnL45zOShhg5V9Fz32yjv5YcVQCm6eLKUU0TXL9J9 w4MVopMtw1io6hC+D4MhEDYP2AiM8YICZD21Dlz/74lxQ5kSlNJY9dA8G9+4UOgpIht/il 2vIg8fI7uyfWHT/QJO4sMVtwHX1oUlTyMdK/ia/iyTxzLc3v1G1/IhaDw99Fp4I+VW+3LR O96kPEN1DsFVF9VktDFLzFH+fQ9k4dI9m/7Jrs5C01+H+X9u0AHMq4L0/FaSYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710510998; a=rsa-sha256; cv=none; b=xNVGGddUmP8eYzz9IPfETeHZZf25qen9QnbkPL/h5wyU/1kUqobaXHqX0tvfs5+fWxMQry aiE1qX77nVGmL+MQMEB9wzBpqeSO5JKtiQh9V/q8zLgq+ELODwWQ64WUBOKccb8bS0/mbG YGxmXZQSLNfFPM9LbyunKsIOXzmCI4XupHkp5gMUXBchNU16KUnV+vp3tLl+yD3wcCBa2h Dt0YvjG5GoVoY42nQsOSRoknpKFE2Ps3HI1Uy3FoyZpMi7PQ0uEL2ckyd4K7TABZkMHnmz 0Y7wetyG4TNfbBqnZKFiFTbDLhypxtJUGSBMYsWgrbk+JMgQb/bOcsQUVNaXtw== 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=1710510998; 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=QzCNl3LQHRlJL7ndjctrrDKodQ17Jt8vhL81xSf3eHY=; b=NHnskgqnyXmUV+ZbAZf80AvD8Xfa3YTqBmxPP25dwFOdipSYNx+pFNdYXRyxlb2LJKPLgQ qYT41lNy7rxdujJFE26ool8GzRuAd71mr6GRNTHs6KJ8L/mmVE4dBxePbAjzFqYMyuwx9R /AVGUM4wl7W75JCXwZgr2bQ+ldVsdBpaXauuEqTPD8FS84oY9msc5uTaLlV+Ruy6hYhfzt lAiGl6Gv1FCdMPEsxAWWnpEStIWi5mBqcnJ9YlluE3VCQPpugt7ao0rjA0YdCEtrQUD6QX dGes5IECnGVkyx+N6+En/obzGCdVxljpisdaEMaq97qpsYsf1wO71s+GYPBgfw== 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 4Tx5QG6D1Wz1Ccb; Fri, 15 Mar 2024 13:56:38 +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 42FDucPW094821; Fri, 15 Mar 2024 13:56:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FDuc0b094818; Fri, 15 Mar 2024 13:56:38 GMT (envelope-from git) Date: Fri, 15 Mar 2024 13:56:38 GMT Message-Id: <202403151356.42FDuc0b094818@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: 37658ce90473 - main - security/pkcs11-helper: Fix build with libressl 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: 37658ce90473565f4ccf37655a1056920ccbd4c3 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=37658ce90473565f4ccf37655a1056920ccbd4c3 commit 37658ce90473565f4ccf37655a1056920ccbd4c3 Author: Felix Palmen AuthorDate: 2024-03-14 07:09:13 +0000 Commit: Felix Palmen CommitDate: 2024-03-15 13:56:13 +0000 security/pkcs11-helper: Fix build with libressl Approved by: portmgr (blanket, just-fix-it) --- security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c index e27454eb3d28..99db16701bc0 100644 --- a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c +++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c @@ -1,6 +1,6 @@ --- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC +++ lib/pkcs11h-openssl.c -@@ -235,9 +235,13 @@ DSA_meth_set1_name (DSA_METHOD *meth, const char *name +@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) static int DSA_meth_set1_name (DSA_METHOD *meth, const char *name) { @@ -14,6 +14,15 @@ } #endif +@@ -330,7 +334,7 @@ static struct { + #endif + } __openssl_methods; + +-#if OPENSSL_VERSION_NUMBER < 0x10100001L ++#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER) + static + int + __pkcs11h_openssl_ex_data_dup ( @@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup ( long argl, void *argp