Date: Thu, 21 Mar 2024 14:10:11 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e6eeffa385d6 - main - security/openssl: Chase addition of openssl33 in conflicts Message-ID: <202403211410.42LEAB8g026366@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6eeffa385d64b98554ecf10ede22887a42d23f2 commit e6eeffa385d64b98554ecf10ede22887a42d23f2 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2024-03-21 14:09:20 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403211410.42LEAB8g026366>