[Midnightbsd-cvs] mports [18242] trunk/security/openssl: openssl 1.0.1m
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Mar 19 19:53:24 EDT 2015
Revision: 18242
http://svnweb.midnightbsd.org/mports/?rev=18242
Author: laffer1
Date: 2015-03-19 19:53:23 -0400 (Thu, 19 Mar 2015)
Log Message:
-----------
openssl 1.0.1m
Modified Paths:
--------------
trunk/security/openssl/Makefile
trunk/security/openssl/distinfo
trunk/security/openssl/files/patch-Configure
trunk/security/openssl/files/patch-ssl-srtp.h
trunk/security/openssl/pkg-plist
Added Paths:
-----------
trunk/security/openssl/files/patch-Makefile
trunk/security/openssl/files/patch-crypto_bio_bss__dgram.c
trunk/security/openssl/files/patch-crypto_evp_openbsd__hw.c
trunk/security/openssl/files/patch-crypto_md5_md5.c
Removed Paths:
-------------
trunk/security/openssl/files/patch-RFC-5705
trunk/security/openssl/files/patch-ak
Modified: trunk/security/openssl/Makefile
===================================================================
--- trunk/security/openssl/Makefile 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/Makefile 2015-03-19 23:53:23 UTC (rev 18242)
@@ -2,8 +2,8 @@
PORTNAME= openssl
PORTVERSION= 1.0.1
-PORTREVISION= 5
-DISTVERSIONSUFFIX= l
+DISTVERSIONSUFFIX= m
+PORTREVISION= 7
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -20,13 +20,19 @@
.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
-OPTIONS_DEFINE= SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB SCTP MD2 RC5 RFC3779 GMP
-OPTIONS_DEFAULT=SHARED THREADS SSE2 ASM ZLIB SCTP MD2
+CONFLICTS?= libressl-*
+
+OPTIONS_DEFINE= SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB GMP SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS
+OPTIONS_DEFAULT=SHARED THREADS SSE2 ASM ZLIB SCTP SSL2 SSL3 MD2
.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+)
@@ -35,24 +41,30 @@
PADLOCK_DESC?= VIA Padlock support
SHARED_DESC?= build of shared libs
ZLIB_DESC?= zlib compression support
+GMP_DESC?= gmp support (LGPLv3)
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)
-RFC3779_DESC?= RFC3779 support
-GMP_DESC?= gmp support (LGPLv3)
+EXPCIPHERS_DESC?= Include experimental ciphers
EC_DESC?= Optimize NIST elliptic curves
+GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
+
MAKE_JOBS_UNSAFE= yes
NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch
NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch
-USE_PERL5_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5 cpe
+USE_PERL5= build
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
-MAKE_ENV+= LIBRPATH="${PREFIX}/lib"
+MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
SUB_FILES= pkg-message
-OPENSSLDIR= ${PREFIX}/openssl
+CPE_VERSION= ${PORTVERSION}${DISTVERSIONSUFFIX}
+
FIX_POD=apps/cms.pod \
apps/smime.pod \
ssl/SSL_COMP_add_compression_method.pod \
@@ -79,6 +91,9 @@
IGNORE= OpenSSL 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}
@@ -126,6 +141,18 @@
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
+.endif
+
.if ${PORT_OPTIONS:MMD2}
EXTRACONFIGURE+= enable-md2
.else
@@ -139,7 +166,7 @@
.endif
.if ${PORT_OPTIONS:MPADLOCK}
-#BROKEN= does not build with openssl-1.0.1f
+BROKEN= unfetchable do to rushed security update
PATCH_DIST_STRIP= -p1
PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock
PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \
@@ -185,6 +212,10 @@
${WRKSRC}/crypto/des/Makefile
${REINPLACE_CMD} -e 's|SHLIB_VERSION_NUMBER "1.0.0"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \
${WRKSRC}/crypto/opensslv.h
+.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|" \
Modified: trunk/security/openssl/distinfo
===================================================================
--- trunk/security/openssl/distinfo 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/distinfo 2015-03-19 23:53:23 UTC (rev 18242)
@@ -1,10 +1,10 @@
-SHA256 (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4
-SIZE (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = 4429979
-SHA256 (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
-SIZE (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
-SHA256 (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2
-SIZE (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5415
-SHA256 (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
-SIZE (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
-SHA256 (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
-SIZE (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
+SHA256 (openssl-1.0.1m/openssl-1.0.1m.tar.gz) = 095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
+SIZE (openssl-1.0.1m/openssl-1.0.1m.tar.gz) = 4533406
+SHA256 (openssl-1.0.1m/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
+SIZE (openssl-1.0.1m/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
+SHA256 (openssl-1.0.1m/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2
+SIZE (openssl-1.0.1m/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5415
+SHA256 (openssl-1.0.1m/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
+SIZE (openssl-1.0.1m/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
+SHA256 (openssl-1.0.1m/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
+SIZE (openssl-1.0.1m/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
Modified: trunk/security/openssl/files/patch-Configure
===================================================================
--- trunk/security/openssl/files/patch-Configure 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/files/patch-Configure 2015-03-19 23:53:23 UTC (rev 18242)
@@ -1,6 +1,6 @@
---- Configure.orig 2012-03-03 14:18:06.000000000 +0100
-+++ Configure 2012-03-25 19:22:16.000000000 +0200
-@@ -150,7 +150,7 @@
+--- Configure.orig 2015-03-19 13:37:10 UTC
++++ Configure
+@@ -150,7 +150,7 @@ my $no_asm=":::::::::::::::void";
# which has to be accompanied by explicit -D_THREAD_SAFE and
# sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
# seems to be sufficient?
@@ -9,33 +9,45 @@
#config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
-@@ -407,19 +407,20 @@
+@@ -409,19 +409,19 @@ my %table=(
"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### *BSD [do see comment about ${BSDthreads} above!]
--"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic32","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"BSD-generic32","$ENV{'FREEBSDCC'}:-O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIBVER)",
++"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
--"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic64","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"BSD-generic64","$ENV{'FREEBSDCC'}:-O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
# simply *happens* to work around a compiler bug in gcc 3.3.3,
# triggered by RIPEMD160 code.
--"BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-sparc64", "gcc:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-ia64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86_64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
"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)",
+@@ -1934,10 +1934,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');
++ &dofile("apps/tsget",$perl,'^#!/', '#!%s');
+ } else {
+ # No path for Perl known ...
+ &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
+ &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
++ &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s');
+ }
+ if ($depflags ne $default_depflags && !$make_depend) {
+ print <<EOF;
Added: trunk/security/openssl/files/patch-Makefile
===================================================================
--- trunk/security/openssl/files/patch-Makefile (rev 0)
+++ trunk/security/openssl/files/patch-Makefile 2015-03-19 23:53:23 UTC (rev 18242)
@@ -0,0 +1,11 @@
+--- apps/Makefile.orig Tue Aug 10 11:09:07 2004
++++ apps/Makefile Tue Oct 26 07:00:51 2004
+@@ -112,7 +112,7 @@
+ done
+ @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+ chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
++ mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
+
+ tags:
+ ctags $(SRC)
Property changes on: trunk/security/openssl/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/security/openssl/files/patch-RFC-5705
===================================================================
--- trunk/security/openssl/files/patch-RFC-5705 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/files/patch-RFC-5705 2015-03-19 23:53:23 UTC (rev 18242)
@@ -1,34 +0,0 @@
---- ssl/ssl.h 6 Jan 2010 17:37:38 -0000 1.221.2.24
-+++ ssl/ssl.h 17 Jun 2010 12:25:35 -0000
-@@ -1806,6 +1806,10 @@
- /* Pre-shared secret session resumption functions */
- int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
-
-+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
-+ unsigned char *context, int context_len,
-+ unsigned char *out, int olen);
-+
- /* BEGIN ERROR CODES */
- /* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
-
---- ssl/t1_enc.c 15 Jun 2010 17:25:15 -0000 1.57.2.3
-+++ ssl/t1_enc.c 17 Jun 2010 12:25:35 -0000
-@@ -1043,3 +1043,17 @@
- }
- }
-
-+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
-+ unsigned char *context, int context_len,
-+ unsigned char *out, int olen)
-+ {
-+ unsigned char tmp[olen];
-+
-+ tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
-+ label, label_len,
-+ s->s3->client_random,SSL3_RANDOM_SIZE,
-+ s->s3->server_random,SSL3_RANDOM_SIZE,
-+ context, context_len, NULL, 0,
-+ s->session->master_key, s->session->master_key_length,
-+ out, tmp, olen);
-+ }
Deleted: trunk/security/openssl/files/patch-ak
===================================================================
--- trunk/security/openssl/files/patch-ak 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/files/patch-ak 2015-03-19 23:53:23 UTC (rev 18242)
@@ -1,11 +0,0 @@
---- apps/Makefile.orig Tue Aug 10 11:09:07 2004
-+++ apps/Makefile Tue Oct 26 07:00:51 2004
-@@ -112,7 +112,7 @@
- done
- @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
- chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
-- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-+ mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
-
- tags:
- ctags $(SRC)
Added: trunk/security/openssl/files/patch-crypto_bio_bss__dgram.c
===================================================================
--- trunk/security/openssl/files/patch-crypto_bio_bss__dgram.c (rev 0)
+++ trunk/security/openssl/files/patch-crypto_bio_bss__dgram.c 2015-03-19 23:53:23 UTC (rev 18242)
@@ -0,0 +1,20 @@
+--- crypto/bio/bss_dgram.c.orig 2015-03-19 13:37:10 UTC
++++ crypto/bio/bss_dgram.c
+@@ -1293,7 +1293,7 @@ static int dgram_sctp_read(BIO *b, char
+ (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+ authchunks = OPENSSL_malloc(optlen);
+ if (!authchunks) {
+- BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
++ BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
+ return -1;
+ }
+ memset(authchunks, 0, sizeof(optlen));
+@@ -1365,7 +1365,7 @@ static int dgram_sctp_write(BIO *b, cons
+ char *tmp;
+ data->saved_message.bio = b;
+ if(!(tmp = OPENSSL_malloc(inl))) {
+- BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
++ BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
+ return -1;
+ }
+ if (data->saved_message.data)
Property changes on: trunk/security/openssl/files/patch-crypto_bio_bss__dgram.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/openssl/files/patch-crypto_evp_openbsd__hw.c
===================================================================
--- trunk/security/openssl/files/patch-crypto_evp_openbsd__hw.c (rev 0)
+++ trunk/security/openssl/files/patch-crypto_evp_openbsd__hw.c 2015-03-19 23:53:23 UTC (rev 18242)
@@ -0,0 +1,14 @@
+--- crypto/evp/openbsd_hw.c.orig 2015-03-19 13:19:00 UTC
++++ crypto/evp/openbsd_hw.c
+@@ -108,7 +108,10 @@ static int dev_crypto_init(session_op *s
+ dev_failed = 1;
+ return 0;
+ }
+- close(cryptodev_fd);
++ if (fd == -1)
++ fd = cryptodev_fd;
++ else
++ close(cryptodev_fd);
+ }
+ assert(ses);
+ memset(ses, '\0', sizeof *ses);
Property changes on: trunk/security/openssl/files/patch-crypto_evp_openbsd__hw.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/openssl/files/patch-crypto_md5_md5.c
===================================================================
--- trunk/security/openssl/files/patch-crypto_md5_md5.c (rev 0)
+++ trunk/security/openssl/files/patch-crypto_md5_md5.c 2015-03-19 23:53:23 UTC (rev 18242)
@@ -0,0 +1,11 @@
+--- crypto/md5/md5.c.orig 2015-03-19 13:19:00 UTC
++++ crypto/md5/md5.c
+@@ -83,7 +83,7 @@ int main(int argc, char **argv)
+ err++;
+ continue;
+ }
+- printf("MD5(%s)= ", argv[i]);
++ printf("MD5 (%s) = ", argv[i]);
+ do_fp(IN);
+ fclose(IN);
+ }
Property changes on: trunk/security/openssl/files/patch-crypto_md5_md5.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/security/openssl/files/patch-ssl-srtp.h
===================================================================
--- trunk/security/openssl/files/patch-ssl-srtp.h 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/files/patch-ssl-srtp.h 2015-03-19 23:53:23 UTC (rev 18242)
@@ -1,10 +1,10 @@
---- ssl/srtp.h.orig 2012-04-26 22:40:38.000000000 -0500
-+++ ssl/srtp.h 2012-04-26 22:40:51.000000000 -0500
-@@ -135,7 +135,6 @@
+--- ssl/srtp.h.orig 2015-03-19 13:37:10 UTC
++++ ssl/srtp.h
+@@ -137,7 +137,6 @@ int SSL_set_tlsext_use_srtp(SSL *ctx, co
SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
- #ifdef __cplusplus
- }
+ # endif
+
Modified: trunk/security/openssl/pkg-plist
===================================================================
--- trunk/security/openssl/pkg-plist 2015-03-19 21:57:35 UTC (rev 18241)
+++ trunk/security/openssl/pkg-plist 2015-03-19 23:53:23 UTC (rev 18242)
@@ -101,6 +101,7 @@
%%SHARED%%@dirrm lib/engines
man/man1/CA.pl.1.gz
man/man1/asn1parse.1.gz
+man/man1/c_rehash.1.gz
man/man1/ca.1.gz
man/man1/ciphers.1.gz
man/man1/cms.1.gz
@@ -110,6 +111,7 @@
man/man1/dhparam.1.gz
man/man1/dsa.1.gz
man/man1/dsaparam.1.gz
+man/man1/dss1.1.gz
man/man1/ec.1.gz
man/man1/ecparam.1.gz
man/man1/enc.1.gz
@@ -142,6 +144,10 @@
man/man1/sess_id.1.gz
man/man1/sha.1.gz
man/man1/sha1.1.gz
+man/man1/sha224.1.gz
+man/man1/sha256.1.gz
+man/man1/sha384.1.gz
+man/man1/sha512.1.gz
man/man1/smime.1.gz
man/man1/speed.1.gz
man/man1/spkac.1.gz
@@ -413,6 +419,7 @@
man/man3/CMS_add1_ReceiptRequest.3.gz
man/man3/CMS_add1_cert.3.gz
man/man3/CMS_add1_recipient_cert.3.gz
+man/man3/CMS_add1_signer.3.gz
man/man3/CMS_compress.3.gz
man/man3/CMS_decrypt.3.gz
man/man3/CMS_encrypt.3.gz
@@ -419,6 +426,7 @@
man/man3/CMS_final.3.gz
man/man3/CMS_get0_RecipientInfos.3.gz
man/man3/CMS_get0_SignerInfos.3.gz
+man/man3/CMS_get0_content.3.gz
man/man3/CMS_get0_eContentType.3.gz
man/man3/CMS_get0_type.3.gz
man/man3/CMS_get1_ReceiptRequest.3.gz
@@ -911,6 +919,7 @@
man/man3/SSL_CTX_get_cert_store.3.gz
man/man3/SSL_CTX_get_client_CA_list.3.gz
man/man3/SSL_CTX_get_client_cert_cb.3.gz
+man/man3/SSL_CTX_get_default_read_ahead.3.gz
man/man3/SSL_CTX_get_ex_data.3.gz
man/man3/SSL_CTX_get_ex_new_index.3.gz
man/man3/SSL_CTX_get_info_callback.3.gz
@@ -918,6 +927,7 @@
man/man3/SSL_CTX_get_mode.3.gz
man/man3/SSL_CTX_get_options.3.gz
man/man3/SSL_CTX_get_quiet_shutdown.3.gz
+man/man3/SSL_CTX_get_read_ahead.3.gz
man/man3/SSL_CTX_get_session_cache_mode.3.gz
man/man3/SSL_CTX_get_timeout.3.gz
man/man3/SSL_CTX_get_verify_callback.3.gz
@@ -955,6 +965,7 @@
man/man3/SSL_CTX_set_client_cert_cb.3.gz
man/man3/SSL_CTX_set_default_passwd_cb.3.gz
man/man3/SSL_CTX_set_default_passwd_cb_userdata.3.gz
+man/man3/SSL_CTX_set_default_read_ahead.3.gz
man/man3/SSL_CTX_set_ex_data.3.gz
man/man3/SSL_CTX_set_generate_session_id.3.gz
man/man3/SSL_CTX_set_info_callback.3.gz
@@ -966,10 +977,12 @@
man/man3/SSL_CTX_set_psk_client_callback.3.gz
man/man3/SSL_CTX_set_psk_server_callback.3.gz
man/man3/SSL_CTX_set_quiet_shutdown.3.gz
+man/man3/SSL_CTX_set_read_ahead.3.gz
man/man3/SSL_CTX_set_session_cache_mode.3.gz
man/man3/SSL_CTX_set_session_id_context.3.gz
man/man3/SSL_CTX_set_ssl_version.3.gz
man/man3/SSL_CTX_set_timeout.3.gz
+man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3.gz
man/man3/SSL_CTX_set_tmp_dh.3.gz
man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
man/man3/SSL_CTX_set_tmp_rsa.3.gz
@@ -1038,6 +1051,7 @@
man/man3/SSL_get_psk_identity_hint.3.gz
man/man3/SSL_get_quiet_shutdown.3.gz
man/man3/SSL_get_rbio.3.gz
+man/man3/SSL_get_read_ahead.3.gz
man/man3/SSL_get_secure_renegotiation_support.3.gz
man/man3/SSL_get_session.3.gz
man/man3/SSL_get_shutdown.3.gz
@@ -1074,6 +1088,7 @@
man/man3/SSL_set_psk_client_callback.3.gz
man/man3/SSL_set_psk_server_callback.3.gz
man/man3/SSL_set_quiet_shutdown.3.gz
+man/man3/SSL_set_read_ahead.3.gz
man/man3/SSL_set_session.3.gz
man/man3/SSL_set_session_id_context.3.gz
man/man3/SSL_set_shutdown.3.gz
@@ -1226,11 +1241,14 @@
man/man3/crypto.3.gz
man/man3/d2i_509_CRL_fp.3.gz
man/man3/d2i_ASN1_OBJECT.3.gz
+man/man3/d2i_CMS_ContentInfo.3.gz
man/man3/d2i_DHparams.3.gz
man/man3/d2i_DSAPrivateKey.3.gz
man/man3/d2i_DSAPublicKey.3.gz
man/man3/d2i_DSA_PUBKEY.3.gz
man/man3/d2i_DSA_SIG.3.gz
+man/man3/d2i_ECPrivateKey.3.gz
+man/man3/d2i_ECPrivate_key.3.gz
man/man3/d2i_Netscape_RSA.3.gz
man/man3/d2i_PKCS8PrivateKey.3.gz
man/man3/d2i_PKCS8PrivateKey_bio.3.gz
@@ -1263,6 +1281,7 @@
man/man3/evp.3.gz
man/man3/hmac.3.gz
man/man3/i2d_ASN1_OBJECT.3.gz
+man/man3/i2d_CMS_ContentInfo.3.gz
man/man3/i2d_CMS_bio_stream.3.gz
man/man3/i2d_DHparams.3.gz
man/man3/i2d_DSAPrivateKey.3.gz
@@ -1269,6 +1288,7 @@
man/man3/i2d_DSAPublicKey.3.gz
man/man3/i2d_DSA_PUBKEY.3.gz
man/man3/i2d_DSA_SIG.3.gz
+man/man3/i2d_ECPrivateKey.3.gz
man/man3/i2d_Netscape_RSA.3.gz
man/man3/i2d_PKCS7_bio_stream.3.gz
man/man3/i2d_PKCS8PrivateKey_bio.3.gz
@@ -1322,18 +1342,18 @@
man/man5/config.5.gz
man/man5/x509v3_config.5.gz
man/man7/des_modes.7.gz
-openssl/misc/CA.pl
-openssl/misc/CA.sh
-openssl/misc/c_hash
-openssl/misc/c_info
-openssl/misc/c_issuer
-openssl/misc/c_name
-openssl/misc/tsget
-openssl/openssl.cnf.sample
+%%OPENSSLDIR%%/misc/CA.pl
+%%OPENSSLDIR%%/misc/CA.sh
+%%OPENSSLDIR%%/misc/c_hash
+%%OPENSSLDIR%%/misc/c_info
+%%OPENSSLDIR%%/misc/c_issuer
+%%OPENSSLDIR%%/misc/c_name
+%%OPENSSLDIR%%/misc/tsget
+%%OPENSSLDIR%%/openssl.cnf.sample
%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
@dirrm include/openssl
- at dirrmtry openssl/certs
- at dirrm openssl/misc
- at dirrmtry openssl/private
- at dirrm openssl
+ at dirrmtry %%OPENSSLDIR%%/certs
+ at dirrm %%OPENSSLDIR%%/misc
+ at dirrmtry %%OPENSSLDIR%%/private
+ at dirrm %%OPENSSLDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the Midnightbsd-cvs
mailing list