security/openssl111: Chase addition/removal in CONFLICTS

freebsd · Oct 14, 2023 · f63fc9b · f63fc9b
1 parent c883e9e
commit f63fc9b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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