security/libressl-devel: Update to 3.3.2

 * adds libtls-only flavor

5 files changed, 69 insertions, 11 deletions

diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index 0fa8147bc7b9..4ba1966b0e4a 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME=	libressl
-PORTVERSION=	3.3.1
+PORTVERSION=	3.3.2
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 PKGNAMESUFFIX=	-devel
@@ -12,18 +12,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=	-devel-libtls
+libtls_PLIST=	pkg-plist-libtls
+
 CPE_VENDOR=	openbsd
 
 OPTIONS_DEFINE=	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-[0-9]* \
-			openssl-[0-9]* \
-			openssl-devel-[0-9]*
+CONFLICTS_INSTALL=		libressl-[0-9]* \
+				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-devel/distinfo b/security/libressl-devel/distinfo
index 161a8727f785..020a1520b39f 100644
--- a/security/libressl-devel/distinfo
+++ b/security/libressl-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607682242
-SHA256 (libressl-3.3.1.tar.gz) = a6d331865e0164a13ac85a228e52517f7cf8f8488f2f95f34e7857302f97cfdb
-SIZE (libressl-3.3.1.tar.gz) = 3838592
+TIMESTAMP = 1618816037
+SHA256 (libressl-3.3.2.tar.gz) = 84340ac570f3ee8e91069dc3a0acd7a6f6eeafc0594d95f3ae1034c5dbc21654
+SIZE (libressl-3.3.2.tar.gz) = 3847969
diff --git a/security/libressl-devel/pkg-descr-libtls b/security/libressl-devel/pkg-descr-libtls
new file mode 100644
index 000000000000..9dfe84bb5bbb
--- /dev/null
+++ b/security/libressl-devel/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-devel/pkg-plist b/security/libressl-devel/pkg-plist
index a975d001ba28..4903c84a755d 100644
--- a/security/libressl-devel/pkg-plist
+++ b/security/libressl-devel/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
@@ -1269,6 +1269,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
@@ -1934,6 +1935,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_get_extra_chain_certs_only.3.gz
 %%MAN3%%man/man3/SSL_CTX_get_info_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_get_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_get_max_early_data.3.gz
 %%MAN3%%man/man3/SSL_CTX_get_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_get_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_get_mode.3.gz
@@ -1994,6 +1996,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_generate_session_id.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_max_early_data.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_send_fragment.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_min_proto_version.3.gz
@@ -2041,6 +2044,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_SESSION_get_ex_new_index.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_id.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_master_key.3.gz
+%%MAN3%%man/man3/SSL_SESSION_get_max_early_data.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_protocol_version.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_ticket_lifetime_hint.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_time.3.gz
@@ -2052,6 +2056,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_SESSION_set1_id.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set1_id_context.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_ex_data.3.gz
+%%MAN3%%man/man3/SSL_SESSION_set_max_early_data.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_time.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_timeout.3.gz
 %%MAN3%%man/man3/SSL_SESSION_up_ref.3.gz
@@ -2083,6 +2088,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
@@ -2099,19 +2105,23 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get_client_random.3.gz
 %%MAN3%%man/man3/SSL_get_current_cipher.3.gz
 %%MAN3%%man/man3/SSL_get_default_timeout.3.gz
+%%MAN3%%man/man3/SSL_get_early_data_status.3.gz
 %%MAN3%%man/man3/SSL_get_error.3.gz
 %%MAN3%%man/man3/SSL_get_ex_data.3.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
 %%MAN3%%man/man3/SSL_get_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_get_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_get_mode.3.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
@@ -2182,8 +2192,10 @@ 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
 %%MAN3%%man/man3/SSL_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_set_max_send_fragment.3.gz
 %%MAN3%%man/man3/SSL_set_min_proto_version.3.gz
@@ -2228,6 +2240,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
@@ -2236,6 +2249,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_want_write.3.gz
 %%MAN3%%man/man3/SSL_want_x509_lookup.3.gz
 %%MAN3%%man/man3/SSL_write.3.gz
+%%MAN3%%man/man3/SSL_write_early_data.3.gz
 %%MAN3%%man/man3/SSLeay.3.gz
 %%MAN3%%man/man3/SSLeay_add_ssl_algorithms.3.gz
 %%MAN3%%man/man3/SSLeay_version.3.gz
@@ -3178,6 +3192,16 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_write.3.gz
 %%MAN3%%man/man3/verify_callback.3.gz
 %%MAN3%%man/man3/x509_verify.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_chain.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_error_depth.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_error_string.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_free.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_new.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_set_intermediates.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_set_max_chains.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_set_max_depth.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_set_max_signatures.3.gz
+%%MAN3%%man/man3/x509_verify_ctx_set_purpose.3.gz
 man/man5/openssl.cnf.5.gz
 man/man5/x509v3.cnf.5.gz
 man/man8/ocspcheck.8.gz
diff --git a/security/libressl-devel/pkg-plist-libtls b/security/libressl-devel/pkg-plist-libtls
new file mode 100644
index 000000000000..b4a41eee21c1
--- /dev/null
+++ b/security/libressl-devel/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