View | Details | Raw Unified | Return to bug 199179 | Differences between
and this patch

Collapse All | Expand All

(-)security/p5-openxpki/files/patch-Makefile.PL (-1 / +69 lines)
Lines 1-5 Link Here
1
--- Makefile.PL.orig	2014-12-02 20:05:23 UTC
1
--- Makefile.PL.orig	2015-04-11 09:17:07 UTC
2
+++ Makefile.PL
2
+++ Makefile.PL
3
@@ -83,19 +83,22 @@ print STDERR "OpenSSL binary:  $openssl_
4
 # OpenSSL 0.9.7l 28 Sep 2006
5
 # OpenSSL 1.0.0a 1 Jun 2010
6
 my $openssl_version_string = `$openssl_binary version`;
7
-my ($openssl_version_major, $openssl_version_minor, $openssl_version_fix, $openssl_version_patch);
8
-if ($openssl_version_string =~ m/\s*OpenSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]+)/) {
9
+my ($openssl_version_major, $openssl_version_minor, $openssl_version_fix, $openssl_version_patch, $openssl_version_flavour);
10
+if ($openssl_version_string =~ m/\s*OpenSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]+)/i) {
11
     # OpenSSL 0.9
12
+    $openssl_version_flavour = 'OpenSSL';
13
     $openssl_version_major = $1;
14
     $openssl_version_minor = $2;
15
     $openssl_version_fix   = $3;
16
     $openssl_version_patch = $4;
17
-    print "OpenSSL version: major=$openssl_version_major, minor=$openssl_version_minor, fix=$openssl_version_fix, patch=$openssl_version_patch\n";
18
-} elsif ($openssl_version_string =~ m/\s*OpenSSL\s+(\d+)\.(\d+)\.(\d+)\s+/) {
19
+    print "$openssl_version_flavour version: major=$openssl_version_major, minor=$openssl_version_minor, fix=$openssl_version_fix, patch=$openssl_version_patch\n";
20
+    
21
+} elsif ($openssl_version_string =~ m/\s*(OpenSSL|LibreSSL)\s+(\d+)\.(\d+)\.(\d+)\s+/) {
22
     # OpenSSL 1.0
23
-    $openssl_version_major = $1;
24
-    $openssl_version_minor = $2;
25
-    $openssl_version_fix   = $3;
26
+    $openssl_version_flavour = $1;
27
+    $openssl_version_major = $2;
28
+    $openssl_version_minor = $3;
29
+    $openssl_version_fix   = $4;
30
     print "OpenSSL version: major=$openssl_version_major, minor=$openssl_version_minor, fix=$openssl_version_fix\n";
31
 } else {
32
     print "Problem: malformed openssl version string!\n";
33
@@ -103,12 +106,22 @@ if ($openssl_version_string =~ m/\s*Open
34
     exit 1;
35
 }
36
 
37
-# Now make sure version is 0.9.8
38
-unless ( (($openssl_version_major == 0) &&
39
-          ($openssl_version_minor == 9) &&
40
-          ($openssl_version_fix   == 8)) or
41
-         ($openssl_version_major == 1 &&
42
-          $openssl_version_minor == 0)) {
43
+# Warn on old openssl - should work but lacks support for some features 
44
+if ($openssl_version_major == 0 &&
45
+    $openssl_version_minor == 9 &&
46
+    $openssl_version_fix   == 8) {
47
+
48
+    print STDERR "Warning: openssl 0.9.8 found - this will work but lacks some features, e.g. server side key generation!";
49
+              
50
+} elsif ( $openssl_version_flavour =~ m/LibreSSL/i ) {
51
+    
52
+    print STDERR "Warning: LibreSSL found, support for LibreSSL is experimental!";
53
+    
54
+} elsif (not 
55
+    ($openssl_version_flavour =~ m/OpenSSL/i &&
56
+     $openssl_version_major == 1 &&
57
+     $openssl_version_minor == 0 )) {
58
+         
59
     print STDERR "\n";
60
     print STDERR "ERROR: OpenSSL 0.9.8  or 1.0 is required.\n";
61
     print STDERR "Consider setting OPENSSL_PREFIX correctly.\n\n";
62
@@ -130,7 +143,7 @@ if ( -s '../../VERSION' ) {
63
     $openxpki_version = `cat ../../VERSION`;
64
     chomp $openxpki_version;
65
 } elsif ( -e($vergen) ) {
66
-    $openxpki_version = `$vergen --format version`;
67
+    $openxpki_version = "0.27.0";
68
 
69
     if ($CHILD_ERROR != 0) {
70
         $openxpki_version = undef;
3
@@ -249,49 +249,6 @@ else {
71
@@ -249,49 +249,6 @@ else {
4
   print STDERR "Logger is not installed. Continue anyway.\n";
72
   print STDERR "Logger is not installed. Continue anyway.\n";
5
 }
73
 }

Return to bug 199179