[arch-commits] Commit in phpldapadmin/repos/community-any (9 files)
Sergej Pupykin
spupykin at archlinux.org
Thu Jun 18 00:22:26 UTC 2020
Date: Thursday, June 18, 2020 @ 00:22:25
Author: spupykin
Revision: 646733
archrelease: copy trunk to community-any
Added:
phpldapadmin/repos/community-any/PKGBUILD
(from rev 646732, phpldapadmin/trunk/PKGBUILD)
phpldapadmin/repos/community-any/disable-mcrypt.patch
(from rev 646732, phpldapadmin/trunk/disable-mcrypt.patch)
phpldapadmin/repos/community-any/password-unescape.patch
(from rev 646732, phpldapadmin/trunk/password-unescape.patch)
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch
(from rev 646732, phpldapadmin/trunk/phpldapadmin-1.2.3-php7_4.patch)
phpldapadmin/repos/community-any/sort-in-templates.patch
(from rev 646732, phpldapadmin/trunk/sort-in-templates.patch)
Deleted:
phpldapadmin/repos/community-any/PKGBUILD
phpldapadmin/repos/community-any/disable-mcrypt.patch
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch
phpldapadmin/repos/community-any/sort-in-templates.patch
---------------------------------+
PKGBUILD | 83 +++++++++++++++++++-------------------
disable-mcrypt.patch | 72 ++++++++++++++++----------------
password-unescape.patch | 10 ++++
phpldapadmin-1.2.3-php7_4.patch | 48 ++++++++++-----------
sort-in-templates.patch | 24 +++++-----
5 files changed, 125 insertions(+), 112 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-18 00:22:11 UTC (rev 646732)
+++ PKGBUILD 2020-06-18 00:22:25 UTC (rev 646733)
@@ -1,40 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=phpldapadmin
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
-arch=('any')
-url="https://github.com/leenooks/phpLDAPadmin"
-license=('GPL')
-depends=('libldap' 'php')
-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() {
- _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
- mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
- cd ${_instdir}
-
- cp -ra "$srcdir"/phpLDAPadmin-${pkgver}/* .
-
- ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
- cp ${_instdir}/config/config.php.example "$pkgdir"/etc/webapps/phpldapadmin/config.php
-}
Copied: phpldapadmin/repos/community-any/PKGBUILD (from rev 646732, phpldapadmin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-18 00:22:25 UTC (rev 646733)
@@ -0,0 +1,43 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=phpldapadmin
+pkgver=1.2.5
+pkgrel=3
+pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
+arch=('any')
+url="https://github.com/leenooks/phpLDAPadmin"
+license=('GPL')
+depends=('libldap' 'php')
+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
+ password-unescape.patch
+ sort-in-templates.patch)
+sha256sums=('74581f5af1abdbf672b6a1655e9fb3c34a16c7510019348812571fcc10fdde1b'
+ 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
+ 'd6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
+ '57210da0bad722edec5f7aa1f16d32a79c7bb29b09556ddb0cfe54918cb16193'
+ '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
+ patch -p1 -i "$srcdir"/password-unescape.patch
+ find -type f -name '*.orig' -exec rm -f {} \;
+}
+
+package() {
+ _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
+ mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
+ cd ${_instdir}
+
+ cp -ra "$srcdir"/phpLDAPadmin-${pkgver}/* .
+
+ ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
+ cp ${_instdir}/config/config.php.example "$pkgdir"/etc/webapps/phpldapadmin/config.php
+}
Deleted: disable-mcrypt.patch
===================================================================
--- disable-mcrypt.patch 2020-06-18 00:22:11 UTC (rev 646732)
+++ disable-mcrypt.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -1,36 +0,0 @@
-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';
Copied: phpldapadmin/repos/community-any/disable-mcrypt.patch (from rev 646732, phpldapadmin/trunk/disable-mcrypt.patch)
===================================================================
--- disable-mcrypt.patch (rev 0)
+++ disable-mcrypt.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -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';
Copied: phpldapadmin/repos/community-any/password-unescape.patch (from rev 646732, phpldapadmin/trunk/password-unescape.patch)
===================================================================
--- password-unescape.patch (rev 0)
+++ password-unescape.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -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(
Deleted: phpldapadmin-1.2.3-php7_4.patch
===================================================================
--- phpldapadmin-1.2.3-php7_4.patch 2020-06-18 00:22:11 UTC (rev 646732)
+++ phpldapadmin-1.2.3-php7_4.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -1,24 +0,0 @@
-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) {
Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch (from rev 646732, phpldapadmin/trunk/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-18 00:22:25 UTC (rev 646733)
@@ -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) {
Deleted: sort-in-templates.patch
===================================================================
--- sort-in-templates.patch 2020-06-18 00:22:11 UTC (rev 646732)
+++ sort-in-templates.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -1,12 +0,0 @@
-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];
-
Copied: phpldapadmin/repos/community-any/sort-in-templates.patch (from rev 646732, phpldapadmin/trunk/sort-in-templates.patch)
===================================================================
--- sort-in-templates.patch (rev 0)
+++ sort-in-templates.patch 2020-06-18 00:22:25 UTC (rev 646733)
@@ -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];
+
More information about the arch-commits
mailing list