From nobody Sat Sep 16 12:16:29 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 4RnqmF4t22z4scTg; Sat, 16 Sep 2023 12:16:29 +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 4RnqmF4P8Wz3XfW; Sat, 16 Sep 2023 12:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694866589; 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=bktS6/kI2A3EUa+NfP0XAdJQr+J0SEIBcarioMZrw3Q=; b=uPREe13ravzGxQT3LgRdq7orqM66FpUqU39fRXIba4ysbHd1VmRN/N1dMtZ3cdsgpKGVbC Ah6vEoih6gx3N97wutcEwo4MzSIC4sVi3bE1k/fNceHKYOJ4khIkzYmpOKiMTFCy1al+nm W4dIOUEHjqemy7v3hjEa/N6xC9Iox5N8SR+ZGlwmQj5xTASit+r5r4fVVIvlCoYy9zMYm+ XZTdl4FkCWEgb6r17WNSXsJUAcFV5kjNSKgJVjrvVSKaSiZZg9sXQXsfVmJsP5KZzLSxAz OAbQ0nQQn73pVKvjFiia/Y6AeTCFp26vDj0IN6LS3LLN1DAn2MTJuv7FRzwyqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694866589; a=rsa-sha256; cv=none; b=TDoCVmQ+cs72b7KMV0lOsV39L3K5dEmp83IT981brEBv8KU6wy/Dx/fZaYgmYLiGon9v1r oaHP9WHSnqb1GqSJn2F8dsVDHqmgmsw0jwgibP0IfjRCDQLX7GIOZY8CSRkQJFB1Cx+DqO ariBnuO7r/7Q+LMB1qfOKU2ZIz+DArpkk9f4UlpIoBRN0cG4RmzTPAydI2ifGHaIHOuyeG DXs24CwiqsQiCqlez+Cn0YinyM6SdP63Z5W4IYZTxY9vOQ6LAw4J5ZRUvAr6yszmVfEcKp ICQNmgpZjwm+2wWhCLZ+QsK/Fzajj0OLiFQOL95TqRrS4r/I9tRlVkMiTaX+cA== 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=1694866589; 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=bktS6/kI2A3EUa+NfP0XAdJQr+J0SEIBcarioMZrw3Q=; b=eZZ7/GYNnetRAHaoP1tHX8yvG8FOgtXPLP+4Pb+NKI7SeaE50EgoJCtkoDjipLIz0RmL/4 xY548sUIgi/K2lk2BksrMybba/AaeXCYpD91gqrTcixvG+BK/at+In1ZYPhgdVubZeZtx2 tt+xJteDLguW8apDLhXgdH3O+Z9EsmfNWgaVZVoliDqq3ReSBAIwNw+5oEJlJPWeyju5H9 BnnXyUxVLxI0AT2VI65xJzVotFpZW80wZFSb9TjSQscaqh6fo3fWjKE+BLJbzEEOkysXhg S/hnj4b6yhy1KKGdSzDNOf3o4yu607g7op8cY9uS3LFlF9tHG4BVuPupRxScdg== 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 4RnqmF3Stnz15q4; Sat, 16 Sep 2023 12:16:29 +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 38GCGTgJ099527; Sat, 16 Sep 2023 12:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GCGTmC099524; Sat, 16 Sep 2023 12:16:29 GMT (envelope-from git) Date: Sat, 16 Sep 2023 12:16:29 GMT Message-Id: <202309161216.38GCGTmC099524@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: e332bedb5ec7 - main - security/openssl*: Chase addition of 3.2 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e332bedb5ec7594a6cc4d243ec120113591e3e86 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e332bedb5ec7594a6cc4d243ec120113591e3e86 commit e332bedb5ec7594a6cc4d243ec120113591e3e86 Author: Bernard Spil AuthorDate: 2023-09-16 12:15:35 +0000 Commit: Bernard Spil CommitDate: 2023-09-16 12:15:35 +0000 security/openssl*: Chase addition of 3.2 * Update CONFLICTS * Update comment in Mk/Uses/ssl.mk --- Mk/Uses/ssl.mk | 3 ++- security/boringssl/Makefile | 2 +- security/libressl-devel/Makefile | 2 +- security/libressl/Makefile | 3 ++- security/openssl-quictls/Makefile | 2 +- security/openssl30/Makefile | 2 +- security/openssl31/Makefile | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk index 8d92229da70d..6b7c09857f34 100644 --- a/Mk/Uses/ssl.mk +++ b/Mk/Uses/ssl.mk @@ -8,7 +8,8 @@ # # DEFAULT_VERSIONS+= ssl= # -# Variants being base, openssl, openssl30, openssl31, libressl, and libressl-devel. +# Variants being base, openssl, openssl30, openssl31, openssl32, +# openssl-quictls, libressl, and libressl-devel. # # The Makefile sets these variables: # OPENSSLBASE - "/usr" or ${LOCALBASE} diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index acc91c155929..1169b46e12fd 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -22,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:insource cpe go:no_targets localbase perl5 CONFLICTS_INSTALL= libressl libressl-devel \ - openssl openssl3[01] openssl-quictls + openssl openssl3[012] openssl-quictls CPE_VENDOR= google diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index e06be0da8dbb..8c4574f9c5be 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -27,7 +27,7 @@ NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl \ libretls -default_CONFLICTS_INSTALL= openssl openssl3[01] openssl-quictls +default_CONFLICTS_INSTALL= openssl openssl3[012] openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 3d39bee45714..2807e6ff01ab 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -27,7 +27,8 @@ NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl-devel libtls_CONFLICTS_INSTALL= libretls default_CONFLICTS_INSTALL= openssl \ - openssl3[01] + openssl3[012] \ + openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 562138535939..9e2e1f996919 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[01] +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[012] BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl30/Makefile b/security/openssl30/Makefile index 263d6e6ed0b7..8ce44028502e 100644 --- a/security/openssl30/Makefile +++ b/security/openssl30/Makefile @@ -12,7 +12,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl31 openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[12] openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index e0baa28cfd53..e410d0a45df4 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -12,7 +12,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl30 openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[02] openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config