security/openssl-devel: Update to 1.1 BETA2 (1.1.0-pre5)

- Update to first BETA of OpenSSL 1.1
  - Bump SHLIB_VERSION for 1.1 to 9
  - Add missing libressl-devel conflict
  - Mark jobs-safe
  - Add upstream clang fix (Issue 888)
  - Fix renamed shared engines (remove 'lib' prefix)
  - Remove "overwrite base" check
  - Do not install html docs

Reviewed by:	feld (mentor), koobs (mentor)
Approved by:	feld (mentor)
Differential Revision:	D5900

security/openssl-devel/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-DISTVERSION=	1.1.0-pre3
+DISTVERSION=	1.1.0-pre5
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
@@ -15,11 +15,11 @@ COMMENT=	SSL and crypto library (1.1.x)
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS=	libressl-[0-9]* openssl-[0-9]*
+CONFLICTS=	libressl-[0-9]* libressl-devel-[0-9]* openssl-[0-9]*
 
 OPTIONS_GROUP=	CIPHERS HASHES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	IDEA JPAKE RC2 RC4 RC5
-OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 MD_GHOST94 RMD160
+OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2
 OPTIONS_GROUP_PROTOCOLS=	NEXTPROTONEG SCTP SSL3
 
@@ -65,7 +65,6 @@ OPTIONS_SUB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 
-MAKE_JOBS_UNSAFE=	yes
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
 NOPRECIOUSSOFTMAKEVARS=	Too many _MLINKS for fetch
 
@@ -103,24 +102,13 @@ CONFIGURE_ARGS+=	--openssldir=${OPENSSLDIR}
 OPENSSL_BASE_SONAME!=	readlink ${DESTDIR}/usr/lib/libcrypto.so || true
 OPENSSL_SHLIBVER_BASE=	${OPENSSL_BASE_SONAME:E}
 OPENSSL_BASE_SOPATH=	${OPENSSL_BASE_SONAME:H}
-OPENSSL_SHLIBVER?=	8
+OPENSSL_SHLIBVER?=	9
 
 .if ${ARCH} == "i386"
 OPTIONS_GROUP_OPTIMIZE+=	I386
 .endif
 I386_CONFIGURE_ON=	386
 
-.if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER}
-pre-everything::
-	@${ECHO_CMD} "#"
-	@${ECHO_CMD} "# this ports conflicts with your base system"
-	@${ECHO_CMD} "# please undefine OPENSSL_OVERWRITE_PORT"
-	@${ECHO_CMD} "# and use WITH_OPENSSL_BASE=yes instead."
-	@${ECHO_CMD} "#"
-	@${FALSE}
-
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
 		${WRKSRC}/crypto/des/Makefile.in
@@ -130,9 +118,14 @@ post-patch:
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
-		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		-e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
+		-e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|$(OPENSSL_SHLIBVER)|g' \
+		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
+		-e 's| install_html_docs$$||' \
 		${WRKSRC}/Makefile
+	${REINPLACE_CMD} \
+		-e 's|^LIBVERSION=$$|LIBVERSION=$(OPENSSL_SHLIBVER) |' \
+		${WRKSRC}/Makefile.shared
 
 post-install-SHARED-on:
 .for i in libcrypto libssl
@@ -140,7 +133,7 @@ post-install-SHARED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i.so.${OPENSSL_SHLIBVER}
 	${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so
 .endfor
-.for i in libcapi libdasync libpadlock
+.for i in capi dasync padlock
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines/${i}.so
 .endfor
 

security/openssl-devel/distinfo

@@ -1,2 +1,2 @@
-SHA256 (openssl-1.1.0-pre3.tar.gz) = bb0ead36155dcf6122bfb0555205ba562ad5a82bb6067f2bfc9111ca4a4e6442
-SIZE (openssl-1.1.0-pre3.tar.gz) = 5024305
+SHA256 (openssl-1.1.0-pre5.tar.gz) = 25acbdfa5e0259ed20159670e88ddb4257970f80ce923427bd201133e6e580db
+SIZE (openssl-1.1.0-pre5.tar.gz) = 5289112

security/openssl-devel/files/patch-nextprotoneg

@@ -1,40 +0,0 @@
-Submitted upstream:
-"Fix incomplete no-nextprotoneg option"
-https://github.com/openssl/openssl/pull/757
-
---- util/mk1mf.pl.orig	2016-02-15 18:08:07 UTC
-+++ util/mk1mf.pl
-@@ -308,6 +308,7 @@ $cflags.=" -DOPENSSL_NO_AUTOERRINIT" if 
- $cflags.=" -DOPENSSL_FIPS"    if $fips;
- $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
- $cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
-+$cflags.=" -DOPENSSL_NO_NEXTPROTONEG" if $no_nextprotoneg;
- $cflags.= " -DZLIB" if $zlib_opt;
- $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
- $cflags.=" -DOPENSSL_PIC" if $shlib;
---- apps/s_client.c.orig	2016-02-15 18:08:07 UTC
-+++ apps/s_client.c
-@@ -1292,9 +1292,11 @@ int s_client_main(int argc, char **argv)
-                 goto end;
-             }
-             break;
-+#ifndef OPENSSL_NO_NEXTPROTONEG
-         case OPT_NEXTPROTONEG:
-             next_proto_neg_in = opt_arg();
-             break;
-+#endif
-         case OPT_ALPN:
-             alpn_in = opt_arg();
-             break;
---- ssl/t1_ext.c.orig	2016-02-15 18:08:07 UTC
-+++ ssl/t1_ext.c
-@@ -272,7 +272,9 @@ int SSL_extension_supported(unsigned int
-     case TLSEXT_TYPE_ec_point_formats:
-     case TLSEXT_TYPE_elliptic_curves:
-     case TLSEXT_TYPE_heartbeat:
-+#ifndef OPENSSL_NO_NEXTPROTONEG
-     case TLSEXT_TYPE_next_proto_neg:
-+#endif
-     case TLSEXT_TYPE_padding:
-     case TLSEXT_TYPE_renegotiate:
-     case TLSEXT_TYPE_server_name: