From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 19 20:29:23 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C901FE23; Thu, 19 Mar 2015 20:29:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B173B27B; Thu, 19 Mar 2015 20:29:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JKTNt3059083; Thu, 19 Mar 2015 20:29:23 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JKTKbT059068; Thu, 19 Mar 2015 20:29:20 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201503192029.t2JKTKbT059068@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 19 Mar 2015 20:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r381687 - in branches/2015Q1/security/openssl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 20:29:23 -0000 Author: delphij Date: Thu Mar 19 20:29:19 2015 New Revision: 381687 URL: https://svnweb.freebsd.org/changeset/ports/381687 QAT: https://qat.redports.org/buildarchive/r381687/ Log: MFH r381686: update to 1.0.1m. Approved by: ports-secteam@ Added: branches/2015Q1/security/openssl/files/patch-crypto_bio_bss__dgram.c - copied unchanged from r381686, head/security/openssl/files/patch-crypto_bio_bss__dgram.c branches/2015Q1/security/openssl/files/patch-crypto_evp_openbsd__hw.c - copied unchanged from r381686, head/security/openssl/files/patch-crypto_evp_openbsd__hw.c branches/2015Q1/security/openssl/files/patch-crypto_md5_md5.c - copied unchanged from r381686, head/security/openssl/files/patch-crypto_md5_md5.c Deleted: branches/2015Q1/security/openssl/files/patch-RFC-5705 branches/2015Q1/security/openssl/files/patch-md5.c branches/2015Q1/security/openssl/files/patch-openbsd_hw.c Modified: branches/2015Q1/security/openssl/Makefile branches/2015Q1/security/openssl/distinfo branches/2015Q1/security/openssl/files/patch-Configure branches/2015Q1/security/openssl/files/patch-config branches/2015Q1/security/openssl/files/patch-ssl-srtp.h branches/2015Q1/security/openssl/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/openssl/Makefile ============================================================================== --- branches/2015Q1/security/openssl/Makefile Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/Makefile Thu Mar 19 20:29:19 2015 (r381687) @@ -3,8 +3,8 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= l -PORTREVISION= 18 +DISTVERSIONSUFFIX= m +PORTREVISION= 19 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2015Q1/security/openssl/distinfo ============================================================================== --- branches/2015Q1/security/openssl/distinfo Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/distinfo Thu Mar 19 20:29:19 2015 (r381687) @@ -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: branches/2015Q1/security/openssl/files/patch-Configure ============================================================================== --- branches/2015Q1/security/openssl/files/patch-Configure Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/files/patch-Configure Thu Mar 19 20:29:19 2015 (r381687) @@ -1,6 +1,6 @@ ---- Configure.orig 2014-03-17 17:14:20.000000000 +0100 -+++ Configure 2014-04-12 17:20:19.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,37 +9,36 @@ #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 -@@ -409,19 +409,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 -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)", -@@ -1922,10 +1923,12 @@ +@@ -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'); Modified: branches/2015Q1/security/openssl/files/patch-config ============================================================================== --- branches/2015Q1/security/openssl/files/patch-config Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/files/patch-config Thu Mar 19 20:29:19 2015 (r381687) @@ -1,6 +1,6 @@ ---- config.orig 2013-06-16 07:01:13.038797248 -0500 -+++ config 2013-06-16 07:01:18.138794838 -0500 -@@ -734,14 +734,8 @@ +--- config.orig 2015-03-19 13:37:10 UTC ++++ config +@@ -734,14 +734,8 @@ case "$GUESSOS" in sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; Copied: branches/2015Q1/security/openssl/files/patch-crypto_bio_bss__dgram.c (from r381686, head/security/openssl/files/patch-crypto_bio_bss__dgram.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/openssl/files/patch-crypto_bio_bss__dgram.c Thu Mar 19 20:29:19 2015 (r381687, copy of r381686, head/security/openssl/files/patch-crypto_bio_bss__dgram.c) @@ -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) Copied: branches/2015Q1/security/openssl/files/patch-crypto_evp_openbsd__hw.c (from r381686, head/security/openssl/files/patch-crypto_evp_openbsd__hw.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/openssl/files/patch-crypto_evp_openbsd__hw.c Thu Mar 19 20:29:19 2015 (r381687, copy of r381686, head/security/openssl/files/patch-crypto_evp_openbsd__hw.c) @@ -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); Copied: branches/2015Q1/security/openssl/files/patch-crypto_md5_md5.c (from r381686, head/security/openssl/files/patch-crypto_md5_md5.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/openssl/files/patch-crypto_md5_md5.c Thu Mar 19 20:29:19 2015 (r381687, copy of r381686, head/security/openssl/files/patch-crypto_md5_md5.c) @@ -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); + } Modified: branches/2015Q1/security/openssl/files/patch-ssl-srtp.h ============================================================================== --- branches/2015Q1/security/openssl/files/patch-ssl-srtp.h Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/files/patch-ssl-srtp.h Thu Mar 19 20:29:19 2015 (r381687) @@ -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: branches/2015Q1/security/openssl/pkg-plist ============================================================================== --- branches/2015Q1/security/openssl/pkg-plist Thu Mar 19 20:23:36 2015 (r381686) +++ branches/2015Q1/security/openssl/pkg-plist Thu Mar 19 20:29:19 2015 (r381687) @@ -426,6 +426,7 @@ man/man3/CMS_encrypt.3.gz 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 @@ -918,6 +919,7 @@ man/man3/SSL_CTX_free.3.gz 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 @@ -925,6 +927,7 @@ man/man3/SSL_CTX_get_max_cert_list.3.gz 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 @@ -962,6 +965,7 @@ man/man3/SSL_CTX_set_client_CA_list.3.gz 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 @@ -973,6 +977,7 @@ man/man3/SSL_CTX_set_options.3.gz 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 @@ -1046,6 +1051,7 @@ man/man3/SSL_get_psk_identity.3.gz 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 @@ -1082,6 +1088,7 @@ man/man3/SSL_set_options.3.gz 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 @@ -1234,11 +1241,14 @@ man/man3/buffer.3.gz 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 @@ -1271,12 +1281,14 @@ man/man3/err.3.gz 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 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