From nobody Fri Oct 27 06:34:03 2023 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 4SGtDD3JtZz4xrS7; Fri, 27 Oct 2023 06:34:04 +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 4SGtDD05jxz3KbL; Fri, 27 Oct 2023 06:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388444; 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=m72k+9Y3PMBuW/9Lg+3rmuMDuPnC+br1uiMKNs5q19s=; b=i1yAroXVDAljqb4hxFgknKRiYBuSDLxHlBCf3FSw8ES3V1EhtZByOvEpY9C1MfJ18Q6RaM a26hQw0dNHHeWksyc8uqpfqmWHG1KTOLxBSh3TGB30Mia5BGL9ZZg8oD8AOjoUZ3T4qgoc v8sMKzJDKs/lGglF7ug4ZXXP6KMs3ETWvSvInqCYhECen6HNu717TbdLepxZDxGnyV+uni dzv5Paek97eKopxfFZhPiPu0tPrSJ6ubWTgCSsgrImcc+sycbT3qrus/b+OxOF+GxwO6LS Jfy7d6IOgdrDBSG5BKNAcqaYPlJAzgd+8caTSAMhE4v6Uv1r2gTkI6YP2R+yPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388444; 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=m72k+9Y3PMBuW/9Lg+3rmuMDuPnC+br1uiMKNs5q19s=; b=Io0zWpHqCFNmFTShwmx7cjwK35WM2JPTGhgFXy71Thz4TOYbTbZuvgD13KgfpPAbJMNKYj 465u017tNfrfV3jBZF6ebm07KPxFf4gmy/whLzcH9wwJg7wjgMpKbj+h6t/tN+ANUPQ171 40CNmctR9LEdqSUFE7Ft/6664V7pbzKVOq172pHI847HBjAZHTfDyDYkvISR20mYDheRUH J70vRqRuYSc5rS7Cmcek74E0zQej/ub1zzeoVFvipnfPEjvWcPaxAZcYUWJVoiUA3udkMS 9eeDlsB9Ehn3MpS5hLTvRZCcGSPnrrmNs2brlCbdBGJhpTU8KSm6O4NPCShf5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388444; a=rsa-sha256; cv=none; b=oWVu2tnbRbIPSPGUJHjjWo/fvKhlw8SRIPfzkUlh99x39FzhTR8eaSdxlf9vZiWQQCuwdM Zanhn63GsgCQMAovgkBCUJTPT+3ecwc3NLW5MkAjhLzZ9LN2FXa1TowGDkDoH+QXn32MHa s1Yk0hOxVl5mHSZunuBIhrTmbkW1dHhPYdzaweZHKhsk9i31x4L2JsTWuep0RfFQhbUlTO 786w+wGvjgf6RTJRoZtcBrfLbNRXQSGscFZReT4+f61i5WRzrtIZCxzmKBZjEIe/j+kM9D 9ReMkJWs87pa8LJbABV7uRnahWNZ4rCgiP+Kg8UHMBI93FZL163kWB48Zit2gA== 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 4SGtDC6KDvz13Sj; Fri, 27 Oct 2023 06:34:03 +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 39R6Y3p7089706; Fri, 27 Oct 2023 06:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6Y3no089703; Fri, 27 Oct 2023 06:34:03 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:34:03 GMT Message-Id: <202310270634.39R6Y3no089703@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 7e34c31b8b72 - main - net/phpldapadmin: patch for php82 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e34c31b8b72c161e2494f8648d9c11f18c90684 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e34c31b8b72c161e2494f8648d9c11f18c90684 commit 7e34c31b8b72c161e2494f8648d9c11f18c90684 Author: Krzysztof AuthorDate: 2023-10-24 02:43:43 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:32:57 +0000 net/phpldapadmin: patch for php82 PR: 274674 MFH: 2023Q4 --- 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. + */