Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
Please accept the fixes for php5/5.6.17+dfsg-0+deb8u1 upgrade break
php-net-ldap2 in jessie (#812892).
Source debdiff attached.
Regards,
Prach
diff -Nru php-net-ldap2-2.0.12/debian/changelog php-net-ldap2-2.0.12/debian/changelog
--- php-net-ldap2-2.0.12/debian/changelog 2013-07-18 22:31:10.000000000 +0700
+++ php-net-ldap2-2.0.12/debian/changelog 2016-01-27 13:07:14.000000000 +0700
@@ -1,3 +1,9 @@
+php-net-ldap2 (2.0.12-1+deb8u1) jessie; urgency=medium
+
+ * Add Fix_Fatal_error_with_PEAR_1.10.0.patch (Closes: #812788)
+
+ -- Prach Pongpanich <prachpub@gmail.com> Wed, 27 Jan 2016 13:05:48 +0700
+
php-net-ldap2 (2.0.12-1) unstable; urgency=low
[ Prach Pongpanich ]
diff -Nru php-net-ldap2-2.0.12/debian/gbp.conf php-net-ldap2-2.0.12/debian/gbp.conf
--- php-net-ldap2-2.0.12/debian/gbp.conf 2013-07-18 22:31:10.000000000 +0700
+++ php-net-ldap2-2.0.12/debian/gbp.conf 2016-01-27 10:02:20.000000000 +0700
@@ -1,6 +1,6 @@
[DEFAULT]
upstream-branch = upstream-sid
-debian-branch = debian-sid
+debian-branch = debian/jessie
pristine-tar = True
[git-buildpackage]
diff -Nru php-net-ldap2-2.0.12/debian/patches/Fix_Fatal_error_with_PEAR_1.10.0.patch php-net-ldap2-2.0.12/debian/patches/Fix_Fatal_error_with_PEAR_1.10.0.patch
--- php-net-ldap2-2.0.12/debian/patches/Fix_Fatal_error_with_PEAR_1.10.0.patch 1970-01-01 07:00:00.000000000 +0700
+++ php-net-ldap2-2.0.12/debian/patches/Fix_Fatal_error_with_PEAR_1.10.0.patch 2016-01-27 11:24:30.000000000 +0700
@@ -0,0 +1,55 @@
+From df99b63de9b2459b5e0cd94bd26f38f3010f992e Mon Sep 17 00:00:00 2001
+From: Christian Weiske <cweiske@cweiske.de>
+Date: Mon, 26 Oct 2015 22:55:20 +0100
+Subject: [PATCH] Fix #20969: Fatal error with PEAR 1.10.0 / constructor
+ visiblity
+
+PEAR's constructor is public, so the constructor of PEAR-extending classes
+also needs to be public
+
+See http://pear.php.net/bugs/20969
+---
+ Net_LDAP2-2.0.12/Net/LDAP2/Entry.php | 2 +-
+ Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php | 2 +-
+ Net_LDAP2-2.0.12/Net/LDAP2/Schema.php | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php b/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php
+index aedb3f6..9b9d67c 100644
+--- a/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php
++++ b/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php
+@@ -146,7 +146,7 @@ class Net_LDAP2_Entry extends PEAR
+ * @access protected
+ * @return none
+ */
+- protected function __construct(&$ldap, $entry = null)
++ public function __construct(&$ldap, $entry = null)
+ {
+ $this->PEAR('Net_LDAP2_Error');
+
+diff --git a/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php b/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php
+index dd30eef..0693d95 100644
+--- a/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php
++++ b/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php
+@@ -41,7 +41,7 @@ class Net_LDAP2_RootDSE extends PEAR
+ *
+ * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE
+ */
+- protected function __construct(&$entry)
++ public function __construct(&$entry)
+ {
+ $this->_entry = $entry;
+ }
+diff --git a/Net_LDAP2-2.0.12/Net/LDAP2/Schema.php b/Net_LDAP2-2.0.12/Net/LDAP2/Schema.php
+index ecc3b69..c5e298a 100644
+--- a/Net_LDAP2-2.0.12/Net/LDAP2/Schema.php
++++ b/Net_LDAP2-2.0.12/Net/LDAP2/Schema.php
+@@ -109,7 +109,7 @@ class Net_LDAP2_Schema extends PEAR
+ *
+ * @access protected
+ */
+- protected function __construct()
++ public function __construct()
+ {
+ $this->PEAR('Net_LDAP2_Error'); // default error class
+ }
diff -Nru php-net-ldap2-2.0.12/debian/patches/series php-net-ldap2-2.0.12/debian/patches/series
--- php-net-ldap2-2.0.12/debian/patches/series 1970-01-01 07:00:00.000000000 +0700
+++ php-net-ldap2-2.0.12/debian/patches/series 2016-01-27 10:04:15.000000000 +0700
@@ -0,0 +1 @@
+Fix_Fatal_error_with_PEAR_1.10.0.patch
Attachment:
signature.asc
Description: PGP signature