[arch-commits] Commit in phpldapadmin/trunk (3 files)

[Sergej Pupykin]

    Date: Tuesday, June 16, 2020 @ 12:37:32
  Author: spupykin
Revision: 646187

upgpkg: phpldapadmin 1.2.5-2

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

---------------------------------+
 PKGBUILD                        |    9 ++++++++-
 disable-mcrypt.patch            |   36 ++++++++++++++++++++++++++++++++++++
 phpldapadmin-1.2.3-php7_4.patch |   24 ++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-16 12:21:13 UTC (rev 646186)
+++ PKGBUILD	2020-06-16 12:37:32 UTC (rev 646187)
@@ -2,7 +2,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="https://github.com/leenooks/phpLDAPadmin"
@@ -11,14 +11,21 @@
 makedepends=('optipng')
 backup=("etc/webapps/phpldapadmin/config.php")
 source=($pkgname-$pkgver.tar.gz::https://github.com/leenooks/phpLDAPadmin/archive/$pkgver.tar.gz
+        disable-mcrypt.patch
+        phpldapadmin-1.2.3-php7_4.patch
         sort-in-templates.patch)
 sha256sums=('74581f5af1abdbf672b6a1655e9fb3c34a16c7510019348812571fcc10fdde1b'
+            'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
+            'd6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
             'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
 
 prepare() {
   cd "$srcdir"/phpLDAPadmin-${pkgver}/
   find -type f -name '*.png' -exec optipng -quiet -force -fix {} \;
+  patch -p1 -i "$srcdir"/disable-mcrypt.patch
+  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php7_4.patch
   patch -p1 -i "$srcdir"/sort-in-templates.patch
+  find -type f -name '*.orig' -exec rm -f {} \;
 }
 
 package() {

Added: disable-mcrypt.patch
===================================================================
--- disable-mcrypt.patch	                        (rev 0)
+++ disable-mcrypt.patch	2020-06-16 12:37:32 UTC (rev 646187)
@@ -0,0 +1,36 @@
+diff -wbBur phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3.my/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php	2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3.my/lib/functions.php	2017-02-02 20:02:14.424245233 +0300
+@@ -745,6 +745,7 @@
+ 	if (! trim($secret))
+ 		return $data;
+ 
++/*
+ 	if (function_exists('mcrypt_module_open') && ! empty($data)) {
+ 		$td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+ 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -754,7 +755,7 @@
+ 
+ 		return $encrypted_data;
+ 	}
+-
++*/
+ 	if (file_exists(LIBDIR.'blowfish.php'))
+ 		require_once LIBDIR.'blowfish.php';
+ 	else
+@@ -801,6 +802,7 @@
+ 	if (! trim($secret))
+ 		return $encdata;
+ 
++/*
+ 	if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
+ 		$td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+ 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -810,6 +812,7 @@
+ 
+ 		return $decrypted_data;
+ 	}
++*/
+ 
+ 	if (file_exists(LIBDIR.'blowfish.php'))
+ 		require_once LIBDIR.'blowfish.php';

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-06-16 12:37:32 UTC (rev 646187)
@@ -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) {