From nobody Mon Jan 10 23:21:33 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 62732194B65B; Mon, 10 Jan 2022 23:21:34 +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 4JXqb20qKvz4ttN; Mon, 10 Jan 2022 23:21:34 +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 F07DB616C; Mon, 10 Jan 2022 23:21:33 +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 20ANLXss088356; Mon, 10 Jan 2022 23:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ANLXca088355; Mon, 10 Jan 2022 23:21:33 GMT (envelope-from git) Date: Mon, 10 Jan 2022 23:21:33 GMT Message-Id: <202201102321.20ANLXca088355@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 5600b7995f2a - main - security/openssl: add boringssl to CONFLICTS_INSTALL 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5600b7995f2ac6a53732950958ca27ca9e90ae70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641856894; 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=EHxzR/1bQNVXhnCNZdeyZLqO7+BrxT8QbF2RVKvxzqA=; b=VzEIt0wBSPdzDvS23HzgPLCKleLil5agfMA86QZhOnTRqRQNouLAbAYa86h14M1NyHCbC2 vmPqRulLs64veAvwoPu5Ndswm/GcaCZ2u/A8ZlAOMP4nZVvSBAIDGP3Oh60rgWph+TSY7d HJ+C0c9nJUaTYQIUmJjMr6ok1U1rP9rwrAygs4UL6r+u5FfDsrdB46ZOj0ffxfueayrMVW UNUtLtfBS+OemscAsWErzenbcMXRTuBHbE3F8rykTx+elt7b+RbxvoF4U3YOhI02Yp7pmX ysGBCkajeWkc7GgUyvDxGvPOfzkoYXcDeO+UKIAQQukQSp3UYMf4TMbKaCvQjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641856894; a=rsa-sha256; cv=none; b=DolFJEfDTTdGwj+JfI8s0OZO5BNGDzSd7Y3w+NCqshQnjzFF/MudMFAKs6xj1vb6tyv6Hg Y0qtoBxnoHu92A5Lo8ni2i97yeoFA7EFrt5Hfc4EmG3Uig18S0ZST+i27bjQ/gJ0/v9Do1 ZxfMek7QfD2NUO/B43Z7Hzx2jYE8hw8EXqAKIMoFdtuZTmDgahbpUrfuYwS//759ewWgRp lhHXLMqfF3ZsXa2thoCGP1H0JMmMn8AXwYRqoMikA4H+TE32msb9IgdG05cQzSjsMJtr5h JkoCj3NMlAbx9zRsj63HSurHzwWhcLOg2vPF792qELoTiQH0KxjngnMGO8hoYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=5600b7995f2ac6a53732950958ca27ca9e90ae70 commit 5600b7995f2ac6a53732950958ca27ca9e90ae70 Author: Stefan Eßer AuthorDate: 2022-01-10 23:19:35 +0000 Commit: Stefan Eßer CommitDate: 2022-01-10 23:19:35 +0000 security/openssl: add boringssl to CONFLICTS_INSTALL Approved by: portmgr (implicit) --- security/openssl-devel/Makefile | 2 +- security/openssl-quictls/Makefile | 2 +- security/openssl/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 8648b1c35820..ef68254d88fe 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -18,7 +18,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 34a30c704b29..784ab602f9d2 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -11,7 +11,7 @@ COMMENT= QUIC capable fork of OpenSSL LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-devel +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl-devel BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 01d4eb2b8efe..3412f4bfe25d 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -14,7 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libressl libressl-devel openssl-devel openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl-devel openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config