Attachment 155206 Details for Bug 199179 – svn diff for security/openxpki

[patch] svn diff for security/openxpki

patch-security_p5-openxpki (text/plain), 2.52 KB, created by Bernard Spil on 2015-04-05 18:16:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-04-05 18:16:54 UTC

Size: 2.52 KB

patch

obsolete

>Index: security/p5-openxpki/files/patch-Makefile.PL
>===================================================================
>--- security/p5-openxpki/files/patch-Makefile.PL	(revision 383311)
>+++ security/p5-openxpki/files/patch-Makefile.PL	(working copy)
>@@ -1,6 +1,34 @@
>---- Makefile.PL.orig	2014-12-02 20:05:23 UTC
>-+++ Makefile.PL
>-@@ -249,49 +249,6 @@ else {
>+--- Makefile.PL.orig	2015-02-28 22:30:32.611673575 +0100
>++++ Makefile.PL	2015-02-28 22:33:13.138276817 +0100
>+@@ -84,7 +84,7 @@
>+ # OpenSSL 1.0.0a 1 Jun 2010
>+ my $openssl_version_string = `$openssl_binary version`;
>+ my ($openssl_version_major, $openssl_version_minor, $openssl_version_fix, $openssl_version_patch);
>+-if ($openssl_version_string =~ m/\s*OpenSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]+)/) {
>++if ($openssl_version_string =~ m/\s*OpenSSL|LibreSSL\s+(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)/) {
>+     # OpenSSL 0.9
>+     $openssl_version_major = $1;
>+     $openssl_version_minor = $2;
>+@@ -108,7 +108,8 @@
>+           ($openssl_version_minor == 9) &&
>+           ($openssl_version_fix   == 8)) or
>+          ($openssl_version_major == 1 &&
>+-          $openssl_version_minor == 0)) {
>++          $openssl_version_minor == 0) or
>++         ($openssl_version_major == 2)) {
>+     print STDERR "\n";
>+     print STDERR "ERROR: OpenSSL 0.9.8  or 1.0 is required.\n";
>+     print STDERR "Consider setting OPENSSL_PREFIX correctly.\n\n";
>+@@ -130,7 +131,7 @@
>+     $openxpki_version = `cat ../../VERSION`;
>+     chomp $openxpki_version;
>+ } elsif ( -e($vergen) ) {
>+-    $openxpki_version = `$vergen --format version`;
>++    $openxpki_version = "0.25.0";
>+ 
>+     if ($CHILD_ERROR != 0) {
>+         $openxpki_version = undef;
>+@@ -249,49 +250,6 @@
>    print STDERR "Logger is not installed. Continue anyway.\n";
>  }
>  
>@@ -50,7 +78,7 @@
>  # See lib/ExtUtils/MakeMaker.pm for details of how to influence
>  # the contents of the Makefile that is written.
>  WriteMakefile(
>-@@ -299,7 +256,6 @@ WriteMakefile(
>+@@ -299,7 +257,6 @@
>      'VERSION'   => $openxpki_version,
>      'LIBS'      => ["-L$openssl_lib_dir -lcrypto"],
>      'INC'       => "-I. -I$openssl_inc_dir",
>@@ -58,7 +86,7 @@
>      'PREREQ_PM' => {
>  #    'Class::Accessor::Fast'  => '0.31', # Constituent of module Class::Accessor
>  #					 # which is a prerequisite of Class::Accessor::Chained, see below
>-@@ -397,5 +353,4 @@ WriteMakefile(
>+@@ -397,5 +354,4 @@
>                                't/cfg.binary.openssl']},
>      'XSPROTOARG' => '-noprototypes',
>      'EXE_FILES' => [ 'bin/openxpkictl','bin/openxpkicmd', 'bin/openxpkiadm', 'bin/openxpkicli'],

Actions: View | Diff

Attachments on bug 199179: 155206 | 155465 | 155467 | 155468 | 156808 | 156810