[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php5_5.patch)

[Sergej Pupykin]

    Date: Wednesday, December 4, 2013 @ 15:20:40
  Author: spupykin
Revision: 102064

upgpkg: phpldapadmin 1.2.3-6

upd

Modified:
  phpldapadmin/trunk/PKGBUILD
  phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch

---------------------------------+
 PKGBUILD                        |    4 ++--
 phpldapadmin-1.2.3-php5_5.patch |   25 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-04 14:20:35 UTC (rev 102063)
+++ PKGBUILD	2013-12-04 14:20:40 UTC (rev 102064)
@@ -3,7 +3,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="http://phpldapadmin.sourceforge.net/"
@@ -14,7 +14,7 @@
 source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
         phpldapadmin-1.2.3-php5_5.patch )
 md5sums=('59a49054039ceb852c2da377d8742360'
-         '966de02d066d9cb90dadf12a213726d3')
+         '45ebc875c588ff6756369b949ffe7401')
 
 build() {
   cd $srcdir/phpldapadmin-${pkgver}/

Modified: phpldapadmin-1.2.3-php5_5.patch
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch	2013-12-04 14:20:35 UTC (rev 102063)
+++ phpldapadmin-1.2.3-php5_5.patch	2013-12-04 14:20:40 UTC (rev 102064)
@@ -1,6 +1,18 @@
+diff -Nrbu phpldapadmin-1.2.3/lib/PageRender.php phpldapadmin-1.2.3-OK/lib/PageRender.php
+--- phpldapadmin-1.2.3/lib/PageRender.php	2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3-OK/lib/PageRender.php	2013-11-12 03:44:40.518144839 +0400
+@@ -287,7 +287,7 @@
+ 						break;
+ 
+ 					default:
+-						$vals[$i] = password_hash($passwordvalue,$enc);
++						$vals[$i] = pla_password_hash($passwordvalue,$enc);
+ 				}
+ 
+ 				$vals = array_unique($vals);
 diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php
 --- phpldapadmin-1.2.3/lib/ds_ldap.php	2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php	2013-06-18 16:03:52.295235583 +0400
++++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php	2013-11-12 03:40:56.638343739 +0400
 @@ -1117,12 +1117,14 @@
  		if (is_array($dn)) {
  			$a = array();
@@ -20,7 +32,7 @@
  	public function getRootDSE($method=null) {
 diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php
 --- phpldapadmin-1.2.3/lib/functions.php	2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/functions.php	2013-06-18 16:03:52.330235281 +0400
++++ phpldapadmin-1.2.3-OK/lib/functions.php	2013-11-12 03:44:17.298065264 +0400
 @@ -2127,7 +2127,7 @@
   *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
   * @return string The hashed password.
@@ -48,6 +60,15 @@
  				return true;
  			else
  				return false;
+@@ -2392,7 +2392,7 @@
+ 
+ 		# SHA512 crypted passwords
+ 		case 'sha512':
+-			if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
++			if (strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
+ 				return true;
+ 			else
+ 				return false;
 @@ -2565,12 +2565,14 @@
  		$a = array();