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

[Sergej Pupykin]

    Date: Tuesday, January 23, 2018 @ 13:28:22
  Author: spupykin
Revision: 285562

upgpkg: phpldapadmin 1.2.3-9

Added:
  phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch
Modified:
  phpldapadmin/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |    5 +++-
 phpldapadmin-1.2.3-php7_2.patch |   41 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-23 13:27:38 UTC (rev 285561)
+++ PKGBUILD	2018-01-23 13:28:22 UTC (rev 285562)
@@ -3,7 +3,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="http://phpldapadmin.sourceforge.net/"
@@ -13,9 +13,11 @@
 backup=("etc/webapps/phpldapadmin/config.php")
 source=(https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
         phpldapadmin-1.2.3-php5_5.patch
+        phpldapadmin-1.2.3-php7_2.patch
         disable-mcrypt.patch)
 sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
             'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
+            '32162761b1dc2c0f995b64180801fad8bfde6126d4f56f02d842bffea50f9ae4'
             'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
 
 build() {
@@ -25,6 +27,7 @@
   patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
   # php >7 deprecates mcrypt. TODO: replace it with openssl?
   patch -p1 -i "$srcdir"/disable-mcrypt.patch
+  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php7_2.patch
 }
 
 package() {

Added: phpldapadmin-1.2.3-php7_2.patch
===================================================================
--- phpldapadmin-1.2.3-php7_2.patch	                        (rev 0)
+++ phpldapadmin-1.2.3-php7_2.patch	2018-01-23 13:28:22 UTC (rev 285562)
@@ -0,0 +1,41 @@
+diff -wbBur phpldapadmin.org/lib/functions.php phpldapadmin/lib/functions.php
+--- phpldapadmin.org/lib/functions.php	2017-02-02 10:03:58.000000000 -0700
++++ phpldapadmin/lib/functions.php	2018-01-23 06:18:31.118312887 -0700
+@@ -51,7 +51,7 @@
+ /**
+  * Loads class definition
+  */
+-function __autoload($className) {
++spl_autoload_register(function($className) {
+ 	if (file_exists(HOOKSDIR."classes/$className.php"))
+ 		require_once(HOOKSDIR."classes/$className.php");
+ 	elseif (file_exists(LIBDIR."$className.php"))
+@@ -64,7 +64,7 @@
+ 			'body'=>sprintf('%s: %s [%s]',
+ 				__METHOD__,_('Called to load a class that cant be found'),$className),
+ 			'type'=>'error'));
+-}
++});
+ 
+ /**
+  * Strips all slashes from the specified array in place (pass by ref).
+@@ -1083,7 +1083,9 @@
+ 
+ 		$code .= 'return $c;';
+ 
+-		$CACHE[$sortby] = create_function('$a, $b',$code);
++		$CACHE[$sortby] = function($a, $b) {
++			eval($code);
++		};
+ 	}
+ 
+ 	uasort($data,$CACHE[$sortby]);
+@@ -1295,6 +1297,8 @@
+ 		else
+ 			$dn2 = implode('+',$dn2);
+ 
++return strcasecmp($dn1,$dn2);
++
+ 	# If they are obviously the same, return immediately
+ 	if (! strcasecmp($dn1,$dn2))
+ 		return 0;