diff options
Diffstat (limited to 'net/phpldapadmin')
| -rw-r--r-- | net/phpldapadmin/Makefile | 3 | ||||
| -rw-r--r-- | net/phpldapadmin/distinfo | 4 | ||||
| -rw-r--r-- | net/phpldapadmin/files/patch-lib__functions.php | 14 |
3 files changed, 3 insertions, 18 deletions
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 009de1ebff58..9e737d49614f 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= phpldapadmin -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} diff --git a/net/phpldapadmin/distinfo b/net/phpldapadmin/distinfo index b0d56411142c..df6959fd0ae6 100644 --- a/net/phpldapadmin/distinfo +++ b/net/phpldapadmin/distinfo @@ -1,2 +1,2 @@ -SHA256 (phpldapadmin-1.2.1.1.tgz) = 1fa6373c500a193a8868cb6a753f3b5218a92374b792994129c0c1b69d4d1090 -SIZE (phpldapadmin-1.2.1.1.tgz) = 1468961 +SHA256 (phpldapadmin-1.2.2.tgz) = 8629ea3f14630d4dd74099c997ac9795240a6417d5d124517ba5860c12d8a239 +SIZE (phpldapadmin-1.2.2.tgz) = 1415565 diff --git a/net/phpldapadmin/files/patch-lib__functions.php b/net/phpldapadmin/files/patch-lib__functions.php deleted file mode 100644 index 9d9009e28464..000000000000 --- a/net/phpldapadmin/files/patch-lib__functions.php +++ /dev/null @@ -1,14 +0,0 @@ ---- ./lib/functions.php.orig 2011-05-11 05:40:18.000000000 -0400 -+++ ./lib/functions.php 2011-10-24 09:00:11.000000000 -0400 -@@ -1003,8 +1003,9 @@ - if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); - -- # if the array to sort is null or empty -- if (! $data) return; -+ # if the array to sort is null or empty, or if we have some nasty chars -+ if (! preg_match('/^[a-zA-Z0-9_]+(\([a-zA-Z0-9_,]*\))?$/',$sortby) || ! $data) -+ return; - - static $CACHE = array(); - |