security/libressl: Upgrade to 3.3.3

 * Add libtls flavor

5 files changed, 56 insertions, 12 deletions

diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index f19ccc5f729d..3df12a388e14 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -1,7 +1,7 @@
 # Created by: Vsevolod Stakhov <vsevolod@FreeBSD.org>
 
 PORTNAME=	libressl
-PORTVERSION=	3.2.5
+PORTVERSION=	3.3.3
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 
@@ -11,18 +11,34 @@ COMMENT=	Free version of the SSL/TLS protocol forked from OpenSSL
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+FLAVORS=	default libtls
+FLAVOR?=	${FLAVORS:[1]}
+libtls_DESCR=	pkg-descr-libtls
+libtls_PKGNAMESUFFIX=	-libtls
+libtls_PLIST=	pkg-plist-libtls
+
 CPE_VENDOR=	openbsd
 
-OPTIONS_DEFINE=	MAN3 NC
+OPTIONS_DEFINE=	LIBTLS MAN3 NC
 OPTIONS_DEFAULT=	MAN3 NC
+LIBTLS_DESC=	Only install libtls (no libcrypto/libssl)
 MAN3_DESC=	Install API manpages (section 3)
 NC_DESC=	Install TLS-enabled netcat
 
-CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
-			openssl-[0-9]* \
-			openssl-devel-[0-9]*
+CONFLICTS_INSTALL=		libressl-devel-libtls-[0-9]*
+libtls_CONFLICTS_INSTALL=	libretls-[0-9]*
+default_CONFLICTS_INSTALL=	openssl-[0-9]* \
+				openssl-devel-[0-9]*
+
+.if ${FLAVOR:U} == default
+OPTIONS_EXCLUDE=	LIBTLS
+.elif ${FLAVOR:U} == libtls
+OPTIONS_SLAVE=		LIBTLS
+OPTIONS_EXCLUDE=	MAN3
+.endif
 
-NC_CONFIGURE_ENABLE=	nc
+LIBTLS_CONFIGURE_ENABLE=	libtls-only
+NC_CONFIGURE_ENABLE=		nc
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig
diff --git a/security/libressl/distinfo b/security/libressl/distinfo
index e653239e2a1c..19489f6b68e5 100644
--- a/security/libressl/distinfo
+++ b/security/libressl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616151929
-SHA256 (libressl-3.2.5.tar.gz) = 798a65fd61d385e09d559810cdfa46512f8def5919264cfef241a7b086ce7cfe
-SIZE (libressl-3.2.5.tar.gz) = 3842149
+TIMESTAMP = 1620128354
+SHA256 (libressl-3.3.3.tar.gz) = a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
+SIZE (libressl-3.3.3.tar.gz) = 3848064
diff --git a/security/libressl/pkg-descr-libtls b/security/libressl/pkg-descr-libtls
new file mode 100644
index 000000000000..9dfe84bb5bbb
--- /dev/null
+++ b/security/libressl/pkg-descr-libtls
@@ -0,0 +1,7 @@
+LibreSSL libtls is an easy to use, secure by default, consistent, obvious and
+well documented shared library based on the LibreSSL codebase.
+
+The libtls flavor only installs the libtls shared library of LibreSSL, and can
+coexist with OpenSSL.
+
+WWW: http://www.libressl.org/
diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist
index 39e7257b8251..276476a88183 100644
--- a/security/libressl/pkg-plist
+++ b/security/libressl/pkg-plist
@@ -80,15 +80,15 @@ include/tls.h
 lib/libcrypto.a
 lib/libcrypto.so
 lib/libcrypto.so.46
-lib/libcrypto.so.46.0.1
+lib/libcrypto.so.46.0.2
 lib/libssl.a
 lib/libssl.so
 lib/libssl.so.48
-lib/libssl.so.48.0.1
+lib/libssl.so.48.0.2
 lib/libtls.a
 lib/libtls.so
 lib/libtls.so.20
-lib/libtls.so.20.0.1
+lib/libtls.so.20.0.3
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/libtls.pc
@@ -736,6 +736,9 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/DTLS_client_method.3.gz
 %%MAN3%%man/man3/DTLS_method.3.gz
 %%MAN3%%man/man3/DTLS_server_method.3.gz
+%%MAN3%%man/man3/DTLSv1_2_client_method.3.gz
+%%MAN3%%man/man3/DTLSv1_2_method.3.gz
+%%MAN3%%man/man3/DTLSv1_2_server_method.3.gz
 %%MAN3%%man/man3/DTLSv1_client_method.3.gz
 %%MAN3%%man/man3/DTLSv1_listen.3.gz
 %%MAN3%%man/man3/DTLSv1_method.3.gz
@@ -1269,6 +1272,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_PKEY_meth_set_verifyctx.3.gz
 %%MAN3%%man/man3/EVP_PKEY_missing_parameters.3.gz
 %%MAN3%%man/man3/EVP_PKEY_new.3.gz
+%%MAN3%%man/man3/EVP_PKEY_new_CMAC_key.3.gz
 %%MAN3%%man/man3/EVP_PKEY_new_mac_key.3.gz
 %%MAN3%%man/man3/EVP_PKEY_paramgen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_paramgen_init.3.gz
@@ -2087,6 +2091,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get0_alpn_selected.3.gz
 %%MAN3%%man/man3/SSL_get0_chain_certs.3.gz
 %%MAN3%%man/man3/SSL_get0_param.3.gz
+%%MAN3%%man/man3/SSL_get0_peername.3.gz
 %%MAN3%%man/man3/SSL_get0_session.3.gz
 %%MAN3%%man/man3/SSL_get1_session.3.gz
 %%MAN3%%man/man3/SSL_get1_supported_ciphers.3.gz
@@ -2109,6 +2114,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 %%MAN3%%man/man3/SSL_get_ex_new_index.3.gz
 %%MAN3%%man/man3/SSL_get_fd.3.gz
+%%MAN3%%man/man3/SSL_get_finished.3.gz
 %%MAN3%%man/man3/SSL_get_info_callback.3.gz
 %%MAN3%%man/man3/SSL_get_max_cert_list.3.gz
 %%MAN3%%man/man3/SSL_get_max_early_data.3.gz
@@ -2118,6 +2124,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get_options.3.gz
 %%MAN3%%man/man3/SSL_get_peer_cert_chain.3.gz
 %%MAN3%%man/man3/SSL_get_peer_certificate.3.gz
+%%MAN3%%man/man3/SSL_get_peer_finished.3.gz
 %%MAN3%%man/man3/SSL_get_privatekey.3.gz
 %%MAN3%%man/man3/SSL_get_quiet_shutdown.3.gz
 %%MAN3%%man/man3/SSL_get_rbio.3.gz
@@ -2151,6 +2158,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_in_connect_init.3.gz
 %%MAN3%%man/man3/SSL_in_init.3.gz
 %%MAN3%%man/man3/SSL_is_init_finished.3.gz
+%%MAN3%%man/man3/SSL_is_dtls.3.gz
 %%MAN3%%man/man3/SSL_is_server.3.gz
 %%MAN3%%man/man3/SSL_library_init.3.gz
 %%MAN3%%man/man3/SSL_load_client_CA_file.3.gz
@@ -2188,6 +2196,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_set_fd.3.gz
 %%MAN3%%man/man3/SSL_set_generate_session_id.3.gz
+%%MAN3%%man/man3/SSL_set_hostflags.3.gz
 %%MAN3%%man/man3/SSL_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_set_max_cert_list.3.gz
 %%MAN3%%man/man3/SSL_set_max_early_data.3.gz
@@ -2235,6 +2244,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_use_RSAPrivateKey_file.3.gz
 %%MAN3%%man/man3/SSL_use_certificate.3.gz
 %%MAN3%%man/man3/SSL_use_certificate_ASN1.3.gz
+%%MAN3%%man/man3/SSL_use_certificate_chain_file.3.gz
 %%MAN3%%man/man3/SSL_use_certificate_file.3.gz
 %%MAN3%%man/man3/SSL_version.3.gz
 %%MAN3%%man/man3/SSL_want.3.gz
diff --git a/security/libressl/pkg-plist-libtls b/security/libressl/pkg-plist-libtls
new file mode 100644
index 000000000000..b4a41eee21c1
--- /dev/null
+++ b/security/libressl/pkg-plist-libtls
@@ -0,0 +1,11 @@
+%%NC%%bin/nc
+etc/ssl/openssl.cnf
+etc/ssl/x509v3.cnf
+include/tls.h
+lib/libtls.a
+lib/libtls.so
+lib/libtls.so.20
+lib/libtls.so.20.0.3
+libdata/pkgconfig/libtls.pc
+%%NC%%man/man1/nc.1.gz
+@dir etc/ssl/certs