- fix path in c_rehash

Submitted by:	Matthias Andree
Obtained from:	http://rt.openssl.org/Ticket/Display.html?id=2234

- add more DTLS bugfixes
Obtained from:	http://sctp.fh-muenster.de/

2 files changed, 37 insertions, 4 deletions

diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index defb17c137d2..f13eef1d8358 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	2009-07-08 10:50:52.000000000 +0200
-+++ Configure	2009-09-11 14:02:22.000000000 +0200
-@@ -144,7 +144,7 @@
+--- Configure.orig	2010-05-05 10:43:11.000000000 +0200
++++ Configure	2010-05-05 10:43:12.000000000 +0200
+@@ -147,7 +147,7 @@
  # 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,7 +9,7 @@
  
  #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 : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
  
-@@ -376,19 +376,20 @@
+@@ -382,19 +382,20 @@
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  
  #### *BSD [do see comment about ${BSDthreads} above!]
@@ -39,3 +39,17 @@
  
  "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)",
  
+@@ -1816,11 +1817,11 @@
+ 	(system $make_command.$make_targets) == 0 or exit $?
+ 		if $make_targets ne "";
+ 	if ( $perl =~ m@^/@) {
+-	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
++	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
+ 	    &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
+ 	} else {
+ 	    # No path for Perl known ...
+-	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
++	    &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');
+ 	}
+ 	if ($depflags ne $default_depflags && !$make_depend) {
diff --git a/security/openssl/files/patch-c_rehash.in b/security/openssl/files/patch-c_rehash.in
new file mode 100644
index 000000000000..4ab267b625c5
--- /dev/null
+++ b/security/openssl/files/patch-c_rehash.in
@@ -0,0 +1,19 @@
+--- tools/c_rehash.in.orig	2009-04-22 18:50:42.000000000 +0200
++++ tools/c_rehash.in	2010-05-05 10:43:12.000000000 +0200
+@@ -7,6 +7,7 @@
+ my $openssl;
+ 
+ my $dir;
++my $prefix;
+ 
+ if(defined $ENV{OPENSSL}) {
+ 	$openssl = $ENV{OPENSSL};
+@@ -24,7 +25,7 @@
+ }
+ my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; # DOS/Win32 or Unix delimiter?
+ 
+-$ENV{PATH} .= "$path_delim$dir/bin";
++$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); # prefix our path
+ 
+ if(! -x $openssl) {
+ 	my $found = 0;