pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/phpldapadmin phpldapadmin: package version 1...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ec391b794788
branches: trunk
changeset: 377087:ec391b794788
user: khorben <khorben%pkgsrc.org@localhost>
date: Sat Apr 16 03:11:28 2022 +0000
description:
phpldapadmin: package version 1.2.6.3
This changes the upstream to leenooks/phpLDAPadmin on GitHub.
This also includes a patch from Debian at
https://packages.debian.org/source/sid/phpldapadmin
(phpldapadmin_1.2.6.3-0.2.debian.tar.xz) in order to support newer
versions of PHP. This package had become unusable with the version
of PHP shipped by pkgsrc by default (7.4 as of today).
Tested on NetBSD/amd64, Darwin/amd64.
diffstat:
databases/phpldapadmin/Makefile | 11 +-
databases/phpldapadmin/PLIST | 6 +-
databases/phpldapadmin/distinfo | 40 +-
databases/phpldapadmin/patches/patch-config_config.php.example | 24 -
databases/phpldapadmin/patches/patch-htdocs_collapse.php | 13 +
databases/phpldapadmin/patches/patch-htdocs_draw__tree__node.php | 13 +
databases/phpldapadmin/patches/patch-htdocs_expand.php | 13 +
databases/phpldapadmin/patches/patch-htdocs_index.php | 18 -
databases/phpldapadmin/patches/patch-htdocs_refresh.php | 13 +
databases/phpldapadmin/patches/patch-lib_Attribute.php | 922 ++++++++++
databases/phpldapadmin/patches/patch-lib_AttributeFactory.php | 13 +
databases/phpldapadmin/patches/patch-lib_BinaryAttribute.php | 13 +
databases/phpldapadmin/patches/patch-lib_DateAttribute.php | 12 +
databases/phpldapadmin/patches/patch-lib_DnAttribute.php | 12 +
databases/phpldapadmin/patches/patch-lib_GidAttribute.php | 12 +
databases/phpldapadmin/patches/patch-lib_MultiLineAttribute.php | 13 +
databases/phpldapadmin/patches/patch-lib_ObjectClassAttribute.php | 12 +
databases/phpldapadmin/patches/patch-lib_PLAAttribute.php | 922 ++++++++++
databases/phpldapadmin/patches/patch-lib_PageRender.php | 50 +-
databases/phpldapadmin/patches/patch-lib_PasswordAttribute.php | 12 +
databases/phpldapadmin/patches/patch-lib_QueryRender.php | 15 -
databases/phpldapadmin/patches/patch-lib_SelectionAttribute.php | 13 +
databases/phpldapadmin/patches/patch-lib_ShadowAttribute.php | 13 +
databases/phpldapadmin/patches/patch-lib_TemplateRender.php | 15 -
databases/phpldapadmin/patches/patch-lib_Tree.php | 13 +
databases/phpldapadmin/patches/patch-lib_Visitor.php | 45 +
databases/phpldapadmin/patches/patch-lib_common.php | 15 +
databases/phpldapadmin/patches/patch-lib_ds__ldap.php | 51 +-
databases/phpldapadmin/patches/patch-lib_ds__ldap__pla.php | 36 +-
databases/phpldapadmin/patches/patch-lib_functions.php | 143 +-
databases/phpldapadmin/patches/patch-lib_xmlTemplates.php | 13 +
31 files changed, 2273 insertions(+), 243 deletions(-)
diffs (truncated from 2714 to 300 lines):
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile Sat Apr 16 02:49:30 2022 +0000
+++ b/databases/phpldapadmin/Makefile Sat Apr 16 03:11:28 2022 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2021/03/07 13:08:47 taca Exp $
+# $NetBSD: Makefile,v 1.47 2022/04/16 03:11:28 khorben Exp $
DISTNAME= phpldapadmin-${VERSION}
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
CATEGORIES= databases www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=leenooks/}
+GITHUB_PROJECT= phpLDAPadmin
+GITHUB_TAG= ${VERSION}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://phpldapadmin.sourceforge.net/
@@ -19,7 +20,7 @@
USE_TOOLS+= pax
-VERSION= 1.2.3
+VERSION= 1.2.6.3
NO_BUILD= YES
CONF_FILES+= ${PREFIX}/share/examples/phpldapadmin/config.php.example \
@@ -51,7 +52,7 @@
cd ${WRKSRC}/${i:Q} && ${FIND} . -type f \! -name '*.orig' -print | \
pax -rwppm ${DESTDIR}${PREFIX}/share/phpldapadmin/${i:Q}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/INSTALL \
+ ${INSTALL_DATA} ${WRKSRC}/INSTALL.md \
${DESTDIR}${PREFIX}/share/doc/phpldapadmin
${INSTALL_DATA} ${WRKSRC}/LICENSE \
${DESTDIR}${PREFIX}/share/doc/phpldapadmin
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/PLIST
--- a/databases/phpldapadmin/PLIST Sat Apr 16 02:49:30 2022 +0000
+++ b/databases/phpldapadmin/PLIST Sat Apr 16 03:11:28 2022 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2013/04/02 16:00:10 taca Exp $
-share/doc/phpldapadmin/INSTALL
+@comment $NetBSD: PLIST,v 1.12 2022/04/16 03:11:28 khorben Exp $
+share/doc/phpldapadmin/INSTALL.md
share/doc/phpldapadmin/LICENSE
share/examples/phpldapadmin/config.php.example
share/examples/phpldapadmin/phpldapadmin.conf
@@ -514,7 +514,6 @@
share/phpldapadmin/htdocs/welcome.php
share/phpldapadmin/index.php
share/phpldapadmin/lib/AJAXTree.php
-share/phpldapadmin/lib/Attribute.php
share/phpldapadmin/lib/AttributeFactory.php
share/phpldapadmin/lib/BinaryAttribute.php
share/phpldapadmin/lib/DateAttribute.php
@@ -525,6 +524,7 @@
share/phpldapadmin/lib/MassRender.php
share/phpldapadmin/lib/MultiLineAttribute.php
share/phpldapadmin/lib/ObjectClassAttribute.php
+share/phpldapadmin/lib/PLAAttribute.php
share/phpldapadmin/lib/PageRender.php
share/phpldapadmin/lib/PasswordAttribute.php
share/phpldapadmin/lib/Query.php
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/distinfo
--- a/databases/phpldapadmin/distinfo Sat Apr 16 02:49:30 2022 +0000
+++ b/databases/phpldapadmin/distinfo Sat Apr 16 03:11:28 2022 +0000
@@ -1,13 +1,29 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 10:09:45 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/04/16 03:11:28 khorben Exp $
-BLAKE2s (phpldapadmin-1.2.3.tgz) = 87fad8e94727f824af91ed9576a85009d5bd7a69ab8ed2d8f805147a8c7a2cdd
-SHA512 (phpldapadmin-1.2.3.tgz) = 58a57ca577586685ebd0d7fde7e299b8945d1693018c7803e19239b79f4b9d72a4d207d53c9f284268e32398108038efafcdb434e634619bfe87db3524d267b6
-Size (phpldapadmin-1.2.3.tgz) = 1115707 bytes
-SHA1 (patch-config_config.php.example) = c6cdc8e62ec8c06ae99f219f1a20694502d6fe0d
-SHA1 (patch-htdocs_index.php) = 4788ea606b6aa0cc93bb319c8d6b180ccf3010e6
-SHA1 (patch-lib_PageRender.php) = 198e637024c01b164017a15b5449782ce8829996
-SHA1 (patch-lib_QueryRender.php) = 806e3d2f874aca0ff8c0c07d4f4db57a2008185c
-SHA1 (patch-lib_TemplateRender.php) = 766981b0a31221d2580e7f592140dd95601caf40
-SHA1 (patch-lib_ds__ldap.php) = 55563684fba16c1fbebbfa88ff1ce506f6c947fc
-SHA1 (patch-lib_ds__ldap__pla.php) = 5331d8410ace331a5924f96e3f90a991866b9345
-SHA1 (patch-lib_functions.php) = 06be1a704070e5466278dfc3003f5c015fcc93c9
+BLAKE2s (phpldapadmin-1.2.6.3.tar.gz) = 357714bc52f95ce722eb85b008b395ce22843b223e312e9ec22e5ecb7304a2e9
+SHA512 (phpldapadmin-1.2.6.3.tar.gz) = 66aeb81c812830968df5d3a2f0ccdd479fe5d7ed3bb729c0fb9991d3efa20263a493b38bfe48c99ad2c93c2ee549f51f53e064fb1381bc7e126ca2ad2bfc3167
+Size (phpldapadmin-1.2.6.3.tar.gz) = 1130061 bytes
+SHA1 (patch-htdocs_collapse.php) = 2ba096f8ba5c8304e27f3d10818605da667be72c
+SHA1 (patch-htdocs_draw__tree__node.php) = 63ec819e6fdc7be05188df9a4d603e0d01261b2e
+SHA1 (patch-htdocs_expand.php) = 06b83f5093e23f1628cb1be7a741b0eabe5e0e97
+SHA1 (patch-htdocs_refresh.php) = ea724a89cd540191ec4c2e2adbb3c25b359cdbe6
+SHA1 (patch-lib_Attribute.php) = e0d95fc787e19da0b779dc0b974a2755f0d1c0e7
+SHA1 (patch-lib_AttributeFactory.php) = 7db91e50bc649ee0a4bea6a63cb9f055be3f9340
+SHA1 (patch-lib_BinaryAttribute.php) = 108b6fdca6f0013513adc81c6f092ef85c821a2b
+SHA1 (patch-lib_DateAttribute.php) = 051ebe274fa7ebb53955464d7b6a63d34c334d4b
+SHA1 (patch-lib_DnAttribute.php) = 8014cf8e8fe278298979197aaf8370b31adf65cb
+SHA1 (patch-lib_GidAttribute.php) = 483c4a5ad673a2244cbdf5efd008395174520544
+SHA1 (patch-lib_MultiLineAttribute.php) = e5ac91a1d20b1103fd708c463b3bab1b42cc3b4d
+SHA1 (patch-lib_ObjectClassAttribute.php) = 710741d4938345b4548c7fdc7b281c7f50c18eab
+SHA1 (patch-lib_PLAAttribute.php) = 4ea90a667d341789a825f2d3a022d47e0c31f582
+SHA1 (patch-lib_PageRender.php) = b9dfb3a1eb7d7170fc054b46ce78a333a5693047
+SHA1 (patch-lib_PasswordAttribute.php) = 6c75b2e79c185ab213f4b5b12838c457b56641fc
+SHA1 (patch-lib_SelectionAttribute.php) = 541fa3d50c0d971d86eb57c53c2cafbb2ed79076
+SHA1 (patch-lib_ShadowAttribute.php) = f75dbda7c48172381d786d170cde674232673798
+SHA1 (patch-lib_Tree.php) = 3a19a78e12c125d86e5c61abcceee40e620f2558
+SHA1 (patch-lib_Visitor.php) = fa7606271887feaa94eb74f80933d6c2f572f21b
+SHA1 (patch-lib_common.php) = e039f34c44640022cb3501cc0e625b1dfc348268
+SHA1 (patch-lib_ds__ldap.php) = 5ef5eabcbca6b4c4d877f864e8beae3cb6d84c41
+SHA1 (patch-lib_ds__ldap__pla.php) = 69f1fd2e6b019ed741595099f6acfe5052a65833
+SHA1 (patch-lib_functions.php) = 1a2fa831a150d84b67dd3c9e5dde9d153d5e6383
+SHA1 (patch-lib_xmlTemplates.php) = f58ea751b9d2c9f5adfc968a73dcb94a3fe121c2
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-config_config.php.example
--- a/databases/phpldapadmin/patches/patch-config_config.php.example Sat Apr 16 02:49:30 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-config_config.php.example,v 1.1 2021/02/21 22:22:22 khorben Exp $
-
-Fix for PHP >= 5.5
-
---- config/config.php.example.orig 2012-10-01 06:54:14.000000000 +0000
-+++ config/config.php.example
-@@ -379,7 +379,7 @@ $servers->setValue('server','name','My L
-
- /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
- blowfish, crypt or leave blank for now default algorithm. */
--// $servers->setValue('appearance','password_hash','md5');
-+// $servers->setValue('appearance','pla_password_hash','md5');
-
- /* If you specified 'cookie' or 'session' as the auth_type above, you can
- optionally specify here an attribute to use when logging in. If you enter
-@@ -546,7 +546,7 @@ $servers->setValue('sasl','authz_id_rege
- $servers->setValue('sasl','authz_id_replacement','$1');
- $servers->setValue('sasl','props',null);
-
--$servers->setValue('appearance','password_hash','md5');
-+$servers->setValue('appearance','pla_password_hash','md5');
- $servers->setValue('login','attr','dn');
- $servers->setValue('login','fallback_dn',false);
- $servers->setValue('login','class',null);
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-htdocs_collapse.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-htdocs_collapse.php Sat Apr 16 03:11:28 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-htdocs_collapse.php,v 1.1 2022/04/16 03:11:28 khorben Exp $
+
+--- htdocs/collapse.php.orig 2012-10-01 06:54:14.000000000 +0000
++++ htdocs/collapse.php
+@@ -19,7 +19,7 @@ $dn = get_request('dn','GET',true);
+ $tree = get_cached_item($app['server']->getIndex(),'tree');
+ $entry = $tree->getEntry($dn);
+ $entry->close();
+-set_cached_item($app['server']->getIndex(),'tree','null',$tree);
++set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+
+ header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s',
+ $app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-htdocs_draw__tree__node.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-htdocs_draw__tree__node.php Sat Apr 16 03:11:28 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-htdocs_draw__tree__node.php,v 1.1 2022/04/16 03:11:28 khorben Exp $
+
+--- htdocs/draw_tree_node.php.orig 2012-10-01 06:54:14.000000000 +0000
++++ htdocs/draw_tree_node.php
+@@ -50,7 +50,7 @@ if ($request['dn']) {
+ }
+
+ if ($treesave)
+- set_cached_item($app['server']->getIndex(),'tree','null',$tree);
++ set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+
+ if ($request['dn'])
+ echo $tree->draw_children($dnentry,$request['code']);
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-htdocs_expand.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-htdocs_expand.php Sat Apr 16 03:11:28 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-htdocs_expand.php,v 1.1 2022/04/16 03:11:28 khorben Exp $
+
+--- htdocs/expand.php.orig 2012-10-01 06:54:14.000000000 +0000
++++ htdocs/expand.php
+@@ -19,7 +19,7 @@ $dn = get_request('dn','GET',true);
+ $tree = get_cached_item($app['server']->getIndex(),'tree');
+ $entry = $tree->getEntry($dn);
+ $entry->open();
+-set_cached_item($app['server']->getIndex(),'tree','null',$tree);
++set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+
+ header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s',
+ $app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-htdocs_index.php
--- a/databases/phpldapadmin/patches/patch-htdocs_index.php Sat Apr 16 02:49:30 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-htdocs_index.php,v 1.1 2021/02/21 22:22:22 khorben Exp $
-
-Bail out if the configuration file is missing
-
---- htdocs/index.php.orig 2012-10-01 06:54:14.000000000 +0000
-+++ htdocs/index.php
-@@ -57,6 +57,11 @@ if (defined('CONFDIR'))
- else
- $app['config_file'] = 'config.php';
-
-+if (! is_readable($app['config_file'])) {
-+ if (ob_get_level()) ob_end_clean();
-+ die(sprintf("Missing configuration file <b>%s</b> - have you created it?",$app['config_file']));
-+}
-+
- # Make sure this PHP install has session support
- if (! extension_loaded('session'))
- error('<p>Your install of PHP appears to be missing php-session support.</p><p>Please install php-session support before using phpLDAPadmin.<br /><small>(Dont forget to restart your web
server afterwards)</small></p>','error',null,true);
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-htdocs_refresh.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-htdocs_refresh.php Sat Apr 16 03:11:28 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-htdocs_refresh.php,v 1.1 2022/04/16 03:11:28 khorben Exp $
+
+--- htdocs/refresh.php.orig 2012-10-01 06:54:14.000000000 +0000
++++ htdocs/refresh.php
+@@ -34,7 +34,7 @@ if (get_request('purge','REQUEST')) {
+ $entry->open();
+ }
+
+- set_cached_item($app['server']->getIndex(),'tree','null',$tree);
++ set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+ }
+
+ if (get_request('meth','REQUEST') == 'ajax')
diff -r 6ed5045c5f7b -r ec391b794788 databases/phpldapadmin/patches/patch-lib_Attribute.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-lib_Attribute.php Sat Apr 16 03:11:28 2022 +0000
@@ -0,0 +1,922 @@
+$NetBSD: patch-lib_Attribute.php,v 1.1 2022/04/16 03:11:28 khorben Exp $
+
+--- lib/Attribute.php.orig 2022-04-15 22:51:57.000000000 +0000
++++ lib/Attribute.php
+@@ -1,917 +0,0 @@
+-<?php
+-/**
+- * Classes and functions for the template engine.
+- *
+- * @author The phpLDAPadmin development team
+- * @package phpLDAPadmin
+- */
+-
+-/**
+- * Represents an attribute of a template.
+- *
+- * @package phpLDAPadmin
+- * @subpackage Templates
+- */
+-class Attribute {
+- # Attribute Name
+- public $name;
+- # Source of this attribute definition
+- protected $source;
+-
+- # Current and Old Values
+- protected $oldvalues = array();
+- protected $values = array();
+-
+- # MIN/MAX number of values
+- protected $min_value_count = -1;
+- protected $max_value_count = -1;
+-
+- # Is the attribute internal
+- protected $internal = false;
+- # Has the attribute been modified
+- protected $modified = false;
+- # Is the attribute being deleted because of an object class removal
+- protected $forcedelete = false;
+- # Is the attribute visible
+- protected $visible = false;
+- protected $forcehide = false;
+- # Is the attribute modifiable
+- protected $readonly = false;
+- # LDAP attribute type MUST/MAY
+- protected $ldaptype = null;
+- # Attribute property type (eg password, select, multiselect)
+- protected $type = '';
+- # Attribute value to keep unique
+- protected $unique = false;
+-
+- # Display parameters
+- protected $display = '';
+- protected $icon = '';
+- protected $hint = '';
+- # Helper details
+- protected $helper = array();
+- protected $helpervalue = array();
+- # Onchange details
+- protected $onchange = array();
+- # Show spacer after this attribute is rendered
+- protected $spacer = false;
+- protected $verify = false;
+-
+- # Component size
+- protected $size = 0;
+- # Value max length
+- protected $maxlength = 0;
+- # Text Area sizings
+- protected $cols = 0;
Home |
Main Index |
Thread Index |
Old Index