Date: Sun, 28 Aug 2016 20:18:47 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421032 - in head/security/openssl-devel: . files Message-ID: <201608282018.u7SKIlaA043399@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Aug 28 20:18:46 2016 New Revision: 421032 URL: https://svnweb.freebsd.org/changeset/ports/421032 Log: security/openssl-devel: Configure, Build fixes - Do not pass asm to configure (upstream default ON), fixes configure - Disable EC optimizations on i386, fixes build - Split options activation into upstream-default-enabled and -disabled - Rework EC option handling - Align order of Makefile with security/openssl - Use improved patching from security/openssl - Improve options descriptions - Remove old PRECIOUSMAKEVARS - Add pkg-message Added: head/security/openssl-devel/files/pkg-message.in (contents, props changed) Modified: head/security/openssl-devel/Makefile Modified: head/security/openssl-devel/Makefile ============================================================================== --- head/security/openssl-devel/Makefile Sun Aug 28 19:18:20 2016 (r421031) +++ head/security/openssl-devel/Makefile Sun Aug 28 20:18:46 2016 (r421032) @@ -15,16 +15,33 @@ COMMENT= SSL and crypto library (1.1.x) LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= libressl-[0-9]* libressl-devel-[0-9]* openssl-[0-9]* +CPE_VERSION= ${PORTVERSION}${DISTVERSIONSUFFIX} +CONFLICTS= libressl-[0-9]* \ + libressl-devel-[0-9]* \ + openssl-[0-9]* + +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= config +CONFIGURE_ENV= PERL="${PERL}" +CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= IDEA JPAKE RC2 RC4 RC5 OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 -OPTIONS_GROUP_OPTIMIZE= ASM EC SSE2 +OPTIONS_GROUP_OPTIMIZE= ASM EC SSE2 THREADS +OPTIONS_DEFINE_i386= I386 OPTIONS_GROUP_PROTOCOLS= NEXTPROTONEG SCTP SSL3 OPTIONS_DEFINE= SHARED THREADS ZLIB RFC3779 MAN3 -OPTIONS_DEFAULT= ASM EC MAN3 RMD160 SCTP SHARED SSE2 THREADS +.for a in amd64 ia64 +OPTIONS_DEFINE_${a}= EC +OPTIONS_DEFAULT_${a}= EC +.endfor +.if ${TARGET_ARCH:U${MACHINE_ARCH}} == "mips64el" +OPTIONS_DEFINE+= EC +OPTIONS_DEFAULT+= EC +.endif +OPTIONS_DEFAULT= ASM MAN3 RMD160 SCTP SHARED SSE2 THREADS ASM_DESC= Assembler code CIPHERS_DESC= Cipher Suite Support @@ -40,7 +57,7 @@ MDC2_DESC= MDC-2 MD_GHOST94_DESC= GHOST94 (obscure) NEXTPROTONEG_DESC= Next Protocol Negotiation (SPDY) OPTIMIZE_DESC= Optimizations -PROTOCOLS_DESC= Protocols Support +PROTOCOLS_DESC= Protocol Support RC2_DESC= RC2 (unsafe) RC4_DESC= RC4 (unsafe) RC5_DESC= RC5 (patented) @@ -49,37 +66,32 @@ RFC3779_DESC= RFC3779 support (BGP) SCTP_DESC= SCTP (Stream Control Transmission) SHARED_DESC= Build shared libraries SSE2_DESC= Runtime SSE2 detection -SSL3_DESC= SSLv3 +SSL3_DESC= SSLv3 (unsafe) ZLIB_DESC= zlib compression support -NO_OPTIONS_SORT=yes OPTIONS_SUB= yes -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= config - -NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch -NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch -USES= cpe localbase perl5 +USES= cpe perl5 USE_PERL5= build MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= TEST_TARGET= test -CPE_VERSION= ${DISTVERSION} - -.for _option in asm idea md2 md4 mdc2 md_ghost94 nextprotoneg rc5 rfc3779 rmd160 sctp sse2 ssl3 threads +# Upstream default disabled options +.for _option in md2 rc5 sctp ssl3 zlib ${_option:tu}_CONFIGURE_ON= enable-${_option} +.endfor + +# Upstream default enabled options +.for _option in asm idea md4 mdc2 md_ghost94 nextprotoneg rfc3779 rmd160 sse2 threads zlib ${_option:tu}_CONFIGURE_OFF= no-${_option} .endfor -ASM_NOT_FOR_ARCHS= sparc6 + EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128 -EC_ONLY_FOR_ARCHS= amd64 ia64 mips64el -SHARED_CONFIGURE_ON= shared +I386_CONFIGURE_ON= 386 SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER} -SHARED_USE_LDCONFIG= yes -SSL3_CONFIGURE_OFF= no-ssl3-method +SHARED_USE= ldconfig=yes .include <bsd.port.pre.mk> .if ${PREFIX} == /usr @@ -88,29 +100,31 @@ IGNORE= the OpenSSL port can not be inst OPENSSLDIR?= ${PREFIX}/openssl PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} -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?= 9 -.if ${ARCH} == "i386" -OPTIONS_GROUP_OPTIMIZE+= I386 +.include "version.mk" + +.if ${PORT_OPTIONS:MASM} +BROKEN_sparc64= option ASM generates illegal instructions .endif -I386_CONFIGURE_ON= 386 + +post-patch: + ${REINPLACE_CMD} \ + -e 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \ + -e 's| install_html_docs$$||' \ + -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ + ${WRKSRC}/Configurations/unix-Makefile.tmpl post-configure: ${REINPLACE_CMD} \ - -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \ - -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 + -e 's|SHLIB_VERSION_NUMBER "1.1"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ + ${WRKSRC}/include/openssl/opensslv.h post-install-SHARED-on: .for i in libcrypto libssl Added: head/security/openssl-devel/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openssl-devel/files/pkg-message.in Sun Aug 28 20:18:46 2016 (r421032) @@ -0,0 +1,4 @@ + +Copy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf +and edit it to fit your needs. +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608282018.u7SKIlaA043399>