From nobody Sat Oct 14 17:30:55 2023 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 4S79Q76QvPz4x2rL; Sat, 14 Oct 2023 17:30:55 +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 4S79Q75NzFz4QPw; Sat, 14 Oct 2023 17:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697304655; 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=eGJDCfYGtmEVBNCyvTYX/ujml8Rz/ETbl1P2nCZ1rRI=; b=XtXNhz6Vu1cZPP1eBJHy6Y54iwuxC8OG2XxCxfOj3Fr78iwiuC/L+mY4UyQNFJa1xfMKnk 7d68gbsLYJnTiYnXzcvHmyP1BesbKYdbZJC3Tx/2caSfLkLs8bu+1R2Oi7SgHxqn0J2aEj HuBB7NHxb+5sNha/N2JQy3096MjLaQIe6vsH5BXV3PLBPm+t+Vs4bDldPIbFkiLQYdqDCR 05M6B3H4CnT1cuLQybdFYZSvXF+iweKGHTPAyBAos0smSwZFMoOuCDyKzUSd/1QMvTsdfv UCjRkfphjcYxPoBF0Vef2BcSOQ1GAUPvVjg8/6fRpqyZmxfIyK3kLwjkQatu4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697304655; a=rsa-sha256; cv=none; b=agYUtcDt3JwowsKmPVIvpB4JFFU+IZXSo52vBLh5zm7HVqU5EwmNfIwb48HkD3enQcNc9p b1N/yPvtspDS83efyDFr8HDqJyiu/51ki6vcK0MW7NKvBFsCkckewiGo9yieGUqQoEPaiw fWJ+oDxtacFyGvjMuUd4y5KY0+NTdGFHYtLquXyONdKfq3VWmg1fM/Tj2gsAH1+2gkNwKk b2xJYcWuSMUtLnCYoX68O9SlzOrUXoW0bvg/UWMUkhpk09GE03d+yNynL4lsDhKIOPvXoY QYUrKGpx/GyjxNJ5kFcYXoEbp4RTIagC108hRXTvIYpKejMT6Wm+Ctn5e+f3uA== 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=1697304655; 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=eGJDCfYGtmEVBNCyvTYX/ujml8Rz/ETbl1P2nCZ1rRI=; b=K8zqL7UUDbxv7PaD3K/g6ZrbSRW0i6tWmrFZVtndohAETVGSGwWSvrRPNuvy2jybrUmQQO MKUPzyLc51kgMHpQHE4inXaktXROhmoU7djUyhxSBFTCdeeFJOiMluZ2SCW/ClYWPVetnc wFfb3Tp7+uq8Mv8PpGdlb4MGGGPucdde4F7ZOVTqi3FZ2x4JatWy2X57f+2TXd+rwIwx5Y z88v8RAW75Mzh28uCiaU91EXZ4p7+0DMhixcmFICoag7xIZzcvXuSrbi2ApI9lgOlX57ef g+YF85brXGpi/GwgDHXheITTUcutlrbopO6sImUMPsBtZ4OZ9PRdQs1ClNPrhQ== 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 4S79Q74206zfWd; Sat, 14 Oct 2023 17:30:55 +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 39EHUt8H090566; Sat, 14 Oct 2023 17:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EHUt6Y090564; Sat, 14 Oct 2023 17:30:55 GMT (envelope-from git) Date: Sat, 14 Oct 2023 17:30:55 GMT Message-Id: <202310141730.39EHUt6Y090564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: f63fc9b47d8c - main - security/openssl111: Chase addition/removal in CONFLICTS 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f63fc9b47d8cb1d0f85376a279ca6a2acfc2d62c Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f63fc9b47d8cb1d0f85376a279ca6a2acfc2d62c commit f63fc9b47d8cb1d0f85376a279ca6a2acfc2d62c Author: Bernard Spil AuthorDate: 2023-10-14 17:18:52 +0000 Commit: Bernard Spil CommitDate: 2023-10-14 17:23:12 +0000 security/openssl111: Chase addition/removal in CONFLICTS --- security/libressl-devel/Makefile | 2 +- security/libressl/Makefile | 4 +--- security/openssl-quictls/Makefile | 2 +- security/openssl31/Makefile | 4 +++- security/openssl32/Makefile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index be23b1c50546..f8e305bdabed 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -28,7 +28,7 @@ NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl \ libretls -default_CONFLICTS_INSTALL= openssl openssl3[012] openssl-quictls +default_CONFLICTS_INSTALL= openssl openssl111 openssl3[12] openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/libressl/Makefile b/security/libressl/Makefile index ee7101d2e1b8..57333a08172e 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -27,9 +27,7 @@ NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl-devel libtls_CONFLICTS_INSTALL= libretls -default_CONFLICTS_INSTALL= openssl \ - openssl3[012] \ - openssl-quictls +default_CONFLICTS_INSTALL= openssl openssl111 openssl3[12] openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 9e2e1f996919..9ff5f6b8321e 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -10,7 +10,7 @@ WWW= https://www.github.com/quictls/openssl LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[012] +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[12] BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index bea63e395a88..24f931e4160a 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -13,7 +13,9 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[02] openssl-quictls +#EXPIRES= 2026-09-07 + +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl32 openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index 65f09ce01729..097de7e7e6c4 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -12,7 +12,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[01] openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl31 openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config