[Pkg-openssl-changes] r495 - openssl/trunk/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2011-04-13 20:42:42 +0000 (Wed, 13 Apr 2011)
New Revision: 495

Modified:
   openssl/trunk/debian/patches/c_rehash-compat.patch
Log:
Make the patch apply cleanly.


Modified: openssl/trunk/debian/patches/c_rehash-compat.patch
===================================================================
--- openssl/trunk/debian/patches/c_rehash-compat.patch	2011-04-13 20:40:18 UTC (rev 494)
+++ openssl/trunk/debian/patches/c_rehash-compat.patch	2011-04-13 20:42:42 UTC (rev 495)
@@ -7,19 +7,19 @@
  tools/c_rehash.in |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index bfc4a69..f8d0ce1 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -83,6 +83,7 @@ sub hash_dir {
- 			next;
+Index: openssl-1.0.0d/tools/c_rehash.in
+===================================================================
+--- openssl-1.0.0d.orig/tools/c_rehash.in	2011-04-13 20:41:28.000000000 +0000
++++ openssl-1.0.0d/tools/c_rehash.in	2011-04-13 20:41:28.000000000 +0000
+@@ -86,6 +86,7 @@
+ 			}
  		}
  		link_hash_cert($fname) if($cert);
 +		link_hash_cert_old($fname) if($cert);
  		link_hash_crl($fname) if($crl);
  	}
  }
-@@ -116,8 +117,9 @@ sub check_file {
+@@ -119,8 +120,9 @@
  
  sub link_hash_cert {
  		my $fname = $_[0];
@@ -30,7 +30,7 @@
  		chomp $hash;
  		chomp $fprint;
  		$fprint =~ s/^.*=//;
-@@ -147,6 +149,10 @@ sub link_hash_cert {
+@@ -150,6 +152,10 @@
  		$hashlist{$hash} = $fprint;
  }
  
@@ -41,6 +41,3 @@
  # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
  
  sub link_hash_crl {
--- 
-1.6.4.2
-