From nobody Wed Jan 05 10:34:38 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 14D35192111A; Wed, 5 Jan 2022 10:34: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 4JTQpQ5qyqz4pxL; Wed, 5 Jan 2022 10:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A832628F1; Wed, 5 Jan 2022 10:34:38 +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 205AYcjN049456; Wed, 5 Jan 2022 10:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205AYcj3049455; Wed, 5 Jan 2022 10:34:38 GMT (envelope-from git) Date: Wed, 5 Jan 2022 10:34:38 GMT Message-Id: <202201051034.205AYcj3049455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8b2e795d0e7b - main - security/boringssl: update CONFLICTS 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b2e795d0e7b251885a391f79e668b6de90a7c0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641378878; 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=6vjw9pq3J4YuxbfzwJ4yM6qkMvluI54/a8DanRStm98=; b=FYttGXi4vsvzrqa4WNvw3S8+ymCQNPLCMn/tXa4Iklp7kgNggRUpGBWeZTxbRbWMhvWCZw mTlz50FKxoI46Vydn2epjbAtctMNsaMhvjrFtUyyGzQQ1QFSVEOkFMXlokynY3pPEex9M5 Q3Y/71AvBpgjoO0w/fGLVxyC/H8j8rTV4oU1HAp9mNRkx1M36xMbT6CbScG+YxCV7zetu8 JtFTWujEfQ+d/c972BWZtyVVku1PE1NRb8cEOzS6GS0kskXE+HWiMbObHUmtuWiMp6mvDh wC/Bl/fj8LVxfV0ClplV8oYv9jE3TD+oZzrgB/DGBIs2Lrpp0UrqEatlGTj9tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641378878; a=rsa-sha256; cv=none; b=NJwlCa21rM1raqRxigW1Fply2zh6UOmyLv2v4V9qOAOgg+PEGQB40fyWDVYYhrOAwdk5s+ JOl//sHUi+GMqJz6IeQcfMOzXglLfbINE1vRgW4VHNWHxBW7UCdcAW3ZP5dRt82hW7OCtb F8s9wE4blMlX6bXXB0xQnbi4aQiWyMmQQv/MtUVBaUZCY3oEflWeV3Rq24msPzUiDoBAhi B2E+UShK+fEghU9hrpnytNhnXLvKzG3GzffxtDqZN+SWWWga8FKKHrZqnSx1StmvCPGLdk 8itKNMT5eON5G0sH7H7bYykwNcwVnsRCOQ4BbbnrQVw3AGWvkwClWjfpbuBxBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b2e795d0e7b251885a391f79e668b6de90a7c0e commit 8b2e795d0e7b251885a391f79e668b6de90a7c0e Author: Sergey A. Osokin AuthorDate: 2022-01-05 10:33:30 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-05 10:33:30 +0000 security/boringssl: update CONFLICTS Suggested by: ashish --- security/boringssl/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index bb2d1b128463..39e2fa9e441e 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= boringssl PORTVERSION= 0.0.0.0.2021.12.21.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= ports@FreeBSD.org @@ -11,6 +11,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:insource cpe go:no_targets localbase perl5 +CONFLICTS_INSTALL= security/libressl \ + security/libressl-devel \ + security/openssl \ + security/openssl-devel \ + security/openssl-quictls + CPE_VENDOR= google USE_GITHUB= yes