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

[Sergej Pupykin]

    Date: Saturday, April 25, 2020 @ 16:51:33
  Author: spupykin
Revision: 620984

upgpkg: phpldapadmin 1.2.3-13

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

---------------------------------+
 PKGBUILD                        |   11 ++++++++---
 phpldapadmin-1.2.3-php7_4.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-25 16:51:22 UTC (rev 620983)
+++ PKGBUILD	2020-04-25 16:51:33 UTC (rev 620984)
@@ -2,7 +2,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.3
-pkgrel=12
+pkgrel=13
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="http://phpldapadmin.sourceforge.net/"
@@ -13,23 +13,28 @@
 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
+        phpldapadmin-1.2.3-php7_4.patch
         disable-mcrypt.patch
         sort-in-templates.patch)
 sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
             'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
             'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
+            'd6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
             'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
             'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
 
-build() {
+prepare() {
   cd "$srcdir"/phpldapadmin-${pkgver}/
-  find -name '*.png' -exec optipng -quiet -force -fix {} \;
+  find -type f -name '*.png' -exec optipng -quiet -force -fix {} \;
   # patch from https://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
   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
+  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php7_4.patch
   patch -p1 -i "$srcdir"/sort-in-templates.patch
+  # rm .orig
+  find -type f -name '*.orig' -exec rm -f {} \;
 }
 
 package() {

Added: phpldapadmin-1.2.3-php7_4.patch
===================================================================
--- phpldapadmin-1.2.3-php7_4.patch	                        (rev 0)
+++ phpldapadmin-1.2.3-php7_4.patch	2020-04-25 16:51:33 UTC (rev 620984)
@@ -0,0 +1,24 @@
+diff -wbBur phpldapadmin-1.2.3.org/lib/functions.php phpldapadmin-1.2.3/lib/functions.php
+--- phpldapadmin-1.2.3.org/lib/functions.php	2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3/lib/functions.php	2020-04-25 10:41:00.000000000 +0300
+@@ -1588,7 +1591,7 @@
+ 
+ 	# Return icon filename based upon objectClass value
+ 	if (in_array('sambaaccount',$object_classes) &&
+-		'$' == $rdn{ strlen($rdn) - 1 })
++		'$' == $rdn[ strlen($rdn) - 1 ])
+ 		return 'nt_machine.png';
+ 
+ 	if (in_array('sambaaccount',$object_classes))
+diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php phpldapadmin-1.2.3/lib/TemplateRender.php
+--- phpldapadmin-1.2.3.org/lib/TemplateRender.php	2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3/lib/TemplateRender.php	2020-04-25 10:43:00.000000000 +0300
+@@ -200,7 +200,7 @@
+ 					$next_number = $vals;
+ 
+ 					foreach ($mod as $calc) {
+-						$operand = $calc{0};
++						$operand = $calc[0];
+ 						$operator = substr ($calc,1);
+ 
+ 						switch ($operand) {