[php-phpseclib-net-ssh2] redo blowfish conflict patch for 0.3.9 changes

[Adam Williamson]

commit 725e10a1a0f4bfcfa47f236dfde4a7794a8fa328
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Nov 11 17:56:23 2014 -0800

    redo blowfish conflict patch for 0.3.9 changes

 ...hpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch |   43 -------------------
 ...hpseclib-net-ssh2-0.3.9-blowfish_conflict.patch |   45 ++++++++++++++++++++
 php-phpseclib-net-ssh2.spec                        |    6 +-
 3 files changed, 48 insertions(+), 46 deletions(-)
---
diff --git a/php-phpseclib-net-ssh2-0.3.9-blowfish_conflict.patch b/php-phpseclib-net-ssh2-0.3.9-blowfish_conflict.patch
new file mode 100644
index 0000000..f233360
--- /dev/null
+++ b/php-phpseclib-net-ssh2-0.3.9-blowfish_conflict.patch
@@ -0,0 +1,45 @@
+--- php-phpseclib-net-ssh2-0.3.9/Net_SSH2-0.3.9/SSH2.php	2014-11-11 17:45:19.546469373 -0800
++++ php-phpseclib-net-ssh2-0.3.9/Net_SSH2-0.3.9/SSH2.php.new	2014-11-11 17:50:25.441517646 -0800
+@@ -1153,7 +1153,7 @@
+                     array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc')
+                 );
+             }
+-            if (phpseclib_resolve_include_path('Crypt/Blowfish.php') === false) {
++            if (phpseclib_resolve_include_path('Crypt/Blowfish-phpseclib.php') === false) {
+                 $encryption_algorithms = array_diff(
+                     $encryption_algorithms,
+                     array('blowfish-ctr', 'blowfish-cbc')
+@@ -1524,14 +1524,14 @@
+                 break;
+             case 'blowfish-cbc':
+                 if (!class_exists('Crypt_Blowfish')) {
+-                    include_once 'Crypt/Blowfish.php';
++                    include_once 'Crypt/Blowfish-phpseclib.php';
+                 }
+                 $this->encrypt = new Crypt_Blowfish();
+                 $this->encrypt_block_size = 8;
+                 break;
+             case 'blowfish-ctr':
+                 if (!class_exists('Crypt_Blowfish')) {
+-                    include_once 'Crypt/Blowfish.php';
++                    include_once 'Crypt/Blowfish-phpseclib.php';
+                 }
+                 $this->encrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
+                 $this->encrypt_block_size = 8;
+@@ -1600,14 +1600,14 @@
+                 break;
+             case 'blowfish-cbc':
+                 if (!class_exists('Crypt_Blowfish')) {
+-                    include_once 'Crypt/Blowfish.php';
++                    include_once 'Crypt/Blowfish-phpseclib.php';
+                 }
+                 $this->decrypt = new Crypt_Blowfish();
+                 $this->decrypt_block_size = 8;
+                 break;
+             case 'blowfish-ctr':
+                 if (!class_exists('Crypt_Blowfish')) {
+-                    include_once 'Crypt/Blowfish.php';
++                    include_once 'Crypt/Blowfish-phpseclib.php';
+                 }
+                 $this->decrypt = new Crypt_Blowfish(CRYPT_BLOWFISH_MODE_CTR);
+                 $this->decrypt_block_size = 8;
diff --git a/php-phpseclib-net-ssh2.spec b/php-phpseclib-net-ssh2.spec
index 2287f73..5ca409c 100644
--- a/php-phpseclib-net-ssh2.spec
+++ b/php-phpseclib-net-ssh2.spec
@@ -11,9 +11,9 @@ Group:          Development/Libraries
 License:        MIT
 URL:            http://phpseclib.sourceforge.net/
 Source0:        http://phpseclib.sourceforge.net/get/%{pear_name}-%{version}.tgz
-# From Debian, thanks to David Prévot, adjust for rename of Blowfish
-# library to avoid conflict with php-pear-Crypt-Blowfish
-Patch0:         php-phpseclib-Net-SSH2-Crypt_Blowfish_conflict.patch
+# Adjust for rename of Blowfish library to avoid conflict with
+# php-pear-Crypt-Blowfish
+Patch0:         php-phpseclib-net-ssh2-0.3.9-blowfish_conflict.patch
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR)