diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 4b1908c6346b..8c3aab1a5506 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,63 +1,62 @@ PORTNAME= phpldapadmin -DISTVERSION= 1.2.6.6 -PORTREVISION= 2 +DISTVERSION= 1.2.6.7 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= ports@bsdserwis.com COMMENT= PHP application to administer LDAP over the web WWW= https://github.com/leenooks/phpLDAPadmin/wiki LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe php:web,flavors tar:tgz CPE_VENDOR= phpldapadmin_project USE_GITHUB= yes GH_ACCOUNT= leenooks GH_PROJECT= phpLDAPadmin USE_PHP= gettext iconv ldap session xml NO_ARCH= yes NO_BUILD= yes OPTIONS_DEFINE= MCRYPT MCRYPT_DESC= Use pecl-mcrypt for password hashing MCRYPT_USE= PHP=mcrypt .include GROUPS?= ${WWWGRP} CFGDIR= config CFGFILE= config.php PLIST= ${WRKDIR}/plist PLIST_FILES= '@sample(,${GROUPS},640) ${WWWDIR_REL}/config/config.php.example ${WWWDIR_REL}/config/config.php' SUB_LIST+= PKGNAME=${PKGNAME} SUB_FILES+= pkg-message .SILENT: .include post-patch: cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ ! -name .gitignore ! -name *.orig | ${SORT} \ | ${SED} -e "s!^\.!${WWWDIR_REL}!" >${PLIST} ; do-install: cd ${WRKSRC} ; \ for src in $$( ${FIND} . ! -name .cvsignore \ ! -name .gitignore ! -name *.orig) ; do \ dst=${STAGEDIR}${WWWDIR}$${src#.} ; \ if ${TEST} -d $$src ; then \ ${MKDIR} $$dst ; \ else \ ${INSTALL_DATA} $$src $$dst ; \ fi \ done .include diff --git a/net/phpldapadmin/distinfo b/net/phpldapadmin/distinfo index 68ac35333cef..7a945c89228f 100644 --- a/net/phpldapadmin/distinfo +++ b/net/phpldapadmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688152341 -SHA256 (leenooks-phpLDAPadmin-1.2.6.6_GH0.tar.gz) = 7a8c02a611e60aa6713d1cf863dfac9637e23c3f4d401ea5e47dbe2b22d4895a -SIZE (leenooks-phpLDAPadmin-1.2.6.6_GH0.tar.gz) = 1132820 +TIMESTAMP = 1705354612 +SHA256 (leenooks-phpLDAPadmin-1.2.6.7_GH0.tar.gz) = dde104aca695e18b0615859ae96177cdcb8a3294aee8d1d47a0b828af939679d +SIZE (leenooks-phpLDAPadmin-1.2.6.7_GH0.tar.gz) = 1133418 diff --git a/net/phpldapadmin/files/patch-lib_Template.php b/net/phpldapadmin/files/patch-lib_Template.php index a1ff62c55dfc..0385f10aa2a3 100644 --- a/net/phpldapadmin/files/patch-lib_Template.php +++ b/net/phpldapadmin/files/patch-lib_Template.php @@ -1,11 +1,11 @@ ---- lib/Template.php.orig 2023-04-01 13:46:16 UTC +--- lib/Template.php.orig 2024-01-10 22:23:54 UTC +++ lib/Template.php -@@ -56,6 +56,8 @@ class Template extends xmlTemplate { +@@ -58,6 +58,8 @@ class Template extends xmlTemplate { # Template RDN attributes private $rdn; + private $askcontainer; + public function __construct($server_id,$name='',$filename=null,$type=null,$id=null) { parent::__construct($server_id,$name,$filename,$type,$id); diff --git a/net/phpldapadmin/files/patch-lib_ds__ldap.php b/net/phpldapadmin/files/patch-lib_ds__ldap.php deleted file mode 100644 index 41dfc700729a..000000000000 --- a/net/phpldapadmin/files/patch-lib_ds__ldap.php +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ds_ldap.php.orig 2023-04-01 13:46:16 UTC -+++ lib/ds_ldap.php -@@ -991,7 +991,7 @@ class ldap extends DS { - $return = $dn; - - foreach ($this->getBaseDN() as $base) { -- if (preg_match("/${base}$/i",$dn)) { -+ if (preg_match("/{$base}$/i",$dn)) { - $return = $base; - break; - } diff --git a/net/phpldapadmin/files/patch-lib_import__functions.php b/net/phpldapadmin/files/patch-lib_import__functions.php index af887114593e..2ff2d7bd82a5 100644 --- a/net/phpldapadmin/files/patch-lib_import__functions.php +++ b/net/phpldapadmin/files/patch-lib_import__functions.php @@ -1,79 +1,70 @@ ---- lib/import_functions.php.orig 2023-04-01 13:46:16 UTC +--- lib/import_functions.php.orig 2024-01-10 22:23:54 UTC +++ lib/import_functions.php -@@ -255,7 +255,7 @@ class ImportLDIF extends Import { +@@ -257,7 +257,7 @@ class ImportLDIF extends Import { if (substr($value,0,1) == ':') $value = base64_decode(trim(substr($value,1))); else - $value = trim($value); + $value = trim((string) $value); return array($attr,$value); } -@@ -271,7 +271,7 @@ class ImportLDIF extends Import { +@@ -273,7 +273,7 @@ class ImportLDIF extends Import { if ($this->hasMoreEntries() && ! $this->eof()) { # The first line is the DN one - $current[0]= trim($this->_currentLine); + $current[0]= trim((string) $this->_currentLine); # While we end on a blank line, fetch the attribute lines $count = 0; -@@ -282,11 +282,11 @@ class ImportLDIF extends Import { +@@ -284,11 +284,11 @@ class ImportLDIF extends Import { /* If the next line begin with a space, we append it to the current row * else we push it into the array (unwrap)*/ if ($this->isWrappedLine()) - $current[$count] .= trim($this->_currentLine); + $current[$count] .= trim((string) $this->_currentLine); elseif ($this->isCommentLine()) {} # Do nothing elseif (! $this->isBlankLine()) - $current[++$count] = trim($this->_currentLine); + $current[++$count] = trim((string) $this->_currentLine); else $endEntryFound = true; } -@@ -336,7 +336,7 @@ class ImportLDIF extends Import { +@@ -338,7 +338,7 @@ class ImportLDIF extends Import { * @return boolean true if it's a comment line,false otherwise */ private function isCommentLine() { - return substr(trim($this->_currentLine),0,1) == '#' ? true : false; + return substr(trim((string) $this->_currentLine),0,1) == '#' ? true : false; } /** -@@ -354,7 +354,7 @@ class ImportLDIF extends Import { +@@ -356,7 +356,7 @@ class ImportLDIF extends Import { * @return boolean if it is a blank line,false otherwise. */ private function isBlankLine() { - return(trim($this->_currentLine) == '') ? true : false; + return(trim((string) $this->_currentLine) == '') ? true : false; } /** -@@ -386,7 +386,7 @@ class ImportLDIF extends Import { +@@ -388,7 +388,7 @@ class ImportLDIF extends Import { $url = trim(substr($value,1)); if (preg_match('^file://',$url)) { - $filename = substr(trim($url),7); + $filename = substr(trim((string) $url),7); if ($fh = @fopen($filename,'rb')) { if (! $return = @fread($fh,filesize($filename))) -@@ -480,7 +480,7 @@ class ImportLDIF extends Import { +@@ -482,7 +482,7 @@ class ImportLDIF extends Import { # Fetch the attribute for the following line $currentLine = array_shift($lines); - while ($processline && trim($currentLine) && (trim($currentLine) != '-')) { + while ($processline && trim((string) $currentLine) && (trim((string) $currentLine) != '-')) { $processline = false; # If there is a valid line -@@ -541,7 +541,7 @@ class ImportLDIF extends Import { - array_merge(array($currentLine),$lines)); - - $currentLine = array_shift($lines); -- if (trim($currentLine)) -+ if (trim((string) $currentLine)) - $processline = true; - } - diff --git a/net/phpldapadmin/files/patch-lib_xmlTemplates.php b/net/phpldapadmin/files/patch-lib_xmlTemplates.php deleted file mode 100644 index 26ee3c3f4215..000000000000 --- a/net/phpldapadmin/files/patch-lib_xmlTemplates.php +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/xmlTemplates.php.orig 2023-04-01 13:46:16 UTC -+++ lib/xmlTemplates.php -@@ -122,7 +122,7 @@ abstract class xmlTemplates { - - # Ignore any files that are not the predefined custom files. - if ($_SESSION[APPCONFIG]->getValue('appearance','custom_templates_only') -- && ! preg_match("/^${custom_prefix}/",$file)) -+ && ! preg_match("/^{$custom_prefix}/",$file)) - continue; - - $filename = sprintf('%s/%s',$dir,$file);