From nobody Sat Jun 13 00:54:26 2026 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gcdFM2zHjz6hS1G for ; Sat, 13 Jun 2026 00:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcdFM1vmtz3kkC for ; Sat, 13 Jun 2026 00:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNCZz85I6wbwlbkqEjKVqkuVFWC2UKKgDhbmyufl6C4=; b=OJtnDCtCZssOXpk1jiWjtAqsD0DmRL68ftHxGncsNdDmAYq4O2FzeQkKsrnakWG4lDbvGu JlAMIq/N9XFIgZX9kQMog7N2pQoEQ3AZRPyP7qLXJwuKa9REGb/6HQp55Q+ktxy+eiyHzH p4Ww2saV7EgI73bDuFgtIqQCXGe2zdI+eCgXwlCqHrtXIMQx48bBpgFB3I6qSFCi9l+MiO 6dRTs16lc0zwXxLRi7hu15sqSYm8gIS24iG17lAXaw4eHbONb8FSbk4YZKfmo+alOInZt+ OkKKArgyntZMMEsGoqmFIJDCJNBqV+IBUDOaur+EkTZzvWsr+K7/iixQRMCebw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312071; a=rsa-sha256; cv=none; b=D1PjC/U84CHFdGuz3u5YN7Z8z5x1fAfGv1ZMGSJl4EHH4Pwx6A/FSuQJpzKRpQFB4xQVcc 9oV1UwkNy4AW3qJhWQxUjfkPfHpa1UObufYL4UozBRrrKJ29IBZkDC0UatiHYwAW+berJR s6jTmYgWlPaTDBkVnXRhsxhS+xjMieMTkmpeYu8SLGdpS31rUrD0/X7KoJ/MXlSPClodlm JePFrsPGa0pTKrpyyxVCu2RWGdOtNi+PND5Whjt85uYdEh7dHKyHBd3Xx7isLE3ZoIMBXF 0F8nudX2zj7bwaPWO1xe0GDZ2GU961B0gs8EYHtA7YUraCf/P/eScwrDcR/48A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNCZz85I6wbwlbkqEjKVqkuVFWC2UKKgDhbmyufl6C4=; b=NeXmcM5X8iE6qMaK6zwHAQGv6MW3v0lw1iSw95qIkZU+7xIRcVR6EoyN2g8TwDw90S1AHg l+UIrILh/22j7MBqRFyiGkXP8ABqcimGrf4oKUWPmBE+3z1COSAEg8mPF7g9HKiOyYmE7V cdb28JU/+WzFoA+RkFmOQWTTpYnxDXr9LgZWyD2BkR8sT2tS20K81FWtM2Pcn+Fapd29EI WKQyveJzn1s15qiG1HjyX+7HmaFlBWBKZnj9ealK1GQh1G2wnhH1O/6Bke4J4wgH2/qOTg eMtNeMlZ+uDiOsJhf1VlGC0fBrqXpjWDsn9zVfnL5uWO0olXvJO7gPGNB1HIzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdFM1TfTz10nd for ; Sat, 13 Jun 2026 00:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ece6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 00:54:26 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Krzysztof From: Vladimir Druzenko Subject: git: 3792881b81c3 - 2026Q2 - net/phpldapadmin: add patches to support php84 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q2 X-Git-Reftype: branch X-Git-Commit: 3792881b81c32d8b94d0785d45f1c034e0752842 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 00:54:26 +0000 Message-Id: <6a2caa42.1ece6.11641de3@gitrepo.freebsd.org> The branch 2026Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3792881b81c32d8b94d0785d45f1c034e0752842 commit 3792881b81c32d8b94d0785d45f1c034e0752842 Author: Krzysztof AuthorDate: 2026-04-24 16:53:18 +0000 Commit: Vladimir Druzenko CommitDate: 2026-06-13 00:54:10 +0000 net/phpldapadmin: add patches to support php84 net/phpldapadmin (version 1) was written some years ago. The developer of PLA (https://github.com/leenooks/phpLDAPadmin) officially dropped support for PLA1, but PLA2 is still not full functional as PLA1. I've made small patches which enable support for php84 (changes of some builtin php functions, declarations of variables and so on). With these patches PLA1 (still) is working corectly. PR: 287238 Event: Wiesbaden Hackathon 202604 (cherry picked from commit d4a83eff40d6515ddb6fca3c1bbb780a9747be28) --- net/phpldapadmin/Makefile | 1 + net/phpldapadmin/files/patch-lib_Query.php | 17 +++++ .../files/patch-lib_import__functions.php | 77 +++------------------- net/phpldapadmin/files/patch-lib_xml2array.php | 26 ++++++++ 4 files changed, 53 insertions(+), 68 deletions(-) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 8c3aab1a5506..cfaec82d2de4 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,5 +1,6 @@ PORTNAME= phpldapadmin DISTVERSION= 1.2.6.7 +PORTREVISION= 1 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net/phpldapadmin/files/patch-lib_Query.php b/net/phpldapadmin/files/patch-lib_Query.php new file mode 100644 index 000000000000..83a842bf4901 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_Query.php @@ -0,0 +1,17 @@ +--- lib/Query.php.orig 2024-01-10 22:23:54 UTC ++++ lib/Query.php +@@ -15,6 +15,14 @@ class Query extends xmlTemplate { + class Query extends xmlTemplate { + protected $description = ''; + public $results = array(); ++ public $base = ""; ++ public $dn = ""; ++ public $filter = ""; ++ public $icon = ""; ++ public $resultsdata = array(); ++ public $scope = ""; ++ public $title = ""; ++ public $visible = ""; + + /** + * Main processing to store the template. diff --git a/net/phpldapadmin/files/patch-lib_import__functions.php b/net/phpldapadmin/files/patch-lib_import__functions.php index 2ff2d7bd82a5..1050a3d20069 100644 --- a/net/phpldapadmin/files/patch-lib_import__functions.php +++ b/net/phpldapadmin/files/patch-lib_import__functions.php @@ -1,70 +1,11 @@ ---- lib/import_functions.php.orig 2024-01-10 22:23:54 UTC +--- lib/import_functions.php.orig 2025-05-26 10:22:02 UTC +++ lib/import_functions.php -@@ -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); +@@ -147,6 +147,8 @@ class ImportLDIF extends Import { + class ImportLDIF extends Import { + private $_currentLineNumber = 0; + private $_currentLine = ''; ++ private $_currentDnLine = ''; ++ private $dnLineNumber = 0; + private $template; + public $error = array(); - return array($attr,$value); - } -@@ -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; -@@ -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; - } -@@ -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; - } - - /** -@@ -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; - } - - /** -@@ -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))) -@@ -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 diff --git a/net/phpldapadmin/files/patch-lib_xml2array.php b/net/phpldapadmin/files/patch-lib_xml2array.php new file mode 100644 index 000000000000..c83ee9cd53c3 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_xml2array.php @@ -0,0 +1,26 @@ +--- lib/xml2array.php.orig 2024-01-10 22:23:54 UTC ++++ lib/xml2array.php +@@ -20,6 +20,7 @@ class xml2array { + var $arrOutput = array(); + var $resParser; + var $strXmlData; ++ // var $parser; + + private function push_pos(&$pos) { + $this->stack[count($this->stack)] = &$pos; +@@ -33,10 +34,12 @@ class xml2array { + + public function parseXML($strInputXML,$filename) { + $this->resParser = xml_parser_create(); +- xml_set_object($this->resParser,$this); +- xml_set_element_handler($this->resParser,'tagOpen','tagClosed'); ++ // xml_set_object($this->resParser,$this); ++ // xml_set_element_handler($this->resParser,'tagOpen','tagClosed'); + +- xml_set_character_data_handler($this->resParser,'tagData'); ++ // xml_set_character_data_handler($this->resParser,'tagData'); ++ xml_set_element_handler($this->resParser, array( $this, 'tagOpen' ), array( $this, 'tagClosed' ) ); ++ xml_set_character_data_handler( $this->resParser, array( $this, 'tagData' )); + + $this->push_pos($this->arrOutput); +