Bug#784178: jessie-pu: package php-horde-passwd/5.0.2-3+deb8u1

[Mathieu Parent <sathieu@debian.org>]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Dear release team,

php-horde-passwd in jessie (5.0.2-3) has a "typo" bug in the Kolab driver (#780670) which needs a one-line fix.

I plan to upload an update versioned 5.0.2-3+deb8u1, once I have an ack.

debdiff attached.

Regards

Mathieu Parent

-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/debian/changelog b/debian/changelog
index f59417d..6277198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-horde-passwd (5.0.2-3+deb8u1) stable; urgency=medium
+
+  * Fix Kolab driver password change (Closes: #780670)
+
+ -- Mathieu Parent <sathieu@debian.org>  Sun, 03 May 2015 20:42:42 +0200
+
 php-horde-passwd (5.0.2-3) unstable; urgency=medium
 
   * Fixed DEP-8 tests, by removing "set -x"
diff --git a/debian/patches/0001-Fix-Kolab-driver-password-change.patch b/debian/patches/0001-Fix-Kolab-driver-password-change.patch
new file mode 100644
index 0000000..137d730
--- /dev/null
+++ b/debian/patches/0001-Fix-Kolab-driver-password-change.patch
@@ -0,0 +1,23 @@
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Sun, 3 May 2015 20:27:06 +0200
+Subject: Fix Kolab driver password change
+Bug: https://github.com/horde/horde/pull/136
+Bug-Debian: https://bugs.debian.org/780670
+
+---
+ passwd-5.0.2/lib/Driver/Kolab.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/passwd-5.0.2/lib/Driver/Kolab.php b/passwd-5.0.2/lib/Driver/Kolab.php
+index 64554ed..ab49eee 100644
+--- a/passwd-5.0.2/lib/Driver/Kolab.php
++++ b/passwd-5.0.2/lib/Driver/Kolab.php
+@@ -73,7 +73,7 @@ class Passwd_Driver_Kolab extends Passwd_Driver
+         $userdn = ldap_get_dn($ds, $entry);
+ 
+         // Connect as the user.
+-        $result = @ldap_bind($ds, $userdn, $old_password);
++        $result = @ldap_bind($ds, $userdn, $oldpass);
+         if (!$result) {
+             throw new Passwd_Exception(_("Incorrect old password."));
+         }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fe1da9b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-Kolab-driver-password-change.patch