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

[Sergej Pupykin]

    Date: Thursday, June 18, 2020 @ 00:22:11
  Author: spupykin
Revision: 646732

upgpkg: phpldapadmin 1.2.5-3

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

-------------------------+
 PKGBUILD                |    5 ++++-
 password-unescape.patch |   10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-18 00:18:21 UTC (rev 646731)
+++ PKGBUILD	2020-06-18 00:22:11 UTC (rev 646732)
@@ -2,7 +2,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="https://github.com/leenooks/phpLDAPadmin"
@@ -13,10 +13,12 @@
 source=($pkgname-$pkgver.tar.gz::https://github.com/leenooks/phpLDAPadmin/archive/$pkgver.tar.gz
         disable-mcrypt.patch
         phpldapadmin-1.2.3-php7_4.patch
+        password-unescape.patch
         sort-in-templates.patch)
 sha256sums=('74581f5af1abdbf672b6a1655e9fb3c34a16c7510019348812571fcc10fdde1b'
             'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
             'd6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
+            '57210da0bad722edec5f7aa1f16d32a79c7bb29b09556ddb0cfe54918cb16193'
             'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
 
 prepare() {
@@ -25,6 +27,7 @@
   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
+  patch -p1 -i "$srcdir"/password-unescape.patch
   find -type f -name '*.orig' -exec rm -f {} \;
 }
 

Added: password-unescape.patch
===================================================================
--- password-unescape.patch	                        (rev 0)
+++ password-unescape.patch	2020-06-18 00:22:11 UTC (rev 646732)
@@ -0,0 +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']);
+ 
+ if ($user['login'] && ! strlen($user['password']))
+ system_message(array(