[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD password-unescape.patch)
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
===
--- PKGBUILD2020-12-11 14:06:45 UTC (rev 773126)
+++ PKGBUILD2020-12-11 14:08:02 UTC (rev 773127)
@@ -1,8 +1,8 @@
# Maintainer: Sergej Pupykin
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(
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD password-unescape.patch)
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
===
--- PKGBUILD2020-06-18 00:18:21 UTC (rev 646731)
+++ PKGBUILD2020-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(
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php7_4.patch)
Date: Saturday, April 25, 2020 @ 16:51:33
Author: spupykin
Revision: 620984
upgpkg: phpldapadmin 1.2.3-13
Added:
phpldapadmin/trunk/phpldapadmin-1.2.3-php7_4.patch
Modified:
phpldapadmin/trunk/PKGBUILD
-+
PKGBUILD| 11 ---
phpldapadmin-1.2.3-php7_4.patch | 24
2 files changed, 32 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-25 16:51:22 UTC (rev 620983)
+++ PKGBUILD2020-04-25 16:51:33 UTC (rev 620984)
@@ -2,7 +2,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=12
+pkgrel=13
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
@@ -13,23 +13,28 @@
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
+phpldapadmin-1.2.3-php7_4.patch
disable-mcrypt.patch
sort-in-templates.patch)
sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
+'d6e9b6361549be4a4e5a05ffac0917307973fe35717041f7cdde4171271ad168'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
-build() {
+prepare() {
cd "$srcdir"/phpldapadmin-${pkgver}/
- find -name '*.png' -exec optipng -quiet -force -fix {} \;
+ find -type f -name '*.png' -exec optipng -quiet -force -fix {} \;
# patch from https://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
# 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"/phpldapadmin-1.2.3-php7_4.patch
patch -p1 -i "$srcdir"/sort-in-templates.patch
+ # rm .orig
+ find -type f -name '*.orig' -exec rm -f {} \;
}
package() {
Added: phpldapadmin-1.2.3-php7_4.patch
===
--- phpldapadmin-1.2.3-php7_4.patch (rev 0)
+++ phpldapadmin-1.2.3-php7_4.patch 2020-04-25 16:51:33 UTC (rev 620984)
@@ -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.0
+0400
phpldapadmin-1.2.3/lib/functions.php 2020-04-25 10:41:00.0
+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.0 +0400
phpldapadmin-1.2.3/lib/TemplateRender.php 2020-04-25 10:43:00.0
+0300
+@@ -200,7 +200,7 @@
+ $next_number = $vals;
+
+ foreach ($mod as $calc) {
+- $operand = $calc{0};
++ $operand = $calc[0];
+ $operator = substr ($calc,1);
+
+ switch ($operand) {
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD sort-in-templates.patch)
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
===
--- PKGBUILD2018-02-02 15:59:55 UTC (rev 288639)
+++ PKGBUILD2018-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.0 +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];
+
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php7_2.patch)
Date: Thursday, February 1, 2018 @ 16:44:52
Author: spupykin
Revision: 288516
upgpkg: phpldapadmin 1.2.3-11
Modified:
phpldapadmin/trunk/PKGBUILD
phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch
-+
PKGBUILD|4 ++--
phpldapadmin-1.2.3-php7_2.patch |6 ++
2 files changed, 4 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-01 16:05:45 UTC (rev 288515)
+++ PKGBUILD2018-02-01 16:44:52 UTC (rev 288516)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=10
+pkgrel=11
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
@@ -17,7 +17,7 @@
disable-mcrypt.patch)
sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
-'2e4892faea7925f5df45fdcc1ae94a28736c2a6000616d541df1fc57d269'
+'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
build() {
Modified: phpldapadmin-1.2.3-php7_2.patch
===
--- phpldapadmin-1.2.3-php7_2.patch 2018-02-01 16:05:45 UTC (rev 288515)
+++ phpldapadmin-1.2.3-php7_2.patch 2018-02-01 16:44:52 UTC (rev 288516)
@@ -19,14 +19,12 @@
/**
* Strips all slashes from the specified array in place (pass by ref).
-@@ -1083,7 +1083,9 @@
+@@ -1083,7 +1083,7 @@
$code .= 'return $c;';
- $CACHE[$sortby] = create_function('$a, $b',$code);
-+ $CACHE[$sortby] = function($a, $b) {
-+ eval($code);
-+ };
++ eval("\$CACHE[\$sortby] = function(\$a, \$b) { $code; };");
}
uasort($data,$CACHE[$sortby]);
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php7_2.patch)
Date: Tuesday, January 23, 2018 @ 13:33:23
Author: spupykin
Revision: 285572
upgpkg: phpldapadmin 1.2.3-10
Modified:
phpldapadmin/trunk/PKGBUILD
phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch
-+
PKGBUILD|4 ++--
phpldapadmin-1.2.3-php7_2.patch |9 -
2 files changed, 2 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-23 13:33:20 UTC (rev 285571)
+++ PKGBUILD2018-01-23 13:33:23 UTC (rev 285572)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=9
+pkgrel=10
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
@@ -17,7 +17,7 @@
disable-mcrypt.patch)
sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
-'32162761b1dc2c0f995b64180801fad8bfde6126d4f56f02d842bffea50f9ae4'
+'2e4892faea7925f5df45fdcc1ae94a28736c2a6000616d541df1fc57d269'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
build() {
Modified: phpldapadmin-1.2.3-php7_2.patch
===
--- phpldapadmin-1.2.3-php7_2.patch 2018-01-23 13:33:20 UTC (rev 285571)
+++ phpldapadmin-1.2.3-php7_2.patch 2018-01-23 13:33:23 UTC (rev 285572)
@@ -30,12 +30,3 @@
}
uasort($data,$CACHE[$sortby]);
-@@ -1295,6 +1297,8 @@
- else
- $dn2 = implode('+',$dn2);
-
-+return strcasecmp($dn1,$dn2);
-+
- # If they are obviously the same, return immediately
- if (! strcasecmp($dn1,$dn2))
- return 0;
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php7_2.patch)
Date: Tuesday, January 23, 2018 @ 13:28:22
Author: spupykin
Revision: 285562
upgpkg: phpldapadmin 1.2.3-9
Added:
phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch
Modified:
phpldapadmin/trunk/PKGBUILD
-+
PKGBUILD|5 +++-
phpldapadmin-1.2.3-php7_2.patch | 41 ++
2 files changed, 45 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-23 13:27:38 UTC (rev 285561)
+++ PKGBUILD2018-01-23 13:28:22 UTC (rev 285562)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=8
+pkgrel=9
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
@@ -13,9 +13,11 @@
backup=("etc/webapps/phpldapadmin/config.php")
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)
sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
+'32162761b1dc2c0f995b64180801fad8bfde6126d4f56f02d842bffea50f9ae4'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
build() {
@@ -25,6 +27,7 @@
patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
# 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
}
package() {
Added: phpldapadmin-1.2.3-php7_2.patch
===
--- phpldapadmin-1.2.3-php7_2.patch (rev 0)
+++ phpldapadmin-1.2.3-php7_2.patch 2018-01-23 13:28:22 UTC (rev 285562)
@@ -0,0 +1,41 @@
+diff -wbBur phpldapadmin.org/lib/functions.php phpldapadmin/lib/functions.php
+--- phpldapadmin.org/lib/functions.php 2017-02-02 10:03:58.0 -0700
phpldapadmin/lib/functions.php 2018-01-23 06:18:31.118312887 -0700
+@@ -51,7 +51,7 @@
+ /**
+ * Loads class definition
+ */
+-function __autoload($className) {
++spl_autoload_register(function($className) {
+ if (file_exists(HOOKSDIR."classes/$className.php"))
+ require_once(HOOKSDIR."classes/$className.php");
+ elseif (file_exists(LIBDIR."$className.php"))
+@@ -64,7 +64,7 @@
+ 'body'=>sprintf('%s: %s [%s]',
+ __METHOD__,_('Called to load a class that cant
be found'),$className),
+ 'type'=>'error'));
+-}
++});
+
+ /**
+ * Strips all slashes from the specified array in place (pass by ref).
+@@ -1083,7 +1083,9 @@
+
+ $code .= 'return $c;';
+
+- $CACHE[$sortby] = create_function('$a, $b',$code);
++ $CACHE[$sortby] = function($a, $b) {
++ eval($code);
++ };
+ }
+
+ uasort($data,$CACHE[$sortby]);
+@@ -1295,6 +1297,8 @@
+ else
+ $dn2 = implode('+',$dn2);
+
++return strcasecmp($dn1,$dn2);
++
+ # If they are obviously the same, return immediately
+ if (! strcasecmp($dn1,$dn2))
+ return 0;
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Tuesday, January 9, 2018 @ 18:35:28
Author: spupykin
Revision: 280748
rm php-ldap dep
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-09 18:28:53 UTC (rev 280747)
+++ PKGBUILD2018-01-09 18:35:28 UTC (rev 280748)
@@ -8,7 +8,7 @@
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
license=('GPL')
-depends=('libldap' 'php' 'php-ldap')
+depends=('libldap' 'php')
makedepends=('optipng')
backup=("etc/webapps/phpldapadmin/config.php")
source=(https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD disable-mcrypt.patch)
Date: Thursday, February 2, 2017 @ 17:04:29
Author: spupykin
Revision: 209718
upgpkg: phpldapadmin 1.2.3-8
upd
Added:
phpldapadmin/trunk/disable-mcrypt.patch
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD | 12
disable-mcrypt.patch | 36
2 files changed, 44 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-02 16:22:24 UTC (rev 209717)
+++ PKGBUILD2017-02-02 17:04:29 UTC (rev 209718)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=7
+pkgrel=8
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="http://phpldapadmin.sourceforge.net/;
@@ -12,9 +12,11 @@
makedepends=('optipng')
backup=("etc/webapps/phpldapadmin/config.php")
source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
-phpldapadmin-1.2.3-php5_5.patch )
-md5sums=('59a49054039ceb852c2da377d8742360'
- '45ebc875c588ff6756369b949ffe7401')
+phpldapadmin-1.2.3-php5_5.patch
+disable-mcrypt.patch)
+sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
+'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
+'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
build() {
cd "$srcdir"/phpldapadmin-${pkgver}/
@@ -21,6 +23,8 @@
find -name '*.png' -exec optipng -quiet -force -fix {} \;
# patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
+ # php >7 deprecates mcrypt. TODO: replace it with openssl?
+ patch -p1 -i "$srcdir"/disable-mcrypt.patch
}
package() {
Added: disable-mcrypt.patch
===
--- disable-mcrypt.patch(rev 0)
+++ disable-mcrypt.patch2017-02-02 17:04:29 UTC (rev 209718)
@@ -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.0
+0400
phpldapadmin-1.2.3.my/lib/functions.php2017-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';
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Friday, March 7, 2014 @ 16:58:29
Author: svenstaro
Revision: 106784
upgpkg: phpldapadmin 1.2.3-7
Remove apache config (FS#39213)
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-07 15:58:17 UTC (rev 106783)
+++ PKGBUILD2014-03-07 15:58:29 UTC (rev 106784)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=6
+pkgrel=7
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
@@ -32,14 +32,4 @@
ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
cp ${_instdir}/config/config.php.example
$pkgdir/etc/webapps/phpldapadmin/config.php
-
- cat $pkgdir/etc/webapps/phpldapadmin/apache.example.conf EOF
- Alias /phpldapadmin /usr/share/webapps/phpldapadmin
- Directory /usr/share/webapps/phpldapadmin
- AllowOverride All
- Options FollowSymlinks
- Require all granted
- php_admin_value open_basedir
/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/
- /Directory
-EOF
}
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Friday, March 7, 2014 @ 12:12:30 Author: spupykin Revision: 106762 Modified: phpldapadmin/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-03-07 10:49:59 UTC (rev 106761) +++ PKGBUILD2014-03-07 11:12:30 UTC (rev 106762) @@ -38,8 +38,7 @@ Directory /usr/share/webapps/phpldapadmin AllowOverride All Options FollowSymlinks - Order allow,deny - Allow from all + Require all granted php_admin_value open_basedir /srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/ /Directory EOF
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php5_5.patch)
Date: Wednesday, December 4, 2013 @ 15:20:40
Author: spupykin
Revision: 102064
upgpkg: phpldapadmin 1.2.3-6
upd
Modified:
phpldapadmin/trunk/PKGBUILD
phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch
-+
PKGBUILD|4 ++--
phpldapadmin-1.2.3-php5_5.patch | 25 +++--
2 files changed, 25 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-04 14:20:35 UTC (rev 102063)
+++ PKGBUILD2013-12-04 14:20:40 UTC (rev 102064)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=5
+pkgrel=6
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
@@ -14,7 +14,7 @@
source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
phpldapadmin-1.2.3-php5_5.patch )
md5sums=('59a49054039ceb852c2da377d8742360'
- '966de02d066d9cb90dadf12a213726d3')
+ '45ebc875c588ff6756369b949ffe7401')
build() {
cd $srcdir/phpldapadmin-${pkgver}/
Modified: phpldapadmin-1.2.3-php5_5.patch
===
--- phpldapadmin-1.2.3-php5_5.patch 2013-12-04 14:20:35 UTC (rev 102063)
+++ phpldapadmin-1.2.3-php5_5.patch 2013-12-04 14:20:40 UTC (rev 102064)
@@ -1,6 +1,18 @@
+diff -Nrbu phpldapadmin-1.2.3/lib/PageRender.php
phpldapadmin-1.2.3-OK/lib/PageRender.php
+--- phpldapadmin-1.2.3/lib/PageRender.php 2012-10-01 10:54:14.0
+0400
phpldapadmin-1.2.3-OK/lib/PageRender.php 2013-11-12 03:44:40.518144839
+0400
+@@ -287,7 +287,7 @@
+ break;
+
+ default:
+- $vals[$i] =
password_hash($passwordvalue,$enc);
++ $vals[$i] =
pla_password_hash($passwordvalue,$enc);
+ }
+
+ $vals = array_unique($vals);
diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php
phpldapadmin-1.2.3-OK/lib/ds_ldap.php
--- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.0 +0400
-+++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-06-18 16:03:52.295235583
+0400
phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-11-12 03:40:56.638343739
+0400
@@ -1117,12 +1117,14 @@
if (is_array($dn)) {
$a = array();
@@ -20,7 +32,7 @@
public function getRootDSE($method=null) {
diff -Nrbu phpldapadmin-1.2.3/lib/functions.php
phpldapadmin-1.2.3-OK/lib/functions.php
--- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.0
+0400
-+++ phpldapadmin-1.2.3-OK/lib/functions.php2013-06-18 16:03:52.330235281
+0400
phpldapadmin-1.2.3-OK/lib/functions.php2013-11-12 03:44:17.298065264
+0400
@@ -2127,7 +2127,7 @@
*crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512,
or clear.
* @return string The hashed password.
@@ -48,6 +60,15 @@
return true;
else
return false;
+@@ -2392,7 +2392,7 @@
+
+ # SHA512 crypted passwords
+ case 'sha512':
+- if
(strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword)
== 0)
++ if
(strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword)
== 0)
+ return true;
+ else
+ return false;
@@ -2565,12 +2565,14 @@
$a = array();
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Wednesday, November 6, 2013 @ 14:23:08
Author: spupykin
Revision: 100607
upgpkg: phpldapadmin 1.2.3-5
upd
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-06 13:23:01 UTC (rev 100606)
+++ PKGBUILD2013-11-06 13:23:08 UTC (rev 100607)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=4
+pkgrel=5
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
@@ -10,8 +10,7 @@
license=('GPL')
depends=('libldap' 'php' 'php-ldap')
makedepends=('optipng')
-backup=(etc/webapps/phpldapadmin/.htaccess
- etc/webapps/phpldapadmin/config.php)
+backup=(etc/webapps/phpldapadmin/config.php)
source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
phpldapadmin-1.2.3-php5_5.patch )
md5sums=('59a49054039ceb852c2da377d8742360'
@@ -30,9 +29,7 @@
cd ${_instdir}
cp -ra $srcdir/phpldapadmin-${pkgver}/* .
- echo deny from all $pkgdir/etc/webapps/phpldapadmin/.htaccess
- ln -s /etc/webapps/phpldapadmin/.htaccess ${_instdir}/.htaccess
ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
cp ${_instdir}/config/config.php.example
$pkgdir/etc/webapps/phpldapadmin/config.php
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Wednesday, August 14, 2013 @ 10:49:14
Author: spupykin
Revision: 95557
upgpkg: phpldapadmin 1.2.3-4
upd
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-14 08:45:43 UTC (rev 95556)
+++ PKGBUILD2013-08-14 08:49:14 UTC (rev 95557)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=3
+pkgrel=4
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
@@ -37,8 +37,8 @@
cp ${_instdir}/config/config.php.example
$pkgdir/etc/webapps/phpldapadmin/config.php
cat $pkgdir/etc/webapps/phpldapadmin/apache.example.conf EOF
- Alias /phpldapadmin /usr/share/webapps/phpldapAdmin
- Directory /usr/share/webapps/phpldapAdmin
+ Alias /phpldapadmin /usr/share/webapps/phpldapadmin
+ Directory /usr/share/webapps/phpldapadmin
AllowOverride All
Options FollowSymlinks
Order allow,deny
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD phpldapadmin-1.2.3-php5_5.patch)
Date: Sunday, August 11, 2013 @ 09:34:32
Author: pierre
Revision: 95396
upgpkg: phpldapadmin 1.2.3-3
Added:
phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch
Modified:
phpldapadmin/trunk/PKGBUILD
-+
PKGBUILD| 10 +++--
phpldapadmin-1.2.3-php5_5.patch | 67 ++
2 files changed, 74 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-10 22:18:43 UTC (rev 95395)
+++ PKGBUILD2013-08-11 07:34:32 UTC (rev 95396)
@@ -3,7 +3,7 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=2
+pkgrel=3
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
@@ -12,12 +12,16 @@
makedepends=('optipng')
backup=(etc/webapps/phpldapadmin/.htaccess
etc/webapps/phpldapadmin/config.php)
-source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz)
-md5sums=('59a49054039ceb852c2da377d8742360')
+source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
+phpldapadmin-1.2.3-php5_5.patch )
+md5sums=('59a49054039ceb852c2da377d8742360'
+ '966de02d066d9cb90dadf12a213726d3')
build() {
cd $srcdir/phpldapadmin-${pkgver}/
find -name '*.png' -exec optipng -quiet -force -fix {} \;
+ # patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
+ patch -p1 -i $srcdir/phpldapadmin-1.2.3-php5_5.patch
}
package() {
Added: phpldapadmin-1.2.3-php5_5.patch
===
--- phpldapadmin-1.2.3-php5_5.patch (rev 0)
+++ phpldapadmin-1.2.3-php5_5.patch 2013-08-11 07:34:32 UTC (rev 95396)
@@ -0,0 +1,67 @@
+diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php
phpldapadmin-1.2.3-OK/lib/ds_ldap.php
+--- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.0 +0400
phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-06-18 16:03:52.295235583
+0400
+@@ -1117,12 +1117,14 @@
+ if (is_array($dn)) {
+ $a = array();
+ foreach ($dn as $key = $rdn)
+- $a[$key] =
preg_replace('/\\\([0-9A-Fa-f]{2})/e',''.chr(hexdec('\\1')).'',$rdn);
++ $a[$key] =
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $rdn);
+
+ return $a;
+
+ } else
+- return
preg_replace('/\\\([0-9A-Fa-f]{2})/e',''.chr(hexdec('\\1')).'',$dn);
++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $dn);
+ }
+
+ public function getRootDSE($method=null) {
+diff -Nrbu phpldapadmin-1.2.3/lib/functions.php
phpldapadmin-1.2.3-OK/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.0
+0400
phpldapadmin-1.2.3-OK/lib/functions.php2013-06-18 16:03:52.330235281
+0400
+@@ -2127,7 +2127,7 @@
+ *crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512,
or clear.
+ * @return string The hashed password.
+ */
+-function password_hash($password_clear,$enc_type) {
++function pla_password_hash($password_clear,$enc_type) {
+ if (DEBUG_ENABLED (($fargs=func_get_args())||$fargs='NOARGS'))
+ debug_log('Entered
(%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
+
+@@ -2318,7 +2318,7 @@
+
+ # SHA crypted passwords
+ case 'sha':
+- if
(strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
++ if
(strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword)
== 0)
+ return true;
+ else
+ return false;
+@@ -2327,7 +2327,7 @@
+
+ # MD5 crypted passwords
+ case 'md5':
+- if(
strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
++ if(
strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) ==
0)
+ return true;
+ else
+ return false;
+@@ -2565,12 +2565,14 @@
+ $a = array();
+
+ foreach ($dn as $key = $rdn)
+- $a[$key] =
preg_replace('/\\\([0-9A-Fa-f]{2})/e',''.chr(hexdec('\\1')).'',$rdn);
++ $a[$key] =
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return
chr(hexdec($matches[1])); }, $rdn );
+
+ return $a;
[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD)
Date: Monday, May 6, 2013 @ 12:41:31
Author: spupykin
Revision: 89964
upgpkg: phpldapadmin 1.2.3-2
upd
Modified:
phpldapadmin/trunk/PKGBUILD
--+
PKGBUILD |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-06 10:41:26 UTC (rev 89963)
+++ PKGBUILD2013-05-06 10:41:31 UTC (rev 89964)
@@ -3,17 +3,23 @@
pkgname=phpldapadmin
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
pkgdesc=A PHP and hence web-based tool to administrate LDAP over the WWW
arch=('any')
url=http://phpldapadmin.sourceforge.net/;
license=('GPL')
depends=('libldap' 'php' 'php-ldap')
+makedepends=('optipng')
backup=(etc/webapps/phpldapadmin/.htaccess
etc/webapps/phpldapadmin/config.php)
source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz)
md5sums=('59a49054039ceb852c2da377d8742360')
+build() {
+ cd $srcdir/phpldapadmin-${pkgver}/
+ find -name '*.png' -exec optipng -quiet -force -fix {} \;
+}
+
package() {
_instdir=$pkgdir/usr/share/webapps/phpldapadmin
mkdir -p ${_instdir} $pkgdir/etc/webapps/phpldapadmin
