Date: Sunday, August 11, 2013 @ 09:34:32
Author: pierre
Revision: 95396
upgpkg: phpldapadmin 1.2.3-3
Added:
phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch
Modified:
phpldapadmin/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 10 +++--
phpldapadmin-1.2.3-php5_5.patch | 67 ++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-10 22:18:43 UTC (rev 95395)
+++ PKGBUILD 2013-08-11 07:34:32 UTC (rev 95396)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=2
+pkgrel=3
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/";
@@ -12,12 +12,16 @@
makedepends=('optipng')
backup=("etc/webapps/phpldapadmin/.htaccess"
"etc/webapps/phpldapadmin/config.php")
-source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz)
-md5sums=('59a49054039ceb852c2da377d8742360')
+source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
+ phpldapadmin-1.2.3-php5_5.patch )
+md5sums=('59a49054039ceb852c2da377d8742360'
+ '966de02d066d9cb90dadf12a213726d3')
build() {
cd $srcdir/phpldapadmin-${pkgver}/
find -name '*.png' -exec optipng -quiet -force -fix {} \;
+ # patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
+ patch -p1 -i $srcdir/phpldapadmin-1.2.3-php5_5.patch
}
package() {
Added: phpldapadmin-1.2.3-php5_5.patch
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch (rev 0)
+++ phpldapadmin-1.2.3-php5_5.patch 2013-08-11 07:34:32 UTC (rev 95396)
@@ -0,0 +1,67 @@
+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
+@@ -1117,12 +1117,14 @@
+ if (is_array($dn)) {
+ $a = array();
+ foreach ($dn as $key => $rdn)
+- $a[$key] =
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++ $a[$key] =
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $rdn);
+
+ return $a;
+
+ } else
+- return
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $dn);
+ }
+
+ 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
+@@ -2127,7 +2127,7 @@
+ * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512,
or clear.
+ * @return string The hashed password.
+ */
+-function password_hash($password_clear,$enc_type) {
++function pla_password_hash($password_clear,$enc_type) {
+ if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+ debug_log('Entered
(%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
+
+@@ -2318,7 +2318,7 @@
+
+ # SHA crypted passwords
+ case 'sha':
+- if
(strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
++ if
(strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword)
== 0)
+ return true;
+ else
+ return false;
+@@ -2327,7 +2327,7 @@
+
+ # MD5 crypted passwords
+ case 'md5':
+- if(
strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
++ if(
strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) ==
0)
+ return true;
+ else
+ return false;
+@@ -2565,12 +2565,14 @@
+ $a = array();
+
+ foreach ($dn as $key => $rdn)
+- $a[$key] =
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++ $a[$key] =
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $rdn );
+
+ return $a;
+
+ } else {
+- return
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $dn);
+ }
+ }
+
