Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jun 2015 01:47:01 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r389258 - in head/security/openssl: . files
Message-ID:  <201506120147.t5C1l16A045063@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Fri Jun 12 01:47:00 2015
New Revision: 389258
URL: https://svnweb.freebsd.org/changeset/ports/389258

Log:
  - Resolve build issue
  
  With hat:	ports-secteam

Modified:
  head/security/openssl/files/patch-Configure
  head/security/openssl/pkg-plist

Modified: head/security/openssl/files/patch-Configure
==============================================================================
--- head/security/openssl/files/patch-Configure	Fri Jun 12 01:31:17 2015	(r389257)
+++ head/security/openssl/files/patch-Configure	Fri Jun 12 01:47:00 2015	(r389258)
@@ -1,6 +1,6 @@
---- Configure.orig	2015-06-11 13:50:11 UTC
-+++ Configure
-@@ -467,19 +467,20 @@ my %table=(
+--- Configure.orig	2015-06-11 10:50:11.000000000 -0300
++++ Configure	2015-06-11 20:32:35.000000000 -0300
+@@ -467,19 +467,19 @@
  "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!]
@@ -24,13 +24,12 @@
 -"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",	"cc:-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::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SH
-+LIB_MINOR)",
-+"BSD-x86_64",	"$ENV{'FREEBSDCC'}:-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-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)",
  
-@@ -2019,10 +2020,12 @@ EOF
+@@ -2019,10 +2019,12 @@
  	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: head/security/openssl/pkg-plist
==============================================================================
--- head/security/openssl/pkg-plist	Fri Jun 12 01:31:17 2015	(r389257)
+++ head/security/openssl/pkg-plist	Fri Jun 12 01:47:00 2015	(r389258)
@@ -1129,6 +1129,7 @@ man/man3/SSL_CIPHER_get_bits.3.gz
 man/man3/SSL_CIPHER_get_name.3.gz
 man/man3/SSL_CIPHER_get_version.3.gz
 man/man3/SSL_COMP_add_compression_method.3.gz
+man/man3/SSL_COMP_free_compression_methods.3.gz
 man/man3/SSL_CONF_CTX_clear_flags.3.gz
 man/man3/SSL_CONF_CTX_free.3.gz
 man/man3/SSL_CONF_CTX_new.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506120147.t5C1l16A045063>