From nobody Fri Oct 27 06:35:32 2023 X-Original-To: dev-commits-ports-all@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 4SGtFw72hPz4xrkY; Fri, 27 Oct 2023 06:35:32 +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 4SGtFw6CJyz3M4v; Fri, 27 Oct 2023 06:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388532; 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=Sjb7qkw0R8TUEjZiHjZLj6iWCub8T9PnK+VhZBszbB0=; b=DxsmzWbCgPPZeziXq3fPjwvrsP53BBf/Qw6x322bt7qfdKFvTqfr7dk1hc9S5g362qNKkj QkeWND10M3hpQ7Sd1KGSusZPHY6v4s+fz1GwqwSaGJnVVG+8MYh/ZyXWD6XRH3fLqeianN SNL5yMhSiV+0Y8Bgo40jjBWWgGXKrwNG4KTnn4Oy7/C4is3kgt7mHudmsZVyWyIxgvdzbP 4MkthDaxpwxkWDkAIwj5JQOmiuDRIR4giuRMtWbz7hr9KrVEjgiKI1XWzzxUO+DYCRLqkL KU0K0OkXndvmT298yx+klA++Vz56PDAcb2OP/Yt5RBFU/l0IszbQ4q/69BTUEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388532; 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=Sjb7qkw0R8TUEjZiHjZLj6iWCub8T9PnK+VhZBszbB0=; b=mCHpTT4HO13oo+CyQNIy4D6Y+D02Yl7HYTOooDUgWqhPeQFBgLAOg5UK+B5vJr5IVabxwc V8ITfYTWpnRDCLvf6Am5L6mmep60pacfpy3/9N880qrDhcGAiX+EAdVKrxZXnpMnAjSN/P HC6lC0dJm/13UlOC3OjhnXIAa/HGLmzt1SP4/YFOjpWx/eBQxKX3Bi2gZmNIFLivWotkw2 w393CNPzVWvHBuXmKxX/NLys8DIBZm+ChZhIRDiB8hJr5xkm9+mo3V/4LPN2L4lREwwSYu P8OeFyvsrbAUgnhhkudJqmllL8OcofW8wAZhjciSfYyn63RTEAUqpYYnzhx4lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388532; a=rsa-sha256; cv=none; b=nrPFd04TlNyaC8b4pTUnlu/DL0msIL/qWjdv6KK5/IDx3Fh0OmEwg/5C4G49Vg4fE7KIMG mR13bYYA8f9NjUb43QiHu7/p1aPAcNPsiFalldLvoodGBFbq1sYnubYBLNgbRPnQIokBgw +QXKkzsHeLSlOMdPVSbIY8QBL2ilrHNfbcv6Cb16iGqQ76YHt67O0mtvwmHt6IavesMYv0 Ym4e5EkLpuvLIAoka017lwPa/dXldFb1xdf06X5l3iCdGz7TFhyGUDxubHUCxFWX3aKrmT 4xfW+g8A0Nvna3aQRe/GEjgZe/H9I2TJgTGeTZZp7ocObTH2878tP/3kUZl/og== 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 4SGtFw5JT2z1319; Fri, 27 Oct 2023 06:35:32 +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 39R6ZWjd090845; Fri, 27 Oct 2023 06:35:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6ZWhR090842; Fri, 27 Oct 2023 06:35:32 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:35:32 GMT Message-Id: <202310270635.39R6ZWhR090842@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 53cf53124414 - 2023Q4 - net/phpldapadmin: patch for php82 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 53cf531244148545d848585be6206d4540baee0c Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=53cf531244148545d848585be6206d4540baee0c commit 53cf531244148545d848585be6206d4540baee0c Author: Krzysztof AuthorDate: 2023-10-24 02:43:43 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:35:09 +0000 net/phpldapadmin: patch for php82 PR: 274674 MFH: 2023Q4 (cherry picked from commit 7e34c31b8b72c161e2494f8648d9c11f18c90684) --- net/phpldapadmin/Makefile | 1 + net/phpldapadmin/files/patch-lib_Template.php | 11 +++++++++++ net/phpldapadmin/files/patch-lib_TemplateRender.php | 12 ++++++++++++ net/phpldapadmin/files/patch-lib_page.php | 13 +++++++++++++ net/phpldapadmin/files/patch-lib_schema__functions.php | 11 +++++++++++ 5 files changed, 48 insertions(+) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 046e144d3cae..2366c585a308 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,5 +1,6 @@ PORTNAME= phpldapadmin DISTVERSION= 1.2.6.6 +PORTREVISION= 1 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net/phpldapadmin/files/patch-lib_Template.php b/net/phpldapadmin/files/patch-lib_Template.php new file mode 100644 index 000000000000..a1ff62c55dfc --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_Template.php @@ -0,0 +1,11 @@ +--- lib/Template.php.orig 2023-04-01 13:46:16 UTC ++++ lib/Template.php +@@ -56,6 +56,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_TemplateRender.php b/net/phpldapadmin/files/patch-lib_TemplateRender.php new file mode 100644 index 000000000000..c9de2eb362cd --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_TemplateRender.php @@ -0,0 +1,12 @@ +--- lib/TemplateRender.php.orig 2023-04-01 13:46:16 UTC ++++ lib/TemplateRender.php +@@ -16,6 +16,9 @@ class TemplateRender extends PageRender { + # Page number + private $pagelast; + ++ private $url_base; ++ private $layout; ++ + /** CORE FUNCTIONS **/ + + /** diff --git a/net/phpldapadmin/files/patch-lib_page.php b/net/phpldapadmin/files/patch-lib_page.php new file mode 100644 index 000000000000..f07b9c9021a0 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_page.php @@ -0,0 +1,13 @@ +--- lib/page.php.orig 2023-04-01 13:46:16 UTC ++++ lib/page.php +@@ -25,6 +25,10 @@ class page { + # Default values array. + protected $_default; + ++ private $index; ++ private $sysmsg; ++ private $_block; ++ + public function __construct($index=null) { + if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) + debug_log('Entered (%%)',129,0,__FILE__,__LINE__,__METHOD__,$fargs); diff --git a/net/phpldapadmin/files/patch-lib_schema__functions.php b/net/phpldapadmin/files/patch-lib_schema__functions.php new file mode 100644 index 000000000000..e3b7575c233b --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_schema__functions.php @@ -0,0 +1,11 @@ +--- lib/schema_functions.php.orig 2023-04-01 13:46:16 UTC ++++ lib/schema_functions.php +@@ -734,6 +734,8 @@ class AttributeType extends SchemaItem { + # This attribute has been forced a MAY attribute by the configuration. + private $forced_as_may = false; + ++ private $is_obsolete; ++ + /** + * Creates a new AttributeType object from a raw LDAP AttributeType string. + */