From 7e34c31b8b72c161e2494f8648d9c11f18c90684 Mon Sep 17 00:00:00 2001 From: Krzysztof Date: Tue, 24 Oct 2023 04:43:43 +0200 Subject: [PATCH] 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 +++++++++++++ .../files/patch-lib_schema__functions.php | 11 +++++++++++ 5 files changed, 48 insertions(+) create mode 100644 net/phpldapadmin/files/patch-lib_Template.php create mode 100644 net/phpldapadmin/files/patch-lib_TemplateRender.php create mode 100644 net/phpldapadmin/files/patch-lib_page.php create mode 100644 net/phpldapadmin/files/patch-lib_schema__functions.php diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 046e144d3cae7..2366c585a3085 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 0000000000000..a1ff62c55dfcd --- /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 0000000000000..c9de2eb362cd2 --- /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 0000000000000..f07b9c9021a0c --- /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 0000000000000..e3b7575c233ba --- /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. + */