Index: head/devel/mingw32-openssl/Makefile =================================================================== --- head/devel/mingw32-openssl/Makefile (revision 422232) +++ head/devel/mingw32-openssl/Makefile (revision 422233) @@ -1,39 +1,38 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= openssl PORTVERSION= 1.0.2d PORTREVISION= 1 CATEGORIES= devel security MASTER_SITES= http://www.openssl.org/source/ \ - ftp://ftp.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ PKGNAMEPREFIX= mingw32- DIST_SUBDIR= ${DISTNAME} MAINTAINER= knu@FreeBSD.org COMMENT= The OpenSSL library cross-compiled for MinGW32 BUILD_DEPENDS= makedepend:devel/makedepend \ ${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \ ${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt \ ${LOCALBASE}/mingw32/lib/libz.a:devel/mingw32-zlib USES= perl5 shebangfix SHEBANG_FILES= apps/tsget USE_PERL5= build MAKE_JOBS_UNSAFE= yes CONFIGURE_PREFIX= ${PREFIX}/mingw32 OPENSSLDIR= ${CONFIGURE_PREFIX}/openssl INSTALL_TARGET= install_sw post-patch: @${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile do-configure: cd ${WRKSRC} && ${SETENV} PERL="${PERL}" CROSS_COMPILE="${PKGNAMEPREFIX}" \ ./Configure mingw --prefix="${CONFIGURE_PREFIX}" --install_prefix=${STAGEDIR} \ --openssldir="${OPENSSLDIR}" .include Index: head/security/openssl/Makefile =================================================================== --- head/security/openssl/Makefile (revision 422232) +++ head/security/openssl/Makefile (revision 422233) @@ -1,220 +1,219 @@ # Created by: Dirk Froemberg # $FreeBSD$ PORTNAME= openssl PORTVERSION= 1.0.2 DISTVERSIONSUFFIX= h PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/source/ \ - ftp://ftp.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ DIST_SUBDIR= ${DISTNAME} MAINTAINER= dinoex@FreeBSD.org COMMENT= SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE MAKE_JOBS_UNSAFE= yes CPE_VERSION= ${PORTVERSION}${DISTVERSIONSUFFIX} CONFLICTS= libressl-[0-9]* \ libressl-devel-[0-9]* \ openssl-devel-[0-9]* OPTIONS_DEFINE= SHARED THREADS SSE2 PADLOCK ZLIB SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS MAN3 OPTIONS_DEFAULT=SHARED THREADS SSE2 SCTP SSL2 SSL3 MD2 MAN3 OPTIONS_DEFINE_i386= I386 OPTIONS_DEFINE_amd64= EC OPTIONS_DEFAULT_amd64= EC OPTIONS_DEFINE_ia64= EC OPTIONS_DEFAULT_ia64= EC TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == "mips64el" OPTIONS_DEFINE_mips= EC OPTIONS_DEFAULT_mips= EC .endif NO_OPTIONS_SORT=yes OPTIONS_SUB= yes I386_DESC?= Optimize for i386 (instead of i486+) SSE2_DESC?= runtime SSE2 detection PADLOCK_DESC?= VIA Padlock support SHARED_DESC?= build of shared libs ZLIB_DESC?= zlib compression support SCTP_DESC?= SCTP protocol support SSL2_DESC?= SSLv2 protocol support SSL3_DESC?= SSLv3 protocol support RFC3779_DESC?= RFC3779 support (BGP) MD2_DESC?= MD2 hash (obsolete) RC5_DESC?= RC5 cipher (patented) EXPCIPHERS_DESC?= Include experimental ciphers EC_DESC?= Optimize NIST elliptic curves MAN3_DESC?= Install API manpages (section 3) USES= cpe perl5 USE_PERL5= build MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= SUB_FILES= pkg-message .include .if ${PREFIX} == /usr IGNORE= the OpenSSL port can not be installed over the base version .endif OPENSSLDIR?= ${PREFIX}/openssl PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} OPENSSL_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E} OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} .include "version.mk" .if ${PORT_OPTIONS:MI386} .if ${ARCH} == "i386" EXTRACONFIGURE+= 386 .endif .endif .if empty(PORT_OPTIONS:MSSE2) # disable runtime SSE2 detection EXTRACONFIGURE+= no-sse2 .endif EXTRACONFIGURE+= no-asm .if ${PORT_OPTIONS:MTHREADS} EXTRACONFIGURE+= threads .else EXTRACONFIGURE+= no-threads .endif .if ${PORT_OPTIONS:MSHARED} EXTRACONFIGURE+= shared MAKE_ENV+= SHLIBVER=${OPENSSL_SHLIBVER} PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER} USE_LDCONFIG= yes .endif .if ${PORT_OPTIONS:MZLIB} EXTRACONFIGURE+= zlib zlib-dynamic .else EXTRACONFIGURE+= no-zlib no-zlib-dynamic .endif .if ${PORT_OPTIONS:MSCTP} EXTRACONFIGURE+= sctp .else EXTRACONFIGURE+= no-sctp .endif .if ${PORT_OPTIONS:MSSL2} EXTRACONFIGURE+= enable-ssl2 .else EXTRACONFIGURE+= no-ssl2 .endif .if ${PORT_OPTIONS:MSSL3} EXTRACONFIGURE+= enable-ssl3 .else EXTRACONFIGURE+= no-ssl3 no-ssl3-method .endif .if ${PORT_OPTIONS:MMD2} EXTRACONFIGURE+= enable-md2 .else EXTRACONFIGURE+= no-md2 .endif .if ${PORT_OPTIONS:MRC5} EXTRACONFIGURE+= enable-rc5 .else EXTRACONFIGURE+= no-rc5 .endif .if ${PORT_OPTIONS:MPADLOCK} PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock PATCHFILES+= 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \ 1002-backport-changes-from-upstream-padlock-module.patch:padlock \ 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch:padlock \ 1004-crypto-engine-autoload-padlock-dynamic-engine.patch:padlock .endif EXTRACONFIGURE+= no-gmp .if ${PORT_OPTIONS:MRFC3779} EXTRACONFIGURE+= enable-rfc3779 .else EXTRACONFIGURE+= no-rfc3779 .endif .if ${PORT_OPTIONS:MEC} EXTRACONFIGURE+= enable-ec_nistp_64_gcc_128 .else EXTRACONFIGURE+= no-ec_nistp_64_gcc_128 .endif .if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER} pre-everything:: @${ECHO_CMD} "#" @${ECHO_CMD} "# this ports conflicts with your base system" @${ECHO_CMD} "# you have to uninstall your ssl port" @${ECHO_CMD} "# please use DEFAULT_VERSIONS+= ssl=base instead." @${ECHO_CMD} "#" @${FALSE} .endif post-patch: ${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile ${REINPLACE_CMD} -e 's|SHLIB_VERSION_NUMBER "1.0.0"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ ${WRKSRC}/crypto/opensslv.h ${REINPLACE_CMD} -e 's|ERR_R_MALLOC_ERROR|ERR_R_MALLOC_FAILURE|' \ ${WRKSRC}/crypto/bio/bss_dgram.c .if ${PORT_OPTIONS:MEXPCIPHERS} ${REINPLACE_CMD} -e 's|TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0|TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 1|' \ ${WRKSRC}/ssl/tls1.h .endif do-configure: ${REINPLACE_CMD} -e "s|options 386|options|" \ ${WRKSRC}/config cd ${WRKSRC} \ && ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \ ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ --install_prefix=${STAGEDIR} \ -L${PREFIX}/lib ${EXTRACONFIGURE} post-configure: ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ -e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \ ${WRKSRC}/Makefile post-install-SHARED-on: .for i in libcrypto libssl ${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib ${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so .endfor post-install-MAN3-off: ${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3 ${REINPLACE_CMD} -e 's|^man/man3/.*||' ${TMPPLIST} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${STAGEDIR}${DOCSDIR}/ test: build cd ${WRKSRC} && ${MAKE} test regression-test: test .include Index: head/security/openssl-devel/Makefile =================================================================== --- head/security/openssl-devel/Makefile (revision 422232) +++ head/security/openssl-devel/Makefile (revision 422233) @@ -1,147 +1,146 @@ # Created by: Dirk Froemberg # $FreeBSD$ PORTNAME= openssl DISTVERSION= 1.1.0 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ - ftp://ftp.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ PKGNAMESUFFIX= -devel MAINTAINER= brnrd@FreeBSD.org COMMENT= SSL and crypto library (1.1.x) LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE 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 THREADS OPTIONS_DEFINE_i386= I386 OPTIONS_GROUP_PROTOCOLS= NEXTPROTONEG SCTP SSL3 OPTIONS_DEFINE= SHARED THREADS ZLIB RFC3779 MAN3 OPTIONS_DEFINE_amd64= EC OPTIONS_DEFAULT_amd64= EC OPTIONS_DEFINE_ia64= EC OPTIONS_DEFAULT_ia64= EC .if ${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 EC_DESC= Optimize NIST elliptic curves HASHES_DESC= Hash Function Support I386_DESC= i386 (instead of i486+) IDEA_DESC= IDEA JPAKE_DESC= J-PAKE (experimental) MAN3_DESC= Install API manpages (section 3) MD2_DESC= MD2 (obsolete) MD4_DESC= MD4 (unsafe) MDC2_DESC= MDC-2 MD_GHOST94_DESC= GHOST94 (obscure) NEXTPROTONEG_DESC= Next Protocol Negotiation (SPDY) OPTIMIZE_DESC= Optimizations PROTOCOLS_DESC= Protocol Support RC2_DESC= RC2 (unsafe) RC4_DESC= RC4 (unsafe) RC5_DESC= RC5 (patented) RMD160_DESC= RIPEMD-160 RFC3779_DESC= RFC3779 support (BGP) SCTP_DESC= SCTP (Stream Control Transmission) SHARED_DESC= Build shared libraries SSE2_DESC= Runtime SSE2 detection SSL3_DESC= SSLv3 (unsafe) ZLIB_DESC= zlib compression support OPTIONS_SUB= yes USES= cpe perl5 USE_PERL5= build MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= TEST_TARGET= test # 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 EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128 I386_CONFIGURE_ON= 386 SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_USE= ldconfig=yes .include .if ${PREFIX} == /usr IGNORE= the OpenSSL port can not be installed over the base version .endif OPENSSLDIR?= ${PREFIX}/openssl PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} OPENSSL_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E} OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} .include "version.mk" .if ${PORT_OPTIONS:MASM} 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' \ ${WRKSRC}/Configurations/unix-Makefile.tmpl post-configure: ${REINPLACE_CMD} \ -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|${OPENSSL_SHLIBVER}|g' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} \ -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 ${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 padlock ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-1.1/${i}.so .endfor post-install-MAN3-off: ${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3 ${REINPLACE_CMD} -e 's|^man/man3/.*||' ${TMPPLIST} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl .include