Date: Friday, February 2, 2018 @ 16:14:09
Author: spupykin
Revision: 288640
upgpkg: phpldapadmin 1.2.3-12
Added:
phpldapadmin/trunk/sort-in-templates.patch
Modified:
phpldapadmin/trunk/PKGBUILD
-------------------------+
PKGBUILD | 9 ++++++---
sort-in-templates.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-02 15:59:55 UTC (rev 288639)
+++ PKGBUILD 2018-02-02 16:14:09 UTC (rev 288640)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=11
+pkgrel=12
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/";
@@ -14,11 +14,13 @@
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
- disable-mcrypt.patch)
+ disable-mcrypt.patch
+ sort-in-templates.patch)
sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
- 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
+ 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
+ 'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
build() {
cd "$srcdir"/phpldapadmin-${pkgver}/
@@ -28,6 +30,7 @@
# 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"/sort-in-templates.patch
}
package() {
Added: sort-in-templates.patch
===================================================================
--- sort-in-templates.patch (rev 0)
+++ sort-in-templates.patch 2018-02-02 16:14:09 UTC (rev 288640)
@@ -0,0 +1,12 @@
+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 2018-02-02 19:06:45.674760057
+0300
+@@ -321,6 +321,8 @@
+
+ $vals = array();
+
++ asort($picklistvalues);
++
+ foreach ($picklistvalues as $key => $values) {
+ $display = $args[3];
+
