From nobody Sun Feb 11 11:50:06 2024 X-Original-To: dev-commits-ports-main@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 4TXm9W4Hssz59Z53; Sun, 11 Feb 2024 11:50:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXm9V6yfJz4691; Sun, 11 Feb 2024 11:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707652207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPOqTNww9KAoAY4I2eNI8nKWwHJVbW9xjcuP3M7Z2CI=; b=O/h5/ATrLyz4RB09vZzM6CDZkO3DD+XDUes7AqOXT6It5Mk98j4EZ73tdcEqUbc56uNDmv ecU2pmE4HPTnHIs/Cf8h1pGk+/LUq4eG/Zy5WiBO8hiKZ8wqo2DVs2sHwepxBLod6lx/Cf DkpWbQpzPx9GdxXN7mxq005q/MWQ3SICCPSHRbtpmRL3HJ3pzaXOim3tiJcBIIUpw0qNou t1NjTtpcnBfRlJdFIzoem1JIIoITB6D+WRXOt7hENfsruhbXue5MCuN7PIqyz20YQocym9 Z8iUBqvi2OugEGmBZjs7pADIspiB2ro8/59FzKEhC83aqeJlASLmVd8DbBWu2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707652207; a=rsa-sha256; cv=none; b=Eewxda/Zj3Nr2J97upsetECotffMgsXcYknl2SpeylEHjrZXPPiXYVCfpEdccDwGq7JpyJ UzrURZo045N7+kbidvR5/csktQVvNcq3rYAH6eeqwg6FYQYdR6rlRxwjcxRwgJPcCXpzpI BUUE5ipOF56PaKqOWnwEYx2OzXwH85ungihBrZLjTTn+3x7cKpV8gW0rA+R8seixyO+fty eD9FJWQZ6KLxAQ2ryzPoGzbrHS0PCOVK592Vt8jAbDfOSpX9wt8PWNXhL+sQRq2a9+oHla Cs8Xz2ATSKxQPBum/T+SVv6sNKkEwC0fRJnwtjKzN2slj7vnUULI4X8S8eIFFg== 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=1707652207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPOqTNww9KAoAY4I2eNI8nKWwHJVbW9xjcuP3M7Z2CI=; b=GkkdqkAqoXnMN22HsMxevQDdIYEJzrFnlBX58Pa5jWk+baaeXKlyOjTaAt528t6c90m76B fFdNslK9YFU4Br57UkKgX10sEjM3oTlqLgZzs5n29x3rq4If8tL1fFsrsg5H6KtvnO8ByU TDpRzaEOm5RN1zbekLKYfXYuF6w/n4wU+TsZBtNduAhA6eNzbAKNFoqnZq7VGrfZ7/5pwq w4henad0tATXX1g4NhtDWlIyYVh8XQwBcPT5v84Pwh0si0s4MHliFpTS4dDXE6JoaFUL2Q QtcKOwGw29pzfU6Q39puWh35wqrwYMjHxU7u7tN16NgpbA8/D+8OG3IA/oooQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXm9V64Hrzy8B; Sun, 11 Feb 2024 11:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41BBo6JF089227; Sun, 11 Feb 2024 11:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BBo6vp089223; Sun, 11 Feb 2024 11:50:06 GMT (envelope-from git) Date: Sun, 11 Feb 2024 11:50:06 GMT Message-Id: <202402111150.41BBo6vp089223@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 184f0f76288a - main - net/phpldapadmin: update to 1.2.6.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 184f0f76288ae376b687861bcd07984f65519d90 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=184f0f76288ae376b687861bcd07984f65519d90 commit 184f0f76288ae376b687861bcd07984f65519d90 Author: Piotr Kubaj AuthorDate: 2024-02-09 23:55:26 +0000 Commit: Piotr Kubaj CommitDate: 2024-02-11 11:49:04 +0000 net/phpldapadmin: update to 1.2.6.7 PR: 276372 Submitted by: Krzysztof (ports@bsdserwis.com) Approved by: Krzysztof (ports@bsdserwis.com) --- net/phpldapadmin/Makefile | 3 +-- net/phpldapadmin/distinfo | 6 +++--- net/phpldapadmin/files/patch-lib_Template.php | 4 ++-- net/phpldapadmin/files/patch-lib_ds__ldap.php | 11 ---------- .../files/patch-lib_import__functions.php | 25 +++++++--------------- net/phpldapadmin/files/patch-lib_xmlTemplates.php | 11 ---------- 6 files changed, 14 insertions(+), 46 deletions(-) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 4b1908c6346b..8c3aab1a5506 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,6 +1,5 @@ PORTNAME= phpldapadmin -DISTVERSION= 1.2.6.6 -PORTREVISION= 2 +DISTVERSION= 1.2.6.7 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} 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,6 +1,6 @@ ---- 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; 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,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ 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 @@ -18,7 +18,7 @@ # 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()) @@ -32,7 +32,7 @@ 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() { @@ -41,7 +41,7 @@ } /** -@@ -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() { @@ -50,7 +50,7 @@ } /** -@@ -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)) { @@ -59,7 +59,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); @@ -68,12 +68,3 @@ $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);