Index: security/Makefile =================================================================== --- security/Makefile +++ security/Makefile @@ -417,6 +417,7 @@ SUBDIR += openssh-portable SUBDIR += openssl SUBDIR += openssl-devel + SUBDIR += openssl-unsafe SUBDIR += openssl_tpm_engine SUBDIR += openvas-cli SUBDIR += openvas-libraries Index: security/openssl-unsafe/Makefile =================================================================== --- security/openssl-unsafe/Makefile +++ security/openssl-unsafe/Makefile @@ -3,173 +3,43 @@ 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} +PKGNAMESUFFIX= -unsafe -MAINTAINER= dinoex@FreeBSD.org -COMMENT= SSL and crypto library +MAINTAINER= brnrd@FreeBSD.org +COMMENT= Unsafe 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 -.for a in amd64 ia64 -OPTIONS_DEFINE_${a}= EC -OPTIONS_DEFAULT_${a}= EC -.endfor -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) + +USE_GITHUB= yes +GH_ACCOUNT= PeterMosmans +GH_TAGNAME= 2622e9bff72f4949c285f2d955c2f78663d79776 + +ONLY_FOR_ARCHS= amd64 USES= cpe perl5 USE_PERL5= build MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive -MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= +MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER} +CFLAGS+= -fPIC SUB_FILES= pkg-message +PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER} +USE_LDCONFIG= yes .include -.if ${PREFIX} == /usr -IGNORE= the OpenSSL port can not be installed over the base version -.endif +CONFIGURE_ARGS= experimental-jpake experimental-store \ + enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-rfc3779 enable-ssl-trace \ + sctp shared threads zlib zlib-dynamic no-gmp -OPENSSLDIR?= ${PREFIX}/openssl +OPENSSLDIR?= ${PREFIX}/openssl-unsafe 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 @@ -177,19 +47,17 @@ ${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} \ + ./config --prefix=${PREFIX}/openssl-unsafe --openssldir=${OPENSSLDIR} \ --install_prefix=${STAGEDIR} \ - -L${PREFIX}/lib ${EXTRACONFIGURE} + -L${PREFIX}/openssl-unsafe/lib ${CONFIGURE_ARGS} post-configure: ${REINPLACE_CMD} \ @@ -198,23 +66,7 @@ -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: security/openssl-unsafe/distinfo =================================================================== --- security/openssl-unsafe/distinfo +++ security/openssl-unsafe/distinfo @@ -1,10 +1,3 @@ -SHA256 (openssl-1.0.2h/openssl-1.0.2h.tar.gz) = 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 -SIZE (openssl-1.0.2h/openssl-1.0.2h.tar.gz) = 5274412 -SHA256 (openssl-1.0.2h/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7 -SIZE (openssl-1.0.2h/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717 -SHA256 (openssl-1.0.2h/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260 -SIZE (openssl-1.0.2h/1002-backport-changes-from-upstream-padlock-module.patch) = 5770 -SHA256 (openssl-1.0.2h/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea -SIZE (openssl-1.0.2h/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20935 -SHA256 (openssl-1.0.2h/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 97eb4411d0fc0890e94bc7c2d682f68b71135da782af769ca73914b37da2b1fd -SIZE (openssl-1.0.2h/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 832 +TIMESTAMP = 1486553413 +SHA256 (PeterMosmans-openssl-1.0.2-2622e9bff72f4949c285f2d955c2f78663d79776_GH0.tar.gz) = 640c5a7e3e191b5644b911cee683749ab0cc80f3d17cda0a60f3e19adbcf1a6b +SIZE (PeterMosmans-openssl-1.0.2-2622e9bff72f4949c285f2d955c2f78663d79776_GH0.tar.gz) = 5523167 Index: security/openssl-unsafe/files/patch-Configure =================================================================== --- security/openssl-unsafe/files/patch-Configure +++ security/openssl-unsafe/files/patch-Configure @@ -1,6 +1,6 @@ ---- Configure.orig 2015-06-11 15:50:11.000000000 +0200 -+++ Configure 2015-06-12 16:20:39.000000000 +0200 -@@ -467,19 +467,20 @@ +--- Configure.orig 2016-08-22 07:21:00 UTC ++++ Configure +@@ -472,19 +472,20 @@ my %table=( "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### *BSD [do see comment about ${BSDthreads} above!] @@ -30,7 +30,7 @@ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -2019,10 +2020,12 @@ +@@ -2055,10 +2056,12 @@ EOF if ( $perl =~ m@^/@) { &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); @@ -42,4 +42,4 @@ + &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s'); } if ($depflags ne $default_depflags && !$make_depend) { - print <