[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD password-unescape.patch)

[Sergej Pupykin]

    Date: Friday, December 11, 2020 @ 14:08:02
  Author: spupykin
Revision: 773127

upgpkg: phpldapadmin 1.2.6.2-1

Modified:
  phpldapadmin/trunk/PKGBUILD
  phpldapadmin/trunk/password-unescape.patch

-------------------------+
 PKGBUILD                |   10 +++++-----
 password-unescape.patch |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-11 14:06:45 UTC (rev 773126)
+++ PKGBUILD	2020-12-11 14:08:02 UTC (rev 773127)
@@ -1,8 +1,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=phpldapadmin
-pkgver=1.2.5
-pkgrel=3
+pkgver=1.2.6.2
+pkgrel=1
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="https://github.com/leenooks/phpLDAPadmin"
@@ -15,10 +15,10 @@
         phpldapadmin-1.2.3-php7_4.patch
         password-unescape.patch
         sort-in-templates.patch)
-sha256sums=('74581f5af1abdbf672b6a1655e9fb3c34a16c7510019348812571fcc10fdde1b'
+sha256sums=('49b14019bf611267720b4e9de33f2502b44c526809f17225a4a76ee8296b8d64'
             'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
             'd6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
-            '57210da0bad722edec5f7aa1f16d32a79c7bb29b09556ddb0cfe54918cb16193'
+            '11e673b4ebbd922e5f6769837fef659303c48247f414dcd80f742bb01b6162b7'
             'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
 
 prepare() {
@@ -25,7 +25,7 @@
   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"/phpldapadmin-1.2.3-php7_4.patch
   patch -p1 -i "$srcdir"/sort-in-templates.patch
   patch -p1 -i "$srcdir"/password-unescape.patch
   find -type f -name '*.orig' -exec rm -f {} \;

Modified: password-unescape.patch
===================================================================
--- password-unescape.patch	2020-12-11 14:06:45 UTC (rev 773126)
+++ password-unescape.patch	2020-12-11 14:08:02 UTC (rev 773127)
@@ -1,10 +1,10 @@
 --- a/htdocs/login.php	2020-06-17 18:17:18.926320916 -0600
 +++ b/htdocs/login.php	2020-06-17 18:16:59.796222429 -0600
 @@ -14,6 +14,7 @@
- $user = array();
- $user['login'] = get_request('login');
- $user['password'] = get_request('login_pass');
-+$user['password'] = str_replace('&', '&', $user['password']);
+     $user = array();
+     $user['login'] = get_request('login');
+     $user['password'] = get_request('login_pass');
++    $user['password'] = str_replace('&', '&', $user['password']);
  
- if ($user['login'] && ! strlen($user['password']))
- system_message(array(
+     if ($user['login'] && ! strlen($user['password']))
+         system_message(array(