From nobody Sat Jun 13 00:54:27 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 4gcdFH3x8Hz6hRvr for ; Sat, 13 Jun 2026 00:54:27 +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 4gcdFH2k6cz3k9W for ; Sat, 13 Jun 2026 00:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312067; 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=cMCVZ8mfd6YWsT2j/n+xUKoDhUL8FE43Pfij4FSOXVM=; b=lY6fmm8cH4EVTbtGYSZZT9ehbUDdAhKZi++fhR3SnA3r5benSNYtqJk/8q+5pFO9cv+0J/ DYaifuHyESmNRJhd3NR+avy9YPKROFZmrThlXaQn64kHf0ze6bgV/Wv9KjYWZh4cwEArx6 BMZoi7P8E4dK/JLt/BSKN6L1Sj+Opt3eRhJPnP1UJ7dK/l6aDYSPHvsMFmma0M+Qwp6k1j R37ap1PP/PGBiF8tcN/v00jVyQlpD0qF4SRCtwjhjTySEkFw78yoNUGrG9oXVWIx1cr5pl XMS8oc6kvWLlVnvRfLTUZlXx2RIzepwjBUXHP+WOyP1e8TaFCtvg1toJzECk/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312067; a=rsa-sha256; cv=none; b=ZBRmAgpYqTf0QBrY2XJwb84wT2Q3HfmSQTFSLQzYqSXyJpZmRKlbzhqFDeZhbuTUlkhZrM OadWOjAYpzha677+PKqD9sFponD92Lev8Tj3RKKaguyFlVUeagYho9/t0wRjZ4uFZZ15iu YMlbUAc4p//Bd7gqnpvFL7vA+1OqtH5DTUXN4DTQ+xrn261t+z3cjIoN4cmaMydULCQW0s ULKaL3xQd+eSgquOgSMfqOPRIJIPx2945usBQklK1QuhKDdzQrq2XPvtfrOI8S2GptPFal dKVSJ9/x9PRRjbecEcAI8SeTUfdAiWlJHxCb/IZqUckqOqRwDUFKKyCdYEKmiA== 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=1781312067; 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=cMCVZ8mfd6YWsT2j/n+xUKoDhUL8FE43Pfij4FSOXVM=; b=TfuDq+0/nGoY2f9d3qJmIgI4SgBGEmDXrAO5rFm23Y/LR31jgZ7iSg7+Jdunhl46LjFANt gxCXkafjOcJ4/cvmaCVSjntPBe3Hao6CC8LYNnU9HCgWRKxSoLc19fWqcIPWTP3CoMFFe9 WDIrh/o6aAyzo/URoxrOFknUpVZLsBSl6znCCHmGRxKDvTy2r1GHxzNMO00snPeqXUHOaD 8d/V8Deu8RKjUOBrw1jiA1iPU3Ucf77ckq4MP7TdtynGVq52xRyOmE4k9CRz8+7YH75hVa mMFSR++c00Aoo0/BlNbztwBqk8aeH6FmXC/wr9ka8CrqTne42EJbe4632kbEyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdFH1zBqz11dT for ; Sat, 13 Jun 2026 00:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20501 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 00:54:27 +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: e2ffecea5bd4 - 2026Q2 - net/phpldapadmin: Add support for php85 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: e2ffecea5bd4d510508bbb77349822e5934f2143 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 00:54:27 +0000 Message-Id: <6a2caa43.20501.4b35b1b6@gitrepo.freebsd.org> The branch 2026Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2ffecea5bd4d510508bbb77349822e5934f2143 commit e2ffecea5bd4d510508bbb77349822e5934f2143 Author: Krzysztof AuthorDate: 2026-06-13 00:47:47 +0000 Commit: Vladimir Druzenko CommitDate: 2026-06-13 00:54:16 +0000 net/phpldapadmin: Add support for php85 PR: 295877 Sponsored by: UNIS Labs (cherry picked from commit 90ebf10b5ad1e4d4efd72a8baee270c6a2737b08) --- net/phpldapadmin/Makefile | 2 +- net/phpldapadmin/files/patch-lib_PLAAttribute.php | 12 +++++++++ net/phpldapadmin/files/patch-lib_functions.php | 22 ++++++++++++++++ net/phpldapadmin/files/patch-lib_xml2array.php | 31 ++++++----------------- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index cfaec82d2de4..193207175f49 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpldapadmin DISTVERSION= 1.2.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net/phpldapadmin/files/patch-lib_PLAAttribute.php b/net/phpldapadmin/files/patch-lib_PLAAttribute.php new file mode 100644 index 000000000000..cbbe5f5638a3 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_PLAAttribute.php @@ -0,0 +1,12 @@ +--- lib/PLAAttribute.php.orig 2024-01-10 22:23:54 UTC ++++ lib/PLAAttribute.php +@@ -78,6 +78,9 @@ class PLAAttribute { + protected $autovalue = array(); + protected $postvalue = array(); + ++ # php85 ++ public $js = array(); ++ + public function __construct($name,$values,$server_id,$source=null) { + if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) + debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs); diff --git a/net/phpldapadmin/files/patch-lib_functions.php b/net/phpldapadmin/files/patch-lib_functions.php new file mode 100644 index 000000000000..397140f9c764 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_functions.php @@ -0,0 +1,22 @@ +--- lib/functions.php.orig 2024-01-10 22:23:54 UTC ++++ lib/functions.php +@@ -359,7 +359,7 @@ function memory_str_to_int($value) { + $value = trim(strtolower($value)); + if (intval($value) > 0 && preg_match('/^(\d+)([kmg])?$/', $value, $match, PREG_UNMATCHED_AS_NULL)) { + [$int, $mod] = [intval($match[1]), $match[2]]; +- $pow = [NULL => 0, 'k' => 1, 'm' => 2, 'g' => 3][$mod]; ++ $pow = ["" => 0, 'k' => 1, 'm' => 2, 'g' => 3][$mod]; + return $int * 1024 ** $pow; + } + return intval($value); +@@ -2844,8 +2844,8 @@ function utime() { + */ + function utime() { + $time = explode(' ',microtime()); +- $usec = (double)$time[0]; +- $sec = (double)$time[1]; ++ $usec = (float)$time[0]; ++ $sec = (float)$time[1]; + return $sec + $usec; + } + diff --git a/net/phpldapadmin/files/patch-lib_xml2array.php b/net/phpldapadmin/files/patch-lib_xml2array.php index c83ee9cd53c3..d01bf051423e 100644 --- a/net/phpldapadmin/files/patch-lib_xml2array.php +++ b/net/phpldapadmin/files/patch-lib_xml2array.php @@ -1,26 +1,11 @@ ---- lib/xml2array.php.orig 2024-01-10 22:23:54 UTC +--- lib/xml2array.php.orig 2026-06-05 14:24:55 UTC +++ lib/xml2array.php -@@ -20,6 +20,7 @@ class xml2array { - var $arrOutput = array(); - var $resParser; - var $strXmlData; -+ // var $parser; +@@ -51,7 +51,7 @@ class xml2array { + xml_get_current_line_number($this->resParser), + $filename)); - 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); +- xml_parser_free($this->resParser); ++ // xml_parser_free($this->resParser); + $output = array(); + foreach ($this->arrOutput as $key => $values)