diff -Nru phpseclib-1.0.1/debian/changelog phpseclib-1.0.1/debian/changelog --- phpseclib-1.0.1/debian/changelog 2016-03-19 19:09:06.000000000 -0400 +++ phpseclib-1.0.1/debian/changelog 2016-06-23 16:56:10.000000000 -0400 @@ -1,3 +1,13 @@ +phpseclib (1.0.1-3ubuntu0.1) xenial; urgency=medium + + * Delete the patch "Fix "Methods with the same name as their class + will not be constructors in a future version of PHP" that was + added in 1.0.1-3. All of the changes in that patch are + backwards-incompatible and break some applications that depend on + this package (such as dokuwiki). (LP: #1574058) + + -- Richard Hansen Thu, 23 Jun 2016 16:46:59 -0400 + phpseclib (1.0.1-3) unstable; urgency=medium * Team upload diff -Nru phpseclib-1.0.1/debian/patches/0002-Fix-Methods-with-the-same-name-as-their-class-will-n.patch phpseclib-1.0.1/debian/patches/0002-Fix-Methods-with-the-same-name-as-their-class-will-n.patch --- phpseclib-1.0.1/debian/patches/0002-Fix-Methods-with-the-same-name-as-their-class-will-n.patch 2016-03-19 19:04:59.000000000 -0400 +++ phpseclib-1.0.1/debian/patches/0002-Fix-Methods-with-the-same-name-as-their-class-will-n.patch 1969-12-31 19:00:00.000000000 -0500 @@ -1,270 +0,0 @@ -From ef7a6ffd16914dd4c8f2274fafdeebbded65c0f3 Mon Sep 17 00:00:00 2001 -From: Mathieu Parent -Date: Sun, 20 Mar 2016 00:04:43 +0100 -Subject: [PATCH] Fix "Methods with the same name as their class will not be - constructors in a future version of PHP - -This is needed to fix tests on php-horde-mapi for example: -https://ci.debian.net/data/packages/unstable/amd64/p/php-horde-mapi/20160319_194155.autopkgtest.log.gz ---- - phpseclib/Crypt/Base.php | 2 +- - phpseclib/Crypt/Hash.php | 2 +- - phpseclib/Crypt/RC2.php | 2 +- - phpseclib/Crypt/RC4.php | 2 +- - phpseclib/Crypt/RSA.php | 2 +- - phpseclib/Crypt/Rijndael.php | 2 +- - phpseclib/Crypt/TripleDES.php | 2 +- - phpseclib/File/ANSI.php | 2 +- - phpseclib/File/ASN1.php | 4 ++-- - phpseclib/File/X509.php | 2 +- - phpseclib/Math/BigInteger.php | 2 +- - phpseclib/Net/SCP.php | 2 +- - phpseclib/Net/SFTP.php | 2 +- - phpseclib/Net/SFTP/Stream.php | 2 +- - phpseclib/Net/SSH1.php | 2 +- - phpseclib/Net/SSH2.php | 2 +- - phpseclib/System/SSH/Agent.php | 4 ++-- - 17 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/phpseclib/Crypt/Base.php b/phpseclib/Crypt/Base.php -index 3726576..2ce7e09 100644 ---- a/phpseclib/Crypt/Base.php -+++ b/phpseclib/Crypt/Base.php -@@ -503,7 +503,7 @@ class Crypt_Base - * @param int $mode - * @access public - */ -- function Crypt_Base($mode = CRYPT_MODE_CBC) -+ function __construct($mode = CRYPT_MODE_CBC) - { - // $mode dependent settings - switch ($mode) { -diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php -index a13d960..589f1a2 100644 ---- a/phpseclib/Crypt/Hash.php -+++ b/phpseclib/Crypt/Hash.php -@@ -151,7 +151,7 @@ class Crypt_Hash - * @return Crypt_Hash - * @access public - */ -- function Crypt_Hash($hash = 'sha1') -+ function __construct($hash = 'sha1') - { - if (!defined('CRYPT_HASH_MODE')) { - switch (true) { -diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php -index 86e53c5..9d07506 100644 ---- a/phpseclib/Crypt/RC2.php -+++ b/phpseclib/Crypt/RC2.php -@@ -355,7 +355,7 @@ class Crypt_RC2 extends Crypt_Base - * @param int $mode - * @access public - */ -- function Crypt_RC2($mode = CRYPT_RC2_MODE_CBC) -+ function __construct($mode = CRYPT_RC2_MODE_CBC) - { - parent::Crypt_Base($mode); - } -diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php -index 4c87125..6583eaa 100644 ---- a/phpseclib/Crypt/RC4.php -+++ b/phpseclib/Crypt/RC4.php -@@ -161,7 +161,7 @@ class Crypt_RC4 extends Crypt_Base - * @return Crypt_RC4 - * @access public - */ -- function Crypt_RC4() -+ function __construct() - { - parent::Crypt_Base(CRYPT_MODE_STREAM); - } -diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php -index 9369d43..bb80884 100644 ---- a/phpseclib/Crypt/RSA.php -+++ b/phpseclib/Crypt/RSA.php -@@ -491,7 +491,7 @@ class Crypt_RSA - * @return Crypt_RSA - * @access public - */ -- function Crypt_RSA() -+ function __construct() - { - if (!class_exists('Math_BigInteger')) { - include_once 'Math/BigInteger.php'; -diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php -index b84166b..14264fb 100644 ---- a/phpseclib/Crypt/Rijndael.php -+++ b/phpseclib/Crypt/Rijndael.php -@@ -264,7 +264,7 @@ class Crypt_Rijndael extends Crypt_Base - * @param int $mode - * @access public - */ -- function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC) -+ function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC) - { - parent::Crypt_Base($mode); - } -diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php -index a878918..bef5045 100644 ---- a/phpseclib/Crypt/TripleDES.php -+++ b/phpseclib/Crypt/TripleDES.php -@@ -196,7 +196,7 @@ class Crypt_TripleDES extends Crypt_DES - * @param int $mode - * @access public - */ -- function Crypt_TripleDES($mode = CRYPT_MODE_CBC) -+ function __construct($mode = CRYPT_MODE_CBC) - { - switch ($mode) { - // In case of CRYPT_DES_MODE_3CBC, we init as CRYPT_DES_MODE_CBC -diff --git a/phpseclib/File/ANSI.php b/phpseclib/File/ANSI.php -index 95acf37..af3798e 100644 ---- a/phpseclib/File/ANSI.php -+++ b/phpseclib/File/ANSI.php -@@ -179,7 +179,7 @@ class File_ANSI - * @return File_ANSI - * @access public - */ -- function File_ANSI() -+ function __construct() - { - $attr_cell = new stdClass(); - $attr_cell->bold = false; -diff --git a/phpseclib/File/ASN1.php b/phpseclib/File/ASN1.php -index f5c3e44..a776caf 100644 ---- a/phpseclib/File/ASN1.php -+++ b/phpseclib/File/ASN1.php -@@ -131,7 +131,7 @@ class File_ASN1_Element - * @return File_ASN1_Element - * @access public - */ -- function File_ASN1_Element($encoded) -+ function __construct($encoded) - { - $this->element = $encoded; - } -@@ -245,7 +245,7 @@ class File_ASN1 - * - * @access public - */ -- function File_ASN1() -+ function __construct() - { - static $static_init = null; - if (!$static_init) { -diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php -index 63a8a23..dd01f5e 100644 ---- a/phpseclib/File/X509.php -+++ b/phpseclib/File/X509.php -@@ -317,7 +317,7 @@ class File_X509 - * @return File_X509 - * @access public - */ -- function File_X509() -+ function __construct() - { - if (!class_exists('Math_BigInteger')) { - include_once 'Math/BigInteger.php'; -diff --git a/phpseclib/Math/BigInteger.php b/phpseclib/Math/BigInteger.php -index 0a9a291..26658f0 100644 ---- a/phpseclib/Math/BigInteger.php -+++ b/phpseclib/Math/BigInteger.php -@@ -243,7 +243,7 @@ class Math_BigInteger - * @return Math_BigInteger - * @access public - */ -- function Math_BigInteger($x = 0, $base = 10) -+ function __construct($x = 0, $base = 10) - { - if (!defined('MATH_BIGINTEGER_MODE')) { - switch (true) { -diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php -index 60b67f3..fdbf091 100644 ---- a/phpseclib/Net/SCP.php -+++ b/phpseclib/Net/SCP.php -@@ -122,7 +122,7 @@ class Net_SCP - * @return Net_SCP - * @access public - */ -- function Net_SCP($ssh) -+ function __construct($ssh) - { - if (!is_object($ssh)) { - return; -diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php -index 361aac7..1347fb3 100644 ---- a/phpseclib/Net/SFTP.php -+++ b/phpseclib/Net/SFTP.php -@@ -288,7 +288,7 @@ class Net_SFTP extends Net_SSH2 - * @return Net_SFTP - * @access public - */ -- function Net_SFTP($host, $port = 22, $timeout = 10) -+ function __construct($host, $port = 22, $timeout = 10) - { - parent::Net_SSH2($host, $port, $timeout); - -diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php -index e374b9b..a944d7f 100644 ---- a/phpseclib/Net/SFTP/Stream.php -+++ b/phpseclib/Net/SFTP/Stream.php -@@ -146,7 +146,7 @@ class Net_SFTP_Stream - * - * @access public - */ -- function Net_SFTP_Stream() -+ function __construct() - { - if (defined('NET_SFTP_STREAM_LOGGING')) { - echo "__construct()\r\n"; -diff --git a/phpseclib/Net/SSH1.php b/phpseclib/Net/SSH1.php -index d50a993..d07065f 100644 ---- a/phpseclib/Net/SSH1.php -+++ b/phpseclib/Net/SSH1.php -@@ -515,7 +515,7 @@ class Net_SSH1 - * @return Net_SSH1 - * @access public - */ -- function Net_SSH1($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES) -+ function __construct($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3DES) - { - if (!class_exists('Math_BigInteger')) { - include_once 'Math/BigInteger.php'; -diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php -index d3d340c..f82a156 100644 ---- a/phpseclib/Net/SSH2.php -+++ b/phpseclib/Net/SSH2.php -@@ -883,7 +883,7 @@ class Net_SSH2 - * @return Net_SSH2 - * @access public - */ -- function Net_SSH2($host, $port = 22, $timeout = 10) -+ function __construct($host, $port = 22, $timeout = 10) - { - // Include Math_BigInteger - // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification. -diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php -index 4ca34d4..87b699b 100644 ---- a/phpseclib/System/SSH/Agent.php -+++ b/phpseclib/System/SSH/Agent.php -@@ -130,7 +130,7 @@ class System_SSH_Agent_Identity - * @return System_SSH_Agent_Identity - * @access private - */ -- function System_SSH_Agent_Identity($fsock) -+ function __construct($fsock) - { - $this->fsock = $fsock; - } -@@ -269,7 +269,7 @@ class System_SSH_Agent - * @return System_SSH_Agent - * @access public - */ -- function System_SSH_Agent() -+ function __construct() - { - switch (true) { - case isset($_SERVER['SSH_AUTH_SOCK']): --- -2.7.0 - diff -Nru phpseclib-1.0.1/debian/patches/series phpseclib-1.0.1/debian/patches/series --- phpseclib-1.0.1/debian/patches/series 2016-03-19 19:05:58.000000000 -0400 +++ phpseclib-1.0.1/debian/patches/series 2016-06-23 16:46:08.000000000 -0400 @@ -1,2 +1 @@ 0001-Fix-Crypt_Blowfish-conflict.patch -0002-Fix-Methods-with-the-same-name-as-their-class-will-n.patch