I have switched the remaining consumers of OpenSSL 3.2 to OpenSSL 3.3
and plan on removing openssl/1.1 and openssl/3.2 soon.
I merged the @pkgpath and @conflict annotations from 1.1 and 3.2 into 3.3
and running 'make install' from 3.3 did the expected: 1.1 and 3.2 were
updated to 3.3p2 and all that remained of 1.1 and 3.2 the machine were
their .lib versions.
Does that look right? Is there more testing needed?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/openssl/Makefile,v
diff -u -p -r1.43 Makefile
--- Makefile 23 Oct 2024 02:40:07 -0000 1.43
+++ Makefile 14 Jan 2025 10:46:33 -0000
@@ -1,6 +1,4 @@
SUBDIR =
-SUBDIR += 1.1
-SUBDIR += 3.2
SUBDIR += 3.3
SUBDIR += 3.4
SUBDIR += libretls
Index: 3.3/Makefile
===================================================================
RCS file: /cvs/ports/security/openssl/3.3/Makefile,v
diff -u -p -r1.8 Makefile
--- 3.3/Makefile 7 Dec 2024 11:35:35 -0000 1.8
+++ 3.3/Makefile 14 Jan 2025 10:46:33 -0000
@@ -8,7 +8,7 @@ V= 3.3.2
PKGNAME= openssl-${V}
PKGSPEC= openssl->=3.3v0,<3.4v0
EPOCH= 0
-REVISION= 1
+REVISION= 2
SHLIBVER= 27.0
SHARED_LIBS= crypto ${SHLIBVER} \
Index: 3.3/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/openssl/3.3/pkg/PLIST,v
diff -u -p -r1.2 PLIST
--- 3.3/pkg/PLIST 4 Jun 2024 16:28:42 -0000 1.2
+++ 3.3/pkg/PLIST 14 Jan 2025 10:52:12 -0000
@@ -1,6 +1,16 @@
@option no-default-conflict
@option is-branch
+@conflict openssl->=1.1.0,<1.2
+@conflict openssl->=1.1.0v0,<1.2v0
+@conflict openssl->=3.1,<3.2
+@conflict openssl->=3.1v0,<3.2v0
+@conflict openssl->=3.2v0,<3.4v0
@conflict openssl->=3.3v0,<3.4v0
+@pkgpath security/openssl/1.0.2
+@pkgpath security/openssl/1.1
+@pkgpath security/openssl/3.0
+@pkgpath security/openssl/3.1
+@pkgpath security/openssl/3.2
bin/c_rehash33
@bin bin/${EOPENSSL_V}
include/${EOPENSSL_V}/
