Bug 268349 - net/phpldapadmin: update to 1.2.6.4
Summary: net/phpldapadmin: update to 1.2.6.4
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Ronald Klop
URL: https://github.com/leenooks/phpLDAPad...
Keywords:
: 268429 (view as bug list)
Depends on:
Blocks:
 
Reported: 2022-12-13 10:47 UTC by Ronald Klop
Modified: 2022-12-18 10:09 UTC (History)
3 users (show)

See Also:
ports: maintainer-feedback+


Attachments
git diff of net/phpldapadmin (144.34 KB, patch)
2022-12-13 10:47 UTC, Ronald Klop
ports: maintainer-approval+
Details | Diff
poudriere testport log (28.09 KB, text/plain)
2022-12-13 21:10 UTC, Krzysztof
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ronald Klop freebsd_committer freebsd_triage 2022-12-13 10:47:18 UTC
Created attachment 238750 [details]
git diff of net/phpldapadmin

Pretty trivial version bump.
Quite some patches seems obsolete.

Changes:
https://github.com/leenooks/phpLDAPadmin/compare/1.2.6.3...1.2.6.4
Comment 1 Krzysztof 2022-12-13 21:08:55 UTC
Comment on attachment 238750 [details]
git diff of net/phpldapadmin

I've just tested it with php81 on my testing box (12.3-STABLE). There is no problems at all. I approve.
Comment 2 Krzysztof 2022-12-13 21:10:44 UTC
Created attachment 238771 [details]
poudriere testport log

I'm attaching poudriere testport log. As you can see there is no problems at all
Comment 3 Krzysztof 2022-12-13 21:12:31 UTC
I don't know why but I'm not able set flag on patch file. But as I wrote earlier I approve this patch
Comment 4 Graham Perrin freebsd_committer freebsd_triage 2022-12-14 04:03:29 UTC
Triage: severity reduced to the norm for an update to a port.
Comment 5 Ronald Klop freebsd_committer freebsd_triage 2022-12-14 16:02:14 UTC
opened review D37700
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-12-16 16:31:05 UTC
A commit in branch main references this bug:

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

commit 5765ec9382b822381ab6de329704b94ba31f85fb
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2022-12-14 15:57:23 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2022-12-16 16:30:43 +0000

    net/phpldapadmin: update to 1.2.6.4

    This includes all the fixes for php81+.
    Changes: https://github.com/leenooks/phpLDAPadmin/compare/1.2.6.3...1.2.6.4

    PR:     268349
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D37700

 net/phpldapadmin/Makefile                          |   4 +-
 net/phpldapadmin/distinfo                          |   6 +-
 .../patch-htdocs_add__oclass__form.php (gone)      |  11 -
 .../files/patch-htdocs_add__value__form.php (gone) |  32 --
 net/phpldapadmin/files/patch-htdocs_cmd.php (gone) |  11 -
 .../files/patch-htdocs_copy.php (gone)             |  11 -
 .../patch-htdocs_download__binary__attr.php (gone) |  11 -
 .../files/patch-htdocs_draw__tree__node.php (gone) |  11 -
 .../files/patch-htdocs_expand.php (gone)           |  11 -
 .../files/patch-htdocs_export__form.php (gone)     |  11 -
 .../files/patch-htdocs_login.php (gone)            |  11 -
 .../files/patch-htdocs_login__form.php (gone)      |  16 -
 .../files/patch-htdocs_monitor.php (gone)          |  29 --
 .../files/patch-htdocs_purge__cache.php (gone)     |  11 -
 .../files/patch-htdocs_refresh.php (gone)          |  11 -
 .../files/patch-htdocs_schema.php (gone)           | 165 -------
 .../files/patch-htdocs_server__info.php (gone)     |  20 -
 .../patch-htdocs_view__jpeg__photo.php (gone)      |  11 -
 .../files/patch-lib_AJAXTree.php (gone)            |  47 --
 .../files/patch-lib_Attribute.php (gone)           |  59 ---
 .../files/patch-lib_AttributeFactory.php (gone)    |  55 ---
 .../files/patch-lib_BinaryAttribute.php (gone)     |  11 -
 .../files/patch-lib_DateAttribute.php (gone)       |  10 -
 .../files/patch-lib_DnAttribute.php (gone)         |  10 -
 .../files/patch-lib_GidAttribute.php (gone)        |  10 -
 .../files/patch-lib_HTMLTree.php (gone)            |  32 --
 .../files/patch-lib_MultiLineAttribute.php (gone)  |  11 -
 .../patch-lib_ObjectClassAttribute.php (gone)      |  10 -
 .../files/patch-lib_PageRender.php (gone)          | 149 -------
 .../files/patch-lib_PasswordAttribute.php (gone)   |  10 -
 net/phpldapadmin/files/patch-lib_Query.php (gone)  |  68 ---
 .../files/patch-lib_QueryRender.php (gone)         |  38 --
 .../files/patch-lib_SelectionAttribute.php (gone)  |  11 -
 .../files/patch-lib_ShadowAttribute.php (gone)     |  11 -
 .../files/patch-lib_Template.php (gone)            | 248 -----------
 .../files/patch-lib_TemplateRender.php (gone)      |  99 -----
 net/phpldapadmin/files/patch-lib_Tree.php (gone)   |  29 --
 .../files/patch-lib_TreeItem.php (gone)            |  11 -
 .../files/patch-lib_Visitor.php (gone)             |  43 --
 net/phpldapadmin/files/patch-lib_common.php (gone) |  25 --
 net/phpldapadmin/files/patch-lib_ds.php (gone)     |  29 --
 .../files/patch-lib_ds__ldap.php (gone)            | 490 ---------------------
 .../files/patch-lib_ds__ldap__pla.php (gone)       |  67 ---
 .../files/patch-lib_export__functions.php (gone)   |  46 --
 .../files/patch-lib_functions.php (gone)           | 483 --------------------
 .../files/patch-lib_import__functions.php (gone)   | 104 -----
 net/phpldapadmin/files/patch-lib_page.php (gone)   |  29 --
 .../files/patch-lib_schema__functions.php (gone)   | 365 ---------------
 .../files/patch-lib_xml2array.php (gone)           |  20 -
 .../files/patch-lib_xmlTemplates.php (gone)        |  56 ---
 .../files/patch-tools_po_Makefile (gone)           |   7 -
 51 files changed, 4 insertions(+), 3082 deletions(-)
Comment 7 Ronald Klop freebsd_committer freebsd_triage 2022-12-17 10:49:52 UTC
Committed. Thanks for the work.
Comment 8 Krzysztof 2022-12-17 13:29:06 UTC
I don't why, but it seems that one patch (patch-htdocs_collapse.php) was not removed  - I've checked your  git diff of net/phpldapadmin  once again and this patch-file shoud be removed:

diff --git a/net/phpldapadmin/files/patch-htdocs_collapse.php b/net/phpldapadmin/files/patch-htdocs_collapse.php
deleted file mode 100644
index 19d45a350dae..000000000000
--- a/net/phpldapadmin/files/patch-htdocs_collapse.php
+++ /dev/null

But during review it was missed? https://reviews.freebsd.org/file/data/lcuy7dhs2au64autq73f/PHID-FILE-varczc3widcrexhyhhcn/D37700.diff 

Any ideas what can happened?
Comment 9 Ronald Klop freebsd_committer freebsd_triage 2022-12-17 16:27:21 UTC
I saw that too today when I double checked what is now in the ports tree.
Will fix this weekend.
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-12-18 09:57:01 UTC
A commit in branch main references this bug:

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

commit 624cb5d4e912fd46da6219063e2fdb0fb8a76241
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2022-12-18 09:34:57 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2022-12-18 09:55:48 +0000

    net/phpldapadmin: forgot to remove one file

    This file was in the review but not in the commit.

    Fixes patch so no need to inc portrevision:
    ===>  Patching for phpldapadmin-php81-1.2.6.4
    ===>  Applying FreeBSD patches for phpldapadmin-php81-1.2.6.4 from /usr/ports/net/phpldapadmin/files
    Ignoring previously applied (or reversed) patch.
    1 out of 1 hunks ignored--saving rejects to htdocs/collapse.php.rej
    ===>  FAILED Applying FreeBSD patch-htdocs_collapse.php
    ===> FAILED to apply cleanly FreeBSD patch(es)  patch-htdocs_collapse.php
    *** Error code 1

    PR:     268349
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D37700

 net/phpldapadmin/files/patch-htdocs_collapse.php (gone) | 11 -----------
 1 file changed, 11 deletions(-)
Comment 11 Ronald Klop freebsd_committer freebsd_triage 2022-12-18 10:09:45 UTC
*** Bug 268429 has been marked as a duplicate of this bug. ***