diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2010-08-13 14:23:47 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-08-13 14:23:47 +0000 |
commit | 7a1ca5ae83cebdd4cd716f9b29b71ca534ae07ee (patch) | |
tree | 15148427415f8e34ee6b818077d7bd14659128eb /sysutils | |
parent | - Fix installation and plist for non-default SAMPLE_BL=off option (diff) |
- Update to 3.1.0
PR: ports/148647
Submitted by: Vasiliy P. Melnik <basil@vpm.net.ua> (maintainer)
Notes
Notes:
svn path=/head/; revision=259178
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/ldap-account-manager/Makefile | 3 | ||||
-rw-r--r-- | sysutils/ldap-account-manager/distinfo | 6 | ||||
-rw-r--r-- | sysutils/ldap-account-manager/files/patch-account.inc | 34 | ||||
-rw-r--r-- | sysutils/ldap-account-manager/pkg-plist | 60 |
4 files changed, 62 insertions, 41 deletions
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile index 285f5e61c1e9..e56520f58bef 100644 --- a/sysutils/ldap-account-manager/Makefile +++ b/sysutils/ldap-account-manager/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ldap-account-manager -PORTVERSION= 3.0.0 -PORTREVISION= 2 +PORTVERSION= 3.1.0 CATEGORIES= sysutils www MASTER_SITES= SF/${PNAME}/LAM/${PORTVERSION} DISTNAME= ${PORTNAME:L}-${PORTVERSION} diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo index d1f25d2c1b87..c4b30085e4d6 100644 --- a/sysutils/ldap-account-manager/distinfo +++ b/sysutils/ldap-account-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (ldap-account-manager-3.0.0.tar.gz) = e67ffe187bd02f1ddb3ad6d2e441c61b -SHA256 (ldap-account-manager-3.0.0.tar.gz) = 962451d2c1074e44aa96ccc41c87ddb0eb2fbcba3e3e1d08f3120aaa3af296d7 -SIZE (ldap-account-manager-3.0.0.tar.gz) = 4790505 +MD5 (ldap-account-manager-3.1.0.tar.gz) = f97d14f20f4773e087977515ced54b45 +SHA256 (ldap-account-manager-3.1.0.tar.gz) = 0899bcc56abd2e1a0ce2c92ba14bde3a94440e45920dba46a918ce20ec1e2377 +SIZE (ldap-account-manager-3.1.0.tar.gz) = 5528597 diff --git a/sysutils/ldap-account-manager/files/patch-account.inc b/sysutils/ldap-account-manager/files/patch-account.inc deleted file mode 100644 index d5fd085a6841..000000000000 --- a/sysutils/ldap-account-manager/files/patch-account.inc +++ /dev/null @@ -1,34 +0,0 @@ ---- lib/account.inc.orig 2010-03-24 15:22:38.000000000 -0300 -+++ lib/account.inc 2010-05-31 16:30:07.000000000 -0300 -@@ -39,10 +39,10 @@ - * @return array list of shell names - */ - function getshells() { -- if (!isset($_SESSION['lampath'])) return array(); -+ $shellPath = dirname(__FILE__) . '/../config/shells'; - // Load shells from file -- if (file_exists($_SESSION['lampath'] . 'config/shells')) { -- $shells = file($_SESSION['lampath'] . 'config/shells'); -+ if (file_exists($shellPath)) { -+ $shells = file($shellPath); - $i = 0; - while (count($shells) > $i) { - // remove whitespaces -@@ -386,6 +386,9 @@ - case 'hostname': - $pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u'; - break; -+ case 'hostObject': -+ $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; -+ break; - case 'usernameList': // comma separated list of user names - case 'groupnameList': // comma separated list of group names - $pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u'; -@@ -467,6 +470,7 @@ - break; - case 'domainSID': // Samba domain SID - $pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/"; -+ break; - case 'ip': // IP address - $pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/'; - break; diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist index 92f549fe2212..e867d955a250 100644 --- a/sysutils/ldap-account-manager/pkg-plist +++ b/sysutils/ldap-account-manager/pkg-plist @@ -134,10 +134,27 @@ %%WWWDIR%%/help/help.inc %%WWWDIR%%/help/.htaccess %%WWWDIR%%/index.html +%%WWWDIR%%/lib/html.inc +%%WWWDIR%%/lib/modules/asteriskVoicemail.inc +%%WWWDIR%%/lib/modules/hostObject.inc +%%WWWDIR%%/lib/3rdParty/phpseclib/PHP/Compat/Function/str_split.php +%%WWWDIR%%/lib/3rdParty/phpseclib/PHP/Compat/Function/bcpowmod.php +%%WWWDIR%%/lib/3rdParty/phpseclib/PHP/Compat/Function/array_fill.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Net/SSH1.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Net/SSH2.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Net/SFTP.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Math/BigInteger.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/RSA.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/Hash.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/TripleDES.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/AES.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/RC4.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/DES.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/Random.php +%%WWWDIR%%/lib/3rdParty/phpseclib/Crypt/Rijndael.php %%WWWDIR%%/lib/.htaccess %%WWWDIR%%/lib/tools.inc %%WWWDIR%%/lib/account.inc -%%WWWDIR%%/lib/account.inc.orig %%WWWDIR%%/lib/baseModule.inc %%WWWDIR%%/lib/baseType.inc %%WWWDIR%%/lib/cache.inc @@ -255,6 +272,37 @@ %%WWWDIR%%/style/type_netgroup.css %%WWWDIR%%/style/type_smbDomain.css %%WWWDIR%%/style/type_user.css +%%WWWDIR%%/style/jquery.ui.autocomplete.css +%%WWWDIR%%/style/jquery.ui.datepicker.css +%%WWWDIR%%/style/jquery.ui.accordion.css +%%WWWDIR%%/style/jquery.ui.dialog.css +%%WWWDIR%%/style/jquery.ui.base.css +%%WWWDIR%%/style/jquery-ui-1.8.2.custom.css +%%WWWDIR%%/style/jquery.ui.slider.css +%%WWWDIR%%/style/jquery.ui.button.css +%%WWWDIR%%/style/jquery.ui.selectable.css +%%WWWDIR%%/style/jquery.ui.theme.css +%%WWWDIR%%/style/jquery.ui.resizable.css +%%WWWDIR%%/style/images/ui-icons_888888_256x240.png +%%WWWDIR%%/style/images/ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/style/images/ui-bg_flat_75_ffffff_40x100.png +%%WWWDIR%%/style/images/ui-bg_glass_75_e6e6e6_1x400.png +%%WWWDIR%%/style/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/style/images/ui-icons_454545_256x240.png +%%WWWDIR%%/style/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/style/images/ui-icons_222222_256x240.png +%%WWWDIR%%/style/images/ui-anim_basic_16x16.gif +%%WWWDIR%%/style/images/ui-bg_glass_75_dadada_1x400.png +%%WWWDIR%%/style/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/style/images/ui-bg_highlight-soft_75_cccccc_1x100.png +%%WWWDIR%%/style/images/ui-bg_glass_65_ffffff_1x400.png +%%WWWDIR%%/style/images/ui-bg_glass_95_fef1ec_1x400.png +%%WWWDIR%%/style/jquery.ui.all.css +%%WWWDIR%%/style/jquery.ui.progressbar.css +%%WWWDIR%%/style/jquery.ui.core.css +%%WWWDIR%%/style/jquery.ui.tabs.css +%%WWWDIR%%/templates/lib/jquery-1.4.2.min.js +%%WWWDIR%%/templates/lib/jquery-ui-1.8.2.custom.min.js %%WWWDIR%%/templates/.htaccess %%WWWDIR%%/templates/account/edit.php %%WWWDIR%%/templates/config/conflogin.php @@ -271,7 +319,6 @@ %%WWWDIR%%/templates/help.php %%WWWDIR%%/templates/initsuff.php %%WWWDIR%%/templates/lib/config.js -%%WWWDIR%%/templates/lib/jquery-1.3.2.min.js %%WWWDIR%%/templates/lib/list.js %%WWWDIR%%/templates/lib/wz_tooltip.js %%WWWDIR%%/templates/lists/deletelink.php @@ -339,6 +386,7 @@ @dirrm %%WWWDIR%%/templates/config @dirrm %%WWWDIR%%/templates/account @dirrm %%WWWDIR%%/templates +@dirrm %%WWWDIR%%/style/images @dirrm %%WWWDIR%%/style @dirrm %%WWWDIR%%/sess @dirrm %%WWWDIR%%/locale/zh_TW/LC_MESSAGES @@ -375,6 +423,14 @@ @dirrm %%WWWDIR%%/lib/modules/sambaSamAccount @dirrm %%WWWDIR%%/lib/modules @dirrm %%WWWDIR%%/lib/font +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/Crypt +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/Math +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/Net +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/PHP/Compat/Function +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/PHP/Compat +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib/PHP +@dirrm %%WWWDIR%%/lib/3rdParty/phpseclib +@dirrm %%WWWDIR%%/lib/3rdParty @dirrm %%WWWDIR%%/lib @dirrm %%WWWDIR%%/help @dirrm %%WWWDIR%%/graphics |