Date: Wednesday, December 21, 2022 @ 16:04:42
Author: spupykin
Revision: 1364896
upgpkg: phpldapadmin 1.2.6.4-4
php8 fix
Added:
phpldapadmin/trunk/more-php8-fixes.patch
Modified:
phpldapadmin/trunk/PKGBUILD
-----------------------+
PKGBUILD | 9 ++++++---
more-php8-fixes.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-21 15:38:14 UTC (rev 1364895)
+++ PKGBUILD 2022-12-21 16:04:42 UTC (rev 1364896)
@@ -2,7 +2,7 @@
pkgname=phpldapadmin
pkgver=1.2.6.4
-pkgrel=3
+pkgrel=4
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="https://github.com/leenooks/phpLDAPadmin";
@@ -13,11 +13,13 @@
source=($pkgname-$pkgver.tar.gz::https://github.com/leenooks/phpLDAPadmin/archive/$pkgver.tar.gz
https://github.com/leenooks/phpLDAPadmin/commit/661cab652b279680c07e81b4b71d1955ee2818ab.patch
disable-mcrypt.patch
- sort-in-templates.patch)
+ sort-in-templates.patch
+ more-php8-fixes.patch)
sha256sums=('92e390c013714c75439737633ad4576bc642d87b0091fab6226cbbcb13a0ea48'
'828984c8e015ea3ee43cfb61006b7502c5513007f710120bbc2102f7ad4e1a47'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
- 'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
+ 'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f'
+ 'c348768f384810bbd7e36ec301a456f94d8f0016750f7cdadd7411816d39428c')
prepare() {
cd "$srcdir"/phpLDAPadmin-${pkgver}/
@@ -25,6 +27,7 @@
patch -p1 -i "$srcdir"/disable-mcrypt.patch
patch -p1 -i "$srcdir"/sort-in-templates.patch
patch -p1 -i "$srcdir"/661cab652b279680c07e81b4b71d1955ee2818ab.patch
+ patch -p1 -i "$srcdir"/more-php8-fixes.patch
find -type f -name '*.orig' -exec rm -f {} \;
}
Added: more-php8-fixes.patch
===================================================================
--- more-php8-fixes.patch (rev 0)
+++ more-php8-fixes.patch 2022-12-21 16:04:42 UTC (rev 1364896)
@@ -0,0 +1,12 @@
+diff -wbBur phpLDAPadmin-1.2.6.4/lib/functions.php
phpLDAPadmin-1.2.6.4.my/lib/functions.php
+--- phpLDAPadmin-1.2.6.4/lib/functions.php 2022-12-21 18:43:40.596996754
+0300
++++ phpLDAPadmin-1.2.6.4.my/lib/functions.php 2022-12-21 18:43:30.240329853
+0300
+@@ -2649,7 +2649,7 @@
+ * encoded) into \<hexcode>.
+ */
+ function ldap_explode_dn_patch($dn,$with_attrib) {
+- $result = ldap_explode_dn($dn,$with_attrib);
++ $result = ldap_explode_dn((string)$dn,$with_attrib);
+ if (! $result)
+ return null;
+
