From nobody Thu Mar 21 14:10:11 2024 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 4V0nR81Nw6z5DjNb; Thu, 21 Mar 2024 14:10:12 +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 4V0nR808fVz4YBk; Thu, 21 Mar 2024 14:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711030212; 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=BuS+LQ2NvjWdH0TA11KR3He5Han0YszFVhfcQCq2elU=; b=HceH4Wc6HghZA+iyjh1fOgsGh96EugPxcofASK7YyRZPNjAHij7mMp4/KJGlK3hZ+X7L8Y p2M+Pbe+uNfZVmmf0QP+MNpmoO8YRtZNmDIkQ2xgpK6oMwsxLdI8cNUcD1sj+Q5NhhXG18 R3jcMR6skd/mUdLT1AR5GJ0PyOE4SriQ/JjS2YJV68dslqX6NAGrcEbkDl1pYudFzf35u5 3dI8vwMatCMQNjf76c+UZL/G43542yUwkp5db8mUNOOlVvHtlKN6b/vRErRCO5XySM1JSA VDH+EO9Xn+PPaQPi5YtGxUrFoEyfltkTfew0miZzAqjVVE9NKI9hsKlO7N7cSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711030212; a=rsa-sha256; cv=none; b=UNnmkc6W0koHjshbtxOCZNUvKRe/5fXWzW3YE8qXBemJiqcmi377C5u/zL5Uh3n6M2PTCJ eeYRKAvnRk4RaO/zOJiABqS4YPVvtUs9v2rG5G5R9rSLwMNH+a9Bcwgy5OM1CGk6qGFdyk ZZi5PBHoRd7MNTlXrB3VWBUcW1FujufWUDyKyLbahjjbSih9WQSULjjnurpkOyE4xzjfEY KxQZXGqJTBoilJ2vNKhbq+pR2LNpYL4ivJqn5lKYD7Mm61i9hb4wZsS/Auk4DZjvP15NEE 8yGylZMcSfWYDSp3fb5loiLooeaOgTtTDKLqrgdVR3xVIQM6dmPHm+lplmpYjA== 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=1711030212; 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=BuS+LQ2NvjWdH0TA11KR3He5Han0YszFVhfcQCq2elU=; b=arXTlRycecor8zhD7dKTMuBy1To5wFxG6NinxgjuYSQWzvolsTxKcc020XaaIF4ckOiNEO ETdqFOQBHpzNDWLci3VThQBdGkOcXAsTO9N84frCJwSmz8OYxEJtifcQfl1G7+VDKHRk7f EBXFlsD3imECfjrPk39Zp8q+EahqSCNKTzGdAOGpXY9ipogCDg2zQ/6bzsyUquvbHHzEKd rWUrSvmWPlq/hlutaYcH+iQbrQSwYU74oE85kRpUR08QM2Li6RsHKT3tiicp/Z76btVDOc 16ZiV5i0Ug94zejXRjXTDA+nkSbJSvZ6UF357z9a1Asgdyh3zdX06BVy3TVkhQ== 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 4V0nR76sk6zf8R; Thu, 21 Mar 2024 14:10:11 +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 42LEABXa026374; Thu, 21 Mar 2024 14:10:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LEAB8g026366; Thu, 21 Mar 2024 14:10:11 GMT (envelope-from git) Date: Thu, 21 Mar 2024 14:10:11 GMT Message-Id: <202403211410.42LEAB8g026366@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: e6eeffa385d6 - main - security/openssl: Chase addition of openssl33 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: e6eeffa385d64b98554ecf10ede22887a42d23f2 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6eeffa385d64b98554ecf10ede22887a42d23f2 commit e6eeffa385d64b98554ecf10ede22887a42d23f2 Author: Bernard Spil AuthorDate: 2024-03-21 14:09:20 +0000 Commit: Bernard Spil CommitDate: 2024-03-21 14:09:20 +0000 security/openssl: Chase addition of openssl33 in conflicts * While here use proper tag for openssl31-quictls --- security/openssl-quictls/Makefile | 2 +- security/openssl/Makefile | 2 +- security/openssl31-quictls/Makefile | 4 ++-- security/openssl31-quictls/distinfo | 6 +++--- security/openssl31/Makefile | 2 +- security/openssl32/Makefile | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index c76fca5226f0..88be5ac5db70 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -13,7 +13,7 @@ WWW= https://www.github.com/quictls/openssl LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[12] +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3* openssl31-quictls BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl/Makefile b/security/openssl/Makefile index b249101b88d9..ddae244b16b5 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt #EXPIRATION_DATE= 2026-09-07 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl111 openssl3[12] openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl111 openssl3* openssl*-quictls USES= cpe perl5 USE_PERL5= build diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile index a907b4ec4bc1..366b7b265689 100644 --- a/security/openssl31-quictls/Makefile +++ b/security/openssl31-quictls/Makefile @@ -1,5 +1,5 @@ PORTNAME= openssl -DISTVERSIONPREFIX= opernssl- +DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 3.1.5 DISTVERSIONSUFFIX= -quic1 CATEGORIES= security devel @@ -12,7 +12,7 @@ WWW= https://www.github.com/quictls/openssl LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[12] +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3* openssl-quictls BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl31-quictls/distinfo b/security/openssl31-quictls/distinfo index e600d00eb8e3..ceac8ac801df 100644 --- a/security/openssl31-quictls/distinfo +++ b/security/openssl31-quictls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706729656 -SHA256 (quictls-openssl-opernssl-3.1.5-quic1_GH0.tar.gz) = 38dab789b4fa43da0e8f33da41423f5036ed0e464146d18540f04e037c147b9b -SIZE (quictls-openssl-opernssl-3.1.5-quic1_GH0.tar.gz) = 15830092 +TIMESTAMP = 1710593356 +SHA256 (quictls-openssl-openssl-3.1.5-quic1_GH0.tar.gz) = 928a0c484fca5a5b9ae484e7b14e6691e946220d77d86ac4031cbb408655b644 +SIZE (quictls-openssl-openssl-3.1.5-quic1_GH0.tar.gz) = 15826997 diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index 0856bb7e03b9..4e8821af1d5f 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt #EXPIRATION_DATE= 2025-03-14 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl32 openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[23] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index ca20b79c8c45..f110a9ebf574 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -13,7 +13,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl31 openssl-quictls +ONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[13] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config