[Pkg-openssl-changes] r733 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2015-06-11 16:56:21 +0000 (Thu, 11 Jun 2015)
New Revision: 733

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/c_rehash-compat.patch
Log:
Update c_rehash-compat.patch to make it apply to the new version.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2015-06-11 16:52:17 UTC (rev 732)
+++ openssl/trunk/debian/changelog	2015-06-11 16:56:21 UTC (rev 733)
@@ -7,6 +7,7 @@
     - Fix CVE-2015-1790
     - Fix CVE-2015-1792
     - Fix CVE-2015-1791
+  * Update c_rehash-compat.patch to make it apply to the new version.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Thu, 11 Jun 2015 18:20:38 +0200
 

Modified: openssl/trunk/debian/patches/c_rehash-compat.patch
===================================================================
--- openssl/trunk/debian/patches/c_rehash-compat.patch	2015-06-11 16:52:17 UTC (rev 732)
+++ openssl/trunk/debian/patches/c_rehash-compat.patch	2015-06-11 16:56:21 UTC (rev 733)
@@ -7,10 +7,10 @@
  tools/c_rehash.in |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
-Index: openssl-1.0.2~beta3/tools/c_rehash.in
+Index: openssl-1.0.2b/tools/c_rehash.in
 ===================================================================
---- openssl-1.0.2~beta3.orig/tools/c_rehash.in
-+++ openssl-1.0.2~beta3/tools/c_rehash.in
+--- openssl-1.0.2b.orig/tools/c_rehash.in
++++ openssl-1.0.2b/tools/c_rehash.in
 @@ -8,8 +8,6 @@ my $prefix;
  
  my $openssl = $ENV{OPENSSL} || "openssl";
@@ -21,14 +21,14 @@
  my $symlink_exists=eval {symlink("",""); 1};
  my $removelinks = 1;
 @@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ '-.*' ) {
+ while ( $ARGV[0] =~ /^-/ ) {
      my $flag = shift @ARGV;
      last if ( $flag eq '--');
--    if ( $flag =~ /-old/) {
+-    if ( $flag eq '-old') {
 -	    $x509hash = "-subject_hash_old";
 -	    $crlhash = "-hash_old";
--    } elsif ( $flag =~ /-h/) {
-+    if ( $flag =~ /-h/) {
+-    } elsif ( $flag eq '-h') {
++    if ( $flag eq '-h') {
  	    help();
      } elsif ( $flag eq '-n' ) {
  	    $removelinks = 0;