From nobody Wed Apr 5 17:34:15 2023 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 4PsBZb4GJZz43pDW; Wed, 5 Apr 2023 17:34:15 +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 4PsBZb3FyDz4DZm; Wed, 5 Apr 2023 17:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716055; 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=DxTJ5EjoltXxoLQzbYMVAHgFKdDgso79pYLnoh81q/0=; b=qCSX2u3ZN4vnuUCBYKWgEBHn646a4EZR/udJxlCzgFs8QeZ82HOvV+tcMyU9G7dl/+PxRP wAnmhyjyiy0hL8rFwRXRnzlrZWegEAzYOJS93oAYbq3dUbFXuLreDOcXC1ubpQty6xYmEU pU/f2OX5LZCiIxY5Q7uUwBNmSXJgsYO1HGo73CRP69WJZxLRA2cwlrYgzslemsYai+DqIx j1kS0Bb+4FB40r7TcsY5PcTOnmAkqaEdqthYEGqcjIh1Fr0ZQeh9do0k4RJes0/ANNcUHx 6qzkOtBHDu/iiiFxdlXAsR/smUa54CuPCpbX5CJfajFRsLRPBseNQ90Y49IyZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680716055; 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=DxTJ5EjoltXxoLQzbYMVAHgFKdDgso79pYLnoh81q/0=; b=nsNDJ+25JiktvQER6kEnEqnTRWfIpIbV0/6v5W16p+eCJ0mMj746IWGPMyZ/k1NU+DKYFV mkdpVXAbxlpsE1EoBABe5EQV0ezIrSyXLoUQ1H2Pr5Df/FnHAX8brms7mWuHR9AvzksPht 6LnC5vBs9SWPpZDqAmsXLllboXOFxCIEDQKnmtxIEUne1WGR24R1ABMKtzzoLxcl2joSKE XINrcBIwwKpSyxx8loYTLt9R8g5J9Rih9Dyr+bJP3Qvnw1nkTmOoXGVaPPcEw05zdtUkhg 3HLmCAIDPkVBUlZtoCWw9acVOmv9OcIzgDCCmnoCXtAnLsTGJj+utFqCt+f7wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680716055; a=rsa-sha256; cv=none; b=fHg3Jg2HwHSHE1pUX0GmLdTGOnLpe14jK6ltPycfqEos70K6PQJJL9WeG0YOBnnExyeOuO PMQmkN5SE58IP5oILEHFczrbEmXO2ayF+xTMtokiJYnaeKxwM7v+n/SUrQ01ozvdDCg/DM 0tZEUynbs6/GxhcxJCDmIZ+OKGgRowYBRkDrEErf25qTmtTWkg80Z0QuBlTlLwXYQnYXJz RmmdpTNicO4Re2efBTSutgj9WYYICXEO1IjwdWvv/lGhXO9iNL0jGvyHltKqvifAqwc67c whccc7u9XTRS9/Iqr7SeRjOKla+8ssdTd2FrkY1E/YR+oDBFglTTkXedcYDL9w== 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 4PsBZb2Jx2zWxK; Wed, 5 Apr 2023 17:34:15 +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 335HYFhT084350; Wed, 5 Apr 2023 17:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335HYFsJ084349; Wed, 5 Apr 2023 17:34:15 GMT (envelope-from git) Date: Wed, 5 Apr 2023 17:34:15 GMT Message-Id: <202304051734.335HYFsJ084349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6585097aaeec - main - security/libfido2: Skip libcrypto.pc conditionally since both 13-STABLE and 14-CURRENT have it now 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6585097aaeec97f823903be95540cdc759da8908 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6585097aaeec97f823903be95540cdc759da8908 commit 6585097aaeec97f823903be95540cdc759da8908 Author: Po-Chuan Hsieh AuthorDate: 2023-04-05 17:13:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-05 17:29:52 +0000 security/libfido2: Skip libcrypto.pc conditionally since both 13-STABLE and 14-CURRENT have it now --- security/libfido2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index f353514c09e0..555174d59a0c 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -23,8 +23,8 @@ OPTIONS_DEFINE= DOCS .include -# we do not ship libcrypto.pc in base system -.if ${SSL_DEFAULT} == base +# Skip libcrypto.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file +.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/libcrypto.pc) EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif