Bug 266678 - net/phpldapadmin: fix support for php81+
Summary: net/phpldapadmin: fix support for php81+
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Ronald Klop
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-09-28 13:50 UTC by Krzysztof
Modified: 2022-12-13 21:17 UTC (History)
1 user (show)

See Also:


Attachments
poudriere testport log (27.70 KB, text/plain)
2022-09-28 13:50 UTC, Krzysztof
no flags Details
patch: support php81+ (133.53 KB, patch)
2022-09-28 13:52 UTC, Krzysztof
ports: maintainer-approval+
Details | Diff
poudriere testport log (22.00 KB, text/plain)
2022-12-05 09:52 UTC, Krzysztof
no flags Details
Add missed modifications from previous patch (12.17 KB, patch)
2022-12-05 09:54 UTC, Krzysztof
ports: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Krzysztof 2022-09-28 13:50:44 UTC
Created attachment 236910 [details]
poudriere testport log

According to bug#264672 PLA does not work with php81+ I've made patches which fix support for php81+ (it was tested with php82 also and I received confirmation that pla is working correctly).

I'm attaching patch and poudriere testport log.
Comment 1 Krzysztof 2022-09-28 13:52:41 UTC
Created attachment 236911 [details]
patch: support php81+

patch was generated with "git diff --staged > /tmp/`make -VPKGNAME`.diff" thats why there is php74 in filename. But it is correct patch :-)
Comment 2 Krzysztof 2022-09-28 13:54:08 UTC
Bug#264672 should be closed first as very low importance.
Comment 3 Krzysztof 2022-10-15 17:32:18 UTC
Remove blocker: #264672
Comment 4 Krzysztof 2022-11-10 13:54:34 UTC
May I ask why this patch is no applied to ports tree yet? Did I do sth wrong with bug report?

Thanks a lot for any information.
Comment 5 Ronald Klop freebsd_committer freebsd_triage 2022-11-27 22:59:29 UTC
FYI https://reviews.freebsd.org/D37513
Comment 6 Krzysztof 2022-11-28 07:44:05 UTC
(In reply to Ronald Klop from comment #5)
Thank you very much for commit. So I'll close this bug...
Comment 7 Ronald Klop freebsd_committer freebsd_triage 2022-11-28 07:59:06 UTC
(In reply to Krzysztof from comment #6)
Please wait a little. The commit is still in review.
Comment 8 commit-hook freebsd_committer freebsd_triage 2022-12-01 09:55:39 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fee2b338d2af883ca4dd75a7d285f65b284fb73b

commit fee2b338d2af883ca4dd75a7d285f65b284fb73b
Author:     Krzysztof <ports@bsdserwis.com>
AuthorDate: 2022-11-27 20:17:33 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2022-12-01 09:53:34 +0000

    net/phpldapadmin: fix support for php81+

    PR:     266678
    Reported by:    Gerard Seibert
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D37513

 net/phpldapadmin/Makefile                          |   2 +-
 .../files/patch-htdocs_add__oclass__form.php (new) |  11 +
 .../files/patch-htdocs_add__value__form.php (new)  |  32 ++
 net/phpldapadmin/files/patch-htdocs_cmd.php (new)  |  11 +
 net/phpldapadmin/files/patch-htdocs_copy.php (new) |  11 +
 .../patch-htdocs_download__binary__attr.php (new)  |  11 +
 .../files/patch-htdocs_export__form.php (new)      |  11 +
 .../files/patch-htdocs_login.php (new)             |  11 +
 .../files/patch-htdocs_login__form.php (new)       |  16 +
 .../files/patch-htdocs_monitor.php (new)           |  29 ++
 .../files/patch-htdocs_purge__cache.php (new)      |  11 +
 .../files/patch-htdocs_schema.php (new)            | 165 ++++++++
 .../files/patch-htdocs_server__info.php (new)      |  20 +
 .../files/patch-htdocs_view__jpeg__photo.php (new) |  11 +
 .../files/patch-lib_AJAXTree.php (new)             |  47 +++
 net/phpldapadmin/files/patch-lib_Attribute.php     |  66 ++-
 .../files/patch-lib_AttributeFactory.php           |  51 ++-
 .../files/patch-lib_HTMLTree.php (new)             |  32 ++
 net/phpldapadmin/files/patch-lib_PageRender.php    | 135 +++++-
 net/phpldapadmin/files/patch-lib_Query.php (new)   |  68 +++
 .../files/patch-lib_QueryRender.php (new)          |  38 ++
 .../files/patch-lib_Template.php (new)             | 248 +++++++++++
 .../files/patch-lib_TemplateRender.php (new)       |  99 +++++
 net/phpldapadmin/files/patch-lib_Tree.php          |  23 +-
 .../files/patch-lib_TreeItem.php (new)             |  11 +
 net/phpldapadmin/files/patch-lib_common.php        |  23 +-
 net/phpldapadmin/files/patch-lib_ds.php (new)      |  29 ++
 net/phpldapadmin/files/patch-lib_ds__ldap.php      | 465 +++++++++++++++++++-
 net/phpldapadmin/files/patch-lib_ds__ldap__pla.php |  65 +--
 .../files/patch-lib_export__functions.php (new)    |  46 ++
 net/phpldapadmin/files/patch-lib_functions.php     | 469 ++++++++++++++++++++-
 .../files/patch-lib_import__functions.php (new)    | 104 +++++
 net/phpldapadmin/files/patch-lib_page.php (new)    |  29 ++
 .../files/patch-lib_schema__functions.php (new)    | 365 ++++++++++++++++
 .../files/patch-lib_xml2array.php (new)            |  20 +
 net/phpldapadmin/files/patch-lib_xmlTemplates.php  |  48 ++-
 36 files changed, 2698 insertions(+), 135 deletions(-)
Comment 9 Ronald Klop freebsd_committer freebsd_triage 2022-12-01 10:03:11 UTC
(In reply to commit-hook from comment #8)
Your patch is committed. Please report back if it works for you and I will close the issue.

Thanks for the patch.
Comment 10 Krzysztof 2022-12-05 09:51:39 UTC
(In reply to Ronald Klop from comment #9)
Thank you very much for commit. Unfortunatelly I missed (and I don't know how it happend) some modifications.

So I've made a new port revision which fixes missed modifications.

Thank you veru much (in advance) for commiting these small changes. It was teste with poudriere and there is no errors during building package.
Comment 11 Krzysztof 2022-12-05 09:52:14 UTC
Created attachment 238531 [details]
poudriere testport log

Poudriere log
Comment 12 Krzysztof 2022-12-05 09:54:43 UTC
Created attachment 238532 [details]
Add missed modifications from previous patch

A new patch which fixes missed elements
Comment 13 Ronald Klop freebsd_committer freebsd_triage 2022-12-07 13:05:29 UTC
(In reply to Krzysztof from comment #10)
I will get to this but have a little patience as it is a bit busy here.
Comment 14 Ronald Klop freebsd_committer freebsd_triage 2022-12-08 10:00:11 UTC
New patch is up for review D37633.
Comment 15 commit-hook freebsd_committer freebsd_triage 2022-12-12 10:37:40 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=05adb0bbb787e824fd84aa7aed170182a55268e7

commit 05adb0bbb787e824fd84aa7aed170182a55268e7
Author:     Krzysztof <ports@bsdserwis.com>
AuthorDate: 2022-12-08 09:23:03 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2022-12-12 10:36:10 +0000

    net/phpldapadmin: additional fix to support for php81+

    PR:     266678 268135 264672
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D37633

 net/phpldapadmin/Makefile                          |  2 +-
 .../files/patch-lib_AttributeFactory.php           |  7 ++++-
 net/phpldapadmin/files/patch-lib_PageRender.php    | 29 ++++++++++++++++++
 net/phpldapadmin/files/patch-lib_Tree.php          |  9 ++++++
 net/phpldapadmin/files/patch-lib_common.php        | 11 +++++++
 net/phpldapadmin/files/patch-lib_ds__ldap.php      | 35 ++++++++++++++++++++--
 net/phpldapadmin/files/patch-lib_ds__ldap__pla.php | 27 +++++++++++++++++
 net/phpldapadmin/files/patch-lib_functions.php     | 29 ++++++++++++++++++
 net/phpldapadmin/files/patch-lib_xmlTemplates.php  |  9 ++++++
 9 files changed, 154 insertions(+), 4 deletions(-)
Comment 16 Krzysztof 2022-12-13 21:15:03 UTC
I suggest to close this bug as bug#268349 will be committed.
Comment 17 Krzysztof 2022-12-13 21:17:57 UTC
Well I'm closing this bug. It's not FIXED (I've made one small mistake), but new version of net/phpldapadmin is working as expected.