[Pkg-openssl-changes] r838 - in openssl/branches/1.1.0/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2016-09-22 18:08:29 +0000 (Thu, 22 Sep 2016)
New Revision: 838

Modified:
   openssl/branches/1.1.0/debian/changelog
   openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch
Log:
Update c_rehash-compat.patch


Modified: openssl/branches/1.1.0/debian/changelog
===================================================================
--- openssl/branches/1.1.0/debian/changelog	2016-09-22 17:57:46 UTC (rev 837)
+++ openssl/branches/1.1.0/debian/changelog	2016-09-22 18:08:29 UTC (rev 838)
@@ -5,8 +5,9 @@
     - Fix CVE-2016-6305
     - Fix CVE-2016-6307
     - Fix CVE-2016-6308
+  * Update c_rehash-compat.patch to apply to new version.
 
- -- Kurt Roeckx <kurt at roeckx.be>  Thu, 22 Sep 2016 19:52:43 +0200
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 22 Sep 2016 20:07:50 +0200
 
 openssl (1.1.0-1) experimental; urgency=medium
 

Modified: openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch	2016-09-22 17:57:46 UTC (rev 837)
+++ openssl/branches/1.1.0/debian/patches/c_rehash-compat.patch	2016-09-22 18:08:29 UTC (rev 838)
@@ -7,8 +7,10 @@
  tools/c_rehash.in |   20 ++++++++++++++------
  1 file changed, 14 insertions(+), 6 deletions(-)
 
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
+Index: openssl-1.1.0a/tools/c_rehash.in
+===================================================================
+--- openssl-1.1.0a.orig/tools/c_rehash.in
++++ openssl-1.1.0a/tools/c_rehash.in
 @@ -17,8 +17,6 @@ my $prefix = {- quotify1($config{prefix}
  my $errorcount = 0;
  my $openssl = $ENV{OPENSSL} || "openssl";
@@ -25,8 +27,8 @@
 -    if ( $flag eq '-old') {
 -	    $x509hash = "-subject_hash_old";
 -	    $crlhash = "-hash_old";
--    } elsif ( $flag eq '-h') {
-+    if ( $flag eq '-h') {
+-    } elsif ( $flag eq '-h' || $flag eq '-help' ) {
++    if ( $flag eq '-h' || $flag eq '-help' ) {
  	    help();
      } elsif ( $flag eq '-n' ) {
  	    $removelinks = 0;