1 files changed, 32 insertions, 34 deletions

diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
index 01775eb..9aa9648 100644
--- a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
@@ -1,4 +1,4 @@
-From 6b833a7767c25b60fb0bb8dcc00484df19946288 Mon Sep 17 00:00:00 2001
+From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 9 Sep 2015 13:37:28 +0300
 Subject: [PATCH] Support SYSROOT in c_rehash
@@ -10,39 +10,27 @@ environment variable and use it to locate the actual files during image
 creation.
 
 Upstream-status: Pending
-
 ---
- tools/c_rehash.in | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
+ tools/c_rehash.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index f8d0ce1..e81ec5b 100644
+index 92cb503..f3d2703 100644
 --- a/tools/c_rehash.in
 +++ b/tools/c_rehash.in
-@@ -5,6 +5,7 @@
- # and add symbolic links to their hash values.
- 
- my $openssl;
-+my $sysroot;
- 
- my $dir;
+@@ -7,6 +7,7 @@ my $dir;
  my $prefix;
-@@ -16,6 +17,10 @@ if(defined $ENV{OPENSSL}) {
-        $ENV{OPENSSL} = $openssl;
- }
  
-+if(defined $ENV{SYSROOT}) {
-+       $sysroot = $ENV{SYSROOT};
-+}
-+
+ my $openssl = $ENV{OPENSSL} || "openssl";
++my $sysroot = $ENV{SYSROOT} || "";
  my $pwd;
- eval "require Cwd";
- if (defined(&Cwd::getcwd)) {
-@@ -76,15 +81,16 @@ sub hash_dir {
+ my $verbose = 0;
+ my $symlink_exists=eval {symlink("",""); 1};
+@@ -101,16 +102,17 @@ sub hash_dir {
+                }
         }
-        closedir DIR;
-        FILE: foreach $fname (grep {/\.pem$/} @flist) {
-+       $fullname = $sysroot . readlink($fname);
+        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
++               $fullname = $sysroot . readlink($fname);
                 # Check to see if certificates and/or CRLs present.
 -               my ($cert, $crl) = check_file($fname);
 +               my ($cert, $crl) = check_file($fullname);
@@ -53,27 +41,29 @@ index f8d0ce1..e81ec5b 100644
 -               link_hash_cert($fname) if($cert);
 -               link_hash_cert_old($fname) if($cert);
 -               link_hash_crl($fname) if($crl);
+-               link_hash_crl_old($fname) if($crl);
 +               link_hash_cert($fname, $fullname) if($cert);
 +               link_hash_cert_old($fname, $fullname) if($cert);
 +               link_hash_crl($fname, $fullname) if($crl);
++               link_hash_crl_old($fname, $fullname) if($crl);
         }
  }
  
-@@ -117,9 +123,10 @@ sub check_file {
+@@ -143,9 +145,10 @@ sub check_file {
  
  sub link_hash_cert {
                 my $fname = $_[0];
--               my $hashopt = $_[1] || '-subject_hash';
+-               my $x509hash = $_[1] || '-subject_hash';
 -               $fname =~ s/'/'\\''/g;
--               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`;
+-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
 +               my $fullname = $_[1];
-+               my $hashopt = $_[2] || '-subject_hash';
++               my $x509hash = $_[2] || '-subject_hash';
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fullname"`;
++               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
                 chomp $hash;
                 chomp $fprint;
                 $fprint =~ s/^.*=//;
-@@ -150,15 +157,16 @@ sub link_hash_cert {
+@@ -176,11 +179,11 @@ sub link_hash_cert {
  }
  
  sub link_hash_cert_old {
@@ -81,15 +71,23 @@ index f8d0ce1..e81ec5b 100644
 +               link_hash_cert($_[0], $_[1], '-subject_hash_old');
  }
  
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
+ sub link_hash_crl_old {
+-               link_hash_crl($_[0], '-hash_old');
++               link_hash_crl($_[0], $_[1], '-hash_old');
+ }
+ 
+ 
+@@ -188,9 +191,10 @@ sub link_hash_crl_old {
  
  sub link_hash_crl {
                 my $fname = $_[0];
+-               my $crlhash = $_[1] || "-hash";
 -               $fname =~ s/'/'\\''/g;
--               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`;
+-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
 +               my $fullname = $_[1];
++               my $crlhash = $_[2] || "-hash";
 +               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fullname'`;
++               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
                 chomp $hash;
                 chomp $fprint;
                 $fprint =~ s/^.*=//;