|
Lines 1-6
Link Here
|
| 1 |
--- Makefile.PL.orig 2014-12-02 20:05:23 UTC |
1 |
--- Makefile.PL.orig 2015-02-28 22:30:32.611673575 +0100 |
| 2 |
+++ Makefile.PL |
2 |
+++ Makefile.PL 2015-02-28 22:33:13.138276817 +0100 |
| 3 |
@@ -249,49 +249,6 @@ else { |
3 |
@@ -84,7 +84,7 @@ |
|
|
4 |
# OpenSSL 1.0.0a 1 Jun 2010 |
| 5 |
my $openssl_version_string = `$openssl_binary version`; |
| 6 |
my ($openssl_version_major, $openssl_version_minor, $openssl_version_fix, $openssl_version_patch); |
| 7 |
-if ($openssl_version_string =~ m/\s*OpenSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]+)/) { |
| 8 |
+if ($openssl_version_string =~ m/\s*OpenSSL|LibreSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)/) { |
| 9 |
# OpenSSL 0.9 |
| 10 |
$openssl_version_major = $1; |
| 11 |
$openssl_version_minor = $2; |
| 12 |
@@ -108,7 +108,8 @@ |
| 13 |
($openssl_version_minor == 9) && |
| 14 |
($openssl_version_fix == 8)) or |
| 15 |
($openssl_version_major == 1 && |
| 16 |
- $openssl_version_minor == 0)) { |
| 17 |
+ $openssl_version_minor == 0) or |
| 18 |
+ ($openssl_version_major == 2)) { |
| 19 |
print STDERR "\n"; |
| 20 |
print STDERR "ERROR: OpenSSL 0.9.8 or 1.0 is required.\n"; |
| 21 |
print STDERR "Consider setting OPENSSL_PREFIX correctly.\n\n"; |
| 22 |
@@ -130,7 +131,7 @@ |
| 23 |
$openxpki_version = `cat ../../VERSION`; |
| 24 |
chomp $openxpki_version; |
| 25 |
} elsif ( -e($vergen) ) { |
| 26 |
- $openxpki_version = `$vergen --format version`; |
| 27 |
+ $openxpki_version = "0.25.0"; |
| 28 |
|
| 29 |
if ($CHILD_ERROR != 0) { |
| 30 |
$openxpki_version = undef; |
| 31 |
@@ -249,49 +250,6 @@ |
| 4 |
print STDERR "Logger is not installed. Continue anyway.\n"; |
32 |
print STDERR "Logger is not installed. Continue anyway.\n"; |
| 5 |
} |
33 |
} |
| 6 |
|
34 |
|
|
Lines 50-56
Link Here
|
| 50 |
# See lib/ExtUtils/MakeMaker.pm for details of how to influence |
78 |
# See lib/ExtUtils/MakeMaker.pm for details of how to influence |
| 51 |
# the contents of the Makefile that is written. |
79 |
# the contents of the Makefile that is written. |
| 52 |
WriteMakefile( |
80 |
WriteMakefile( |
| 53 |
@@ -299,7 +256,6 @@ WriteMakefile( |
81 |
@@ -299,7 +257,6 @@ |
| 54 |
'VERSION' => $openxpki_version, |
82 |
'VERSION' => $openxpki_version, |
| 55 |
'LIBS' => ["-L$openssl_lib_dir -lcrypto"], |
83 |
'LIBS' => ["-L$openssl_lib_dir -lcrypto"], |
| 56 |
'INC' => "-I. -I$openssl_inc_dir", |
84 |
'INC' => "-I. -I$openssl_inc_dir", |
|
Lines 58-64
Link Here
|
| 58 |
'PREREQ_PM' => { |
86 |
'PREREQ_PM' => { |
| 59 |
# 'Class::Accessor::Fast' => '0.31', # Constituent of module Class::Accessor |
87 |
# 'Class::Accessor::Fast' => '0.31', # Constituent of module Class::Accessor |
| 60 |
# # which is a prerequisite of Class::Accessor::Chained, see below |
88 |
# # which is a prerequisite of Class::Accessor::Chained, see below |
| 61 |
@@ -397,5 +353,4 @@ WriteMakefile( |
89 |
@@ -397,5 +354,4 @@ |
| 62 |
't/cfg.binary.openssl']}, |
90 |
't/cfg.binary.openssl']}, |
| 63 |
'XSPROTOARG' => '-noprototypes', |
91 |
'XSPROTOARG' => '-noprototypes', |
| 64 |
'EXE_FILES' => [ 'bin/openxpkictl','bin/openxpkicmd', 'bin/openxpkiadm', 'bin/openxpkicli'], |
92 |
'EXE_FILES' => [ 'bin/openxpkictl','bin/openxpkicmd', 'bin/openxpkiadm', 'bin/openxpkicli'], |