security/openssl-devel: Update to 3.0.0-alpha5

 * target now determined in util/perl/OpenSSL/config.pm
 * Stop modifying Makefile twice

4 files changed, 28 insertions, 49 deletions

diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index 382ccc96e1b5..21b8fdd308d1 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-DISTVERSION=	3.0.0-alpha4
+DISTVERSION=	3.0.0-alpha5
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 
-LICENSE=	OpenSSL
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			libressl-devel-[0-9]* \
@@ -116,11 +116,18 @@ TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
+FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
+LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
+SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
+				lib/libssl.so.${OPENSSL_SHLIBVER} \
+				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
+				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
+				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
@@ -139,19 +146,13 @@ BROKEN_sparc64=	option ASM generates illegal instructions
 .endif
 
 post-patch:
-	${REINPLACE_CMD} \
-		-e 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \
-		-e 's| install_html_docs$$||' \
-		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
+	${REINPLACE_CMD} -Ee 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \
+		-e 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
-	${REINPLACE_CMD} 's|\^GNU ld|GNU|' ${WRKSRC}/Configurations/shared-info.pl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
-		${WRKSRC}/VERSION
+		${WRKSRC}/VERSION.dat
 
 post-configure:
-	${REINPLACE_CMD} \
-		-e 's|^build_docs:.*|build_docs: build_man_docs|' \
-		${WRKSRC}/Makefile
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
@@ -161,13 +162,8 @@ post-configure-MAN3-off:
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
-#.for i in libcrypto libssl
-#	${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib
-#	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i.so.${OPENSSL_SHLIBVER}
-#	${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so
-#.endfor
-.for i in capi devcrypto padlock
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-12/${i}.so
+.for i in ${SHLIBS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
diff --git a/security/openssl-devel/distinfo b/security/openssl-devel/distinfo
index c1417efc4a8b..d6968bd158dd 100644
--- a/security/openssl-devel/distinfo
+++ b/security/openssl-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593160320
-SHA256 (openssl-3.0.0-alpha4.tar.gz) = d930b650e0899f5baca8b80c50e7401620c129fef6c50198400999776a39bd37
-SIZE (openssl-3.0.0-alpha4.tar.gz) = 13884897
+TIMESTAMP = 1595000257
+SHA256 (openssl-3.0.0-alpha5.tar.gz) = 09ad89af04cbf36dbbce1fc7063e18fcc333fcaaf3eccecf22c4a99bac83e139
+SIZE (openssl-3.0.0-alpha5.tar.gz) = 13919931
diff --git a/security/openssl-devel/files/patch-config b/security/openssl-devel/files/patch-config
deleted file mode 100644
index 753e22c6d62d..000000000000
--- a/security/openssl-devel/files/patch-config
+++ /dev/null
@@ -1,19 +0,0 @@
---- config.orig	2018-01-13 13:57:15 UTC
-+++ config
-@@ -694,14 +694,8 @@ case "$GUESSOS" in
-   ia64-*-*bsd*)		OUT="BSD-ia64" ;;
-   x86_64-*-dragonfly*)  OUT="BSD-x86_64" ;;
-   amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
--  *86*-*-*bsd*)		# mimic ld behaviour when it's looking for libc...
--			if [ -L /usr/lib/libc.so ]; then	# [Free|Net]BSD
--			    libc=/usr/lib/libc.so
--			else					# OpenBSD
--			    # ld searches for highest libc.so.* and so do we
--			    libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null`
--			fi
--			case "`(file -L $libc) 2>/dev/null`" in
-+  *86*-*-*bsd*)	
-+			case "`(file -L /bin/sh) 2>/dev/null`" in
- 			*ELF*)	OUT="BSD-x86-elf" ;;
- 			*)	OUT="BSD-x86"; options="$options no-sse2" ;;
- 			esac ;;
diff --git a/security/openssl-devel/pkg-plist b/security/openssl-devel/pkg-plist
index 84c5d592f217..60faea953d28 100644
--- a/security/openssl-devel/pkg-plist
+++ b/security/openssl-devel/pkg-plist
@@ -56,6 +56,7 @@ include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
+include/openssl/fipskey.h
 include/openssl/fips_names.h
 include/openssl/hmac.h
 include/openssl/http.h
@@ -64,7 +65,6 @@ include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
-include/openssl/mac.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
@@ -76,8 +76,8 @@ include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
-include/openssl/%%OPENSSLDIR%%conf.h
-include/openssl/%%OPENSSLDIR%%v.h
+include/openssl/opensslconf.h
+include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
@@ -129,9 +129,9 @@ include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 lib/libcrypto.a
-%%SHARED%%lib/engines-12/capi.so
-%%SHARED%%lib/engines-12/devcrypto.so
-%%SHARED%%lib/engines-12/padlock.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
@@ -503,7 +503,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/PKCS7_verify.3.gz
 %%MAN3%%man/man3/PKCS8_pkey_add1_attr.3.gz
 %%MAN3%%man/man3/RAND_DRBG_generate.3.gz
-%%MAN3%%man/man3/RAND_DRBG_get0_master.3.gz
+%%MAN3%%man/man3/RAND_DRBG_get0_public.3.gz
 %%MAN3%%man/man3/RAND_DRBG_new.3.gz
 %%MAN3%%man/man3/RAND_DRBG_reseed.3.gz
 %%MAN3%%man/man3/RAND_DRBG_set_callbacks.3.gz
@@ -724,6 +724,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/X509_load_http.3.gz
 %%MAN3%%man/man3/X509_new.3.gz
 %%MAN3%%man/man3/X509_sign.3.gz
+%%MAN3%%man/man3/X509_verify.3.gz
 %%MAN3%%man/man3/X509_verify_cert.3.gz
 %%MAN3%%man/man3/X509v3_cache_extensions.3.gz
 %%MAN3%%man/man3/X509v3_get_ext_by_NID.3.gz
@@ -826,7 +827,8 @@ man/man5/x509v3_config.5.gz
 %%MAN3%%man/man7/ssl.7.gz
 %%MAN3%%man/man7/x509.7.gz
 %%OPENSSLDIR%%/misc/CA.pl
-%%OPENSSLDIR%%/misc/tsget.pl
+@comment %%OPENSSLDIR%%/misc/tsget.pl
+%%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 @dir %%OPENSSLDIR%%/private