From nobody Wed Mar 15 09:15:13 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 4Pc4VT5Mp0z3yGhX; Wed, 15 Mar 2023 09:15:13 +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 4Pc4VT4r3jz3xB5; Wed, 15 Mar 2023 09:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678871713; 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=gEXQRZ+NX1q/TfyPDOtDEsjE1D92uRi7e/+6n3c9W3Q=; b=EXMaFdXWkoDxIzrN3mcrdZYaatSFDkgfaFAgcMbMsBv6DyurGTy9IxZwtjuJkgF7WUNA0C 4OJ6dsRoWPhN6Twi0Wc4oHWxFLVpaYa3nyXtmp/7GxB3TKT6wsGYL0jO/mGfNIlYi8ofdJ QLCStlIxnzghVyqecOvOAiHmwiKt/JO1KaOS8rY4wIcQ2XPeMiJMb8VWNn0gYRJDeQSLxh W6Z+grCDQWkPS6+qkkxmOANkmBwsE3ks66AuxFpNwWY6edx+3uxFcSErazRJI6e9F0mgGW ZBvEkP3ZW/ms39wIvfobBuFks7koYBStqH6RXN52nlYNo/z7g7u+XtbWQychRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678871713; 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=gEXQRZ+NX1q/TfyPDOtDEsjE1D92uRi7e/+6n3c9W3Q=; b=kXr9zBem470D9dnmWe33KpIH/FHjlt6kvqYc3EnU8/Dpdsp5RUGyoKOJxFzrvLkMkXNqrg hW2JIagBGcEu6RYxKnbf4ipKDHLo5OKIsgzjbr3eBCIhFruyQsdkn7SCahQjao3z0TPaTL OGgDl6KC4kfmMDhPurTUUzkVZVF7YxkPsuW9Op3Xbowz9bFSun6LdN+nbKA1tnFVW9Xjie 6g5Vk94ru6sIZaGTj0SAbZcspsAInPdH5YN+2RpTMhU4GDOKJcE3GO1xIT0Ms2ZmphxCMy 2dQUQfCF7iLweRbVXfzk72d4JbDFaVFVYJ+2KxqJ/KhSpQuLOi3CLaE9+E4jHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678871713; a=rsa-sha256; cv=none; b=lEUPeco5yjT8ctBUfsdZmJZ4zn0th7ycEi1sbkrr9EtgFIw/SMyfdZ3oLoEYpreWU5TPgL 3rWGbwK0WMmn1ZJJ3bqo2lexvCAkx56N8LaYMZNcuEuHRgZFQqH/IMfiHEUS47EEQFz9y5 W4mZP5UG46oVJBQiVWc8qp/lqGXkDBgq+7e+pQ1qwGh9HF+v2tNrS1mz3Cxc43l+z85oaa 8zNmy7iUT143H7SRpmzHECwYIldYrJtXz4z8n/6AnUIGm2FeV75zzsT1Cpxkh25dh6lx4f TnjC5gArQ457EttOMWeM4YMUQfQzYpgBzTVWRm0qj7/PB/y+K0Z3+LSV53/Qpg== 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 4Pc4VT3wWYz19yD; Wed, 15 Mar 2023 09:15:13 +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 32F9FDGC018813; Wed, 15 Mar 2023 09:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32F9FDA8018812; Wed, 15 Mar 2023 09:15:13 GMT (envelope-from git) Date: Wed, 15 Mar 2023 09:15:13 GMT Message-Id: <202303150915.32F9FDA8018812@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: 70a4cc59a769 - main - security/openssl30: Chase rename in ports 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: 70a4cc59a7690c42d12e673c33f79993619a66b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=70a4cc59a7690c42d12e673c33f79993619a66b7 commit 70a4cc59a7690c42d12e673c33f79993619a66b7 Author: Bernard Spil AuthorDate: 2023-03-15 09:14:16 +0000 Commit: Bernard Spil CommitDate: 2023-03-15 09:14:16 +0000 security/openssl30: Chase rename in ports CONFLICTS* Reported by: cperciva, junchoon --- security/boringssl/Makefile | 5 ++--- security/gost-engine/Makefile | 5 +++-- security/libressl-devel/Makefile | 2 +- security/libressl/Makefile | 2 +- security/openssl-quictls/Makefile | 2 +- security/openssl/Makefile | 2 +- security/openssl30/Makefile | 4 ++-- security/openssl31/Makefile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 988e05cc462d..c658a764487c 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -11,9 +11,8 @@ 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 +CONFLICTS_INSTALL= libressl libressl-devel \ + openssl openssl3[01] openssl-quictls CPE_VENDOR= google diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index 2451650dde4b..e19b4192e256 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -9,10 +9,11 @@ WWW= https://github.com/gost-engine/engine/blob/master/README.gost LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= libressl libressl-devel openssl-devel +BROKEN_SSL= libressl libressl-devel openssl30 openssl31 BROKEN_SSL_REASON_libressl= needs features only available in OpenSSL 1.1.1+ BROKEN_SSL_REASON_libressl-devel= needs features only available in OpenSSL 1.1.1+ -BROKEN_SSL_REASON_openssl-devel= for OpenSSL 1.1.1 only +BROKEN_SSL_REASON_openssl30= for OpenSSL 1.1.1 only +BROKEN_SSL_REASON_openssl31= for OpenSSL 1.1.1 only BUILD_DEPENDS= cmake>=3.18.1:devel/cmake diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index ffed6437b9f6..22f5cc795407 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 +default_CONFLICTS_INSTALL= openssl openssl3[01] openssl-quictls .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 574151ad0833..95e636b6d39d 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -27,7 +27,7 @@ NC_DESC= Install TLS-enabled netcat CONFLICTS_INSTALL= libressl-devel libtls_CONFLICTS_INSTALL= libretls default_CONFLICTS_INSTALL= openssl \ - openssl-devel + openssl3[01] .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 3dacd7fc6f77..2bd01bbbb50c 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 openssl-devel +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[01] BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 3c48f10211bb..4d14e1aa8962 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -12,7 +12,7 @@ WWW= https://www.openssl.org/ LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl-devel openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl3[01] openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl30/Makefile b/security/openssl30/Makefile index 745ac9470caf..4702b186a0f7 100644 --- a/security/openssl30/Makefile +++ b/security/openssl30/Makefile @@ -3,7 +3,7 @@ DISTVERSION= 3.0.8 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX= 30 MAINTAINER= brnrd@FreeBSD.org COMMENT= TLSv1.3 capable SSL and crypto library @@ -12,7 +12,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl31 openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index 1009097f0d08..a498df2d4501 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 openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl30 openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config