Hi, the fixed version was uploaded to unstable by kobold (the maintainer), and needs an unblock to migrate. The final debdiff between testing and unstable is attached. Please unblock if all looks good to you: unblock phpldapadmin/1.2.2-5.2 Cheers + thanks, Mika
diff -Nru phpldapadmin-1.2.2/debian/changelog phpldapadmin-1.2.2/debian/changelog
--- phpldapadmin-1.2.2/debian/changelog 2014-05-02 04:30:44.000000000 +0200
+++ phpldapadmin-1.2.2/debian/changelog 2015-02-07 23:09:25.000000000 +0100
@@ -1,3 +1,11 @@
+phpldapadmin (1.2.2-5.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update the php 5.5 compatibility patch for the password_hash_custom
+ setting (Closes: #761637).
+
+ -- Mika Pflüger <debian@mikapflueger.de> Thu, 05 Feb 2015 00:41:07 +0100
+
phpldapadmin (1.2.2-5.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru phpldapadmin-1.2.2/debian/NEWS phpldapadmin-1.2.2/debian/NEWS
--- phpldapadmin-1.2.2/debian/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ phpldapadmin-1.2.2/debian/NEWS 2015-02-07 23:17:10.000000000 +0100
@@ -0,0 +1,9 @@
+phpldapadmin (1.2.2-5.2) unstable; urgency=medium
+
+ The setting option 'password_hash' has been renamed to 'password_hash_custom'.
+ Please fix your /etc/phpldapadmin/config.php and replace all references to
+ $servers->setValue('appearance','password_hash',
+ with
+ $servers->setValue('appearance','password_hash_custom',
+
+ -- Mika Pflüger <debian@mikapflueger.de> Sat, 07 Feb 2015 23:09:07 +0100
diff -Nru phpldapadmin-1.2.2/debian/patches/php-5.5-compat.patch phpldapadmin-1.2.2/debian/patches/php-5.5-compat.patch
--- phpldapadmin-1.2.2/debian/patches/php-5.5-compat.patch 2014-05-02 04:28:13.000000000 +0200
+++ phpldapadmin-1.2.2/debian/patches/php-5.5-compat.patch 2015-02-05 01:13:38.000000000 +0100
@@ -20,9 +20,9 @@
Index: phpldapadmin-1.2.2/lib/PageRender.php
===================================================================
---- phpldapadmin-1.2.2.orig/lib/PageRender.php 2014-05-01 21:01:57.218441026 -0400
-+++ phpldapadmin-1.2.2/lib/PageRender.php 2014-05-01 21:01:57.210441026 -0400
-@@ -286,7 +286,7 @@
+--- phpldapadmin-1.2.2.orig/lib/PageRender.php
++++ phpldapadmin-1.2.2/lib/PageRender.php
+@@ -286,7 +286,7 @@ class PageRender extends Visitor {
break;
default:
@@ -31,7 +31,7 @@
}
$vals = array_unique($vals);
-@@ -956,7 +956,7 @@
+@@ -956,7 +956,7 @@ class PageRender extends Visitor {
if (trim($val))
$enc_type = get_enc_type($val);
else
@@ -40,7 +40,7 @@
$obfuscate_password = obfuscate_password_display($enc_type);
-@@ -981,7 +981,7 @@
+@@ -981,7 +981,7 @@ class PageRender extends Visitor {
if (trim($val))
$enc_type = get_enc_type($val);
else
@@ -51,9 +51,9 @@
Index: phpldapadmin-1.2.2/lib/ds_ldap.php
===================================================================
---- phpldapadmin-1.2.2.orig/lib/ds_ldap.php 2014-05-01 21:01:57.218441026 -0400
-+++ phpldapadmin-1.2.2/lib/ds_ldap.php 2014-05-01 21:01:57.210441026 -0400
-@@ -1116,13 +1116,24 @@
+--- phpldapadmin-1.2.2.orig/lib/ds_ldap.php
++++ phpldapadmin-1.2.2/lib/ds_ldap.php
+@@ -1116,13 +1116,24 @@ class ldap extends DS {
if (is_array($dn)) {
$a = array();
@@ -83,9 +83,9 @@
public function getRootDSE($method=null) {
Index: phpldapadmin-1.2.2/lib/ds_ldap_pla.php
===================================================================
---- phpldapadmin-1.2.2.orig/lib/ds_ldap_pla.php 2014-05-01 21:01:57.218441026 -0400
-+++ phpldapadmin-1.2.2/lib/ds_ldap_pla.php 2014-05-01 21:01:57.210441026 -0400
-@@ -16,7 +16,7 @@
+--- phpldapadmin-1.2.2.orig/lib/ds_ldap_pla.php
++++ phpldapadmin-1.2.2/lib/ds_ldap_pla.php
+@@ -16,7 +16,7 @@ class ldap_pla extends ldap {
function __construct($index) {
parent::__construct($index);
@@ -96,9 +96,9 @@
Index: phpldapadmin-1.2.2/lib/functions.php
===================================================================
---- phpldapadmin-1.2.2.orig/lib/functions.php 2014-05-01 20:59:08.770437445 -0400
-+++ phpldapadmin-1.2.2/lib/functions.php 2014-05-01 21:04:29.302444259 -0400
-@@ -2126,7 +2126,7 @@
+--- phpldapadmin-1.2.2.orig/lib/functions.php
++++ phpldapadmin-1.2.2/lib/functions.php
+@@ -2126,7 +2126,7 @@ function password_types() {
* crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
* @return string The hashed password.
*/
@@ -107,7 +107,7 @@
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
-@@ -2307,7 +2307,7 @@
+@@ -2307,7 +2307,7 @@ function password_check($cryptedpassword
# SHA crypted passwords
case 'sha':
@@ -116,7 +116,7 @@
return true;
else
return false;
-@@ -2316,7 +2316,7 @@
+@@ -2316,7 +2316,7 @@ function password_check($cryptedpassword
# MD5 crypted passwords
case 'md5':
@@ -125,7 +125,7 @@
return true;
else
return false;
-@@ -2544,13 +2544,24 @@
+@@ -2544,13 +2544,24 @@ function dn_unescape($dn) {
if (is_array($dn)) {
$a = array();
@@ -153,3 +153,38 @@
}
}
+Index: phpldapadmin-1.2.2/config/config.php.example
+===================================================================
+--- phpldapadmin-1.2.2.orig/config/config.php.example
++++ phpldapadmin-1.2.2/config/config.php.example
+@@ -379,7 +379,7 @@ $servers->setValue('server','name','My L
+
+ /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
+ blowfish, crypt or leave blank for now default algorithm. */
+-// $servers->setValue('appearance','password_hash','md5');
++// $servers->setValue('appearance','password_hash_custom','md5');
+
+ /* If you specified 'cookie' or 'session' as the auth_type above, you can
+ optionally specify here an attribute to use when logging in. If you enter
+@@ -546,7 +546,7 @@ $servers->setValue('sasl','authz_id_rege
+ $servers->setValue('sasl','authz_id_replacement','$1');
+ $servers->setValue('sasl','props',null);
+
+-$servers->setValue('appearance','password_hash','md5');
++$servers->setValue('appearance','password_hash_custom','md5');
+ $servers->setValue('login','attr','dn');
+ $servers->setValue('login','fallback_dn',false);
+ $servers->setValue('login','class',null);
+Index: phpldapadmin-1.2.2/lib/TemplateRender.php
+===================================================================
+--- phpldapadmin-1.2.2.orig/lib/TemplateRender.php
++++ phpldapadmin-1.2.2/lib/TemplateRender.php
+@@ -2466,7 +2466,7 @@ function deleteAttribute(attrName,friend
+ if ($val = $attribute->getValue($i))
+ $default = get_enc_type($val);
+ else
+- $default = $this->getServer()->getValue('appearance','password_hash');
++ $default = $this->getServer()->getValue('appearance','password_hash_custom');
+
+ if (! $attribute->getPostValue())
+ printf('<input type="hidden" name="post_value[%s][]" value="%s" />',$attribute->getName(),$i);
Attachment:
pgpNk54oUA7p9.pgp
Description: Digitale Signatur von OpenPGP