Attachment 846562 Details for Bug 1047608 – Crypt_RSA-role.patch

[patch] Crypt_RSA-role.patch

Crypt_RSA-role.patch (text/plain), 1.70 KB, created by Remi Collet on 2014-01-07 10:23:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Remi Collet

Created: 2014-01-07 10:23:55 UTC

Size: 1.70 KB

patch

obsolete

>diff -up ./Crypt_RSA-0.3.5/RSA.php.fix ./Crypt_RSA-0.3.5/RSA.php
>--- Crypt_RSA-0.3.5/RSA.php.fix	2014-01-07 11:18:22.000000000 +0100
>+++ Crypt_RSA-0.3.5/RSA.php	2014-01-07 11:18:22.000000000 +0100
>@@ -171,7 +171,7 @@ define('CRYPT_RSA_MODE_OPENSSL', 2);
> /**
>  * Default openSSL configuration file.
>  */
>-define('CRYPT_RSA_OPENSSL_CONFIG', dirname(__FILE__) . '/../openssl.cnf');
>+define('CRYPT_RSA_OPENSSL_CONFIG', 'openssl.cnf');
> 
> 
> /**#@+
>@@ -465,7 +465,14 @@ class Crypt_RSA {
>             require_once('Math/BigInteger.php');
>         }
> 
>-        $this->configFile = CRYPT_RSA_OPENSSL_CONFIG;
>+        $dir = '@cfg_dir@' . DIRECTORY_SEPARATOR . 'Crypt_RSA';
>+        if (strpos($dir, '@') === false) {
>+           // PEAR installer was used to install the package
>+        } else {
>+           // manual install
>+           $dir = dirname(__FILE__);
>+        }
>+        $this->configFile = $dir . DIRECTORY_SEPARATOR . CRYPT_RSA_OPENSSL_CONFIG;
> 
>         if ( !defined('CRYPT_RSA_MODE') ) {
>             switch (true) {
>diff -up ./package.xml.fix ./package.xml
>--- package.xml.fix	2014-01-07 11:03:40.000000000 +0100
>+++ package.xml	2014-01-07 11:06:12.000000000 +0100
>@@ -23,8 +23,10 @@
>  <notes>0.3.5 release</notes>
>  <contents>
>   <dir name="/">
>-    <file baseinstalldir="Crypt" name="RSA.php" role="php" md5sum="bd0402efcbf7cdeb3e68205c77a88bc0"/>
>-    <file baseinstalldir="" name="openssl.cnf" role="php" md5sum="0f1015cb8894127a94a05afa7cc23760"/>
>+    <file baseinstalldir="Crypt" name="RSA.php" role="php">
>+       <tasks:replace from="@cfg_dir@" to="cfg_dir" type="pear-config" />
>+    </file>
>+    <file name="openssl.cnf" role="cfg" md5sum="0f1015cb8894127a94a05afa7cc23760"/>
>   </dir>
>  </contents>
>  <dependencies>

Actions: View | Diff

Attachments on bug 1047608: 846562 | 846563 | 848057 | 848058