Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 897680 - net-nds/phpldapadmin-1.2.6.6: version bump
Summary: net-nds/phpldapadmin-1.2.6.6: version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Web Application Packages Maintainers
URL:
Whiteboard:
Keywords: PATCH, PullRequest
Depends on:
Blocks:
 
Reported: 2023-02-25 12:15 UTC by Horst Prote
Modified: 2023-08-10 07:40 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
phpldapadmin-1.2.6.4-r1.ebuild (phpldapadmin-1.2.6.4-r1.ebuild,1.38 KB, text/plain)
2023-02-25 12:26 UTC, Horst Prote
Details
phpldapadmin-1.2.6.5.ebuild (phpldapadmin-1.2.6.5.ebuild,1.43 KB, text/plain)
2023-02-25 12:27 UTC, Horst Prote
Details
getDN-htmlspecialchars patch (phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch,1.00 KB, patch)
2023-02-25 12:27 UTC, Horst Prote
Details | Diff
openssl-1 patch (phpldapadmin-1.2.6.5-openssl-1.patch,426 bytes, patch)
2023-02-25 12:29 UTC, Horst Prote
Details | Diff
git am-able patch (0001-Fix-for-Bug-897680.patch,7.46 KB, patch)
2023-02-26 14:55 UTC, Horst Prote
Details | Diff
git am-able patch for phpldapadmin-1.2.6.6 (phpldapadmin-1.2.6.6.patch,16.24 KB, patch)
2023-07-04 09:25 UTC, Horst Prote
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Horst Prote 2023-02-25 12:15:27 UTC
Upstream released version 1.2.6.4 six months ago
and version 1.2.6.5 last week:
https://github.com/leenooks/phpLDAPadmin/releases

Reproducible: Always
Comment 1 Horst Prote 2023-02-25 12:23:54 UTC
I'll attach my ebuilds and patches for both versions.

The phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch fixes an error you get under php-8.1 when "$server->getContainer($base->getDN())" returns a null object (that's the case if you have a short, one component, rootdn in your "$servers->setValue('server','base',array(...)" config.

The phpldapadmin-1.2.6.5-openssl-1.patch fixes upstream issue https://github.com/leenooks/phpLDAPadmin/issues/183.
Comment 2 Horst Prote 2023-02-25 12:26:43 UTC
Created attachment 854592 [details]
phpldapadmin-1.2.6.4-r1.ebuild
Comment 3 Horst Prote 2023-02-25 12:27:03 UTC
Created attachment 854594 [details]
phpldapadmin-1.2.6.5.ebuild
Comment 4 Horst Prote 2023-02-25 12:27:43 UTC
Created attachment 854596 [details, diff]
getDN-htmlspecialchars patch
Comment 5 Horst Prote 2023-02-25 12:29:03 UTC
Created attachment 854598 [details, diff]
openssl-1 patch
Comment 6 Horst Prote 2023-02-25 12:30:29 UTC
Note that the phpldapadmin-1.2.6.5.ebuild also fixes Bug 691172.
Comment 7 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-02-25 12:35:24 UTC
(In reply to Horst Prote from comment #6)
> Note that the phpldapadmin-1.2.6.5.ebuild also fixes Bug 691172.

Did you mean to close the bug...?

Anyway, please attach the ebuulds in the form of a git am-able patch to gentoo.git or make a GitHub PR.
Comment 8 Horst Prote 2023-02-26 14:55:38 UTC
Created attachment 854832 [details, diff]
git am-able patch

Here you go!

I will not close this bug and bug 691172 now as I think they should not closed until the fix is merged to the tree.
Comment 9 Christophe PEREZ 2023-07-01 23:38:17 UTC
(In reply to Horst Prote from comment #6)
> Note that the phpldapadmin-1.2.6.5.ebuild also fixes Bug 691172.

1.2.6.6 is out now.
Comment 10 Horst Prote 2023-07-04 09:25:32 UTC
Created attachment 865133 [details, diff]
git am-able patch for phpldapadmin-1.2.6.6

Here again a git am-able patch for phpldapadmin-1.2.6.6 from my local overlay.

Explanation of phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch and phpldapadmin-1.2.6.5-openssl-1.patch: see comment #1.
The openssl patch is now only applied if openssl:0/1.1 is installed.

The phpldapadmin-1.2.6.2-r1-default-templates.patch is my fix of the upstream issue https://github.com/leenooks/phpLDAPadmin/issues/49

I installed this, logged in on the website and looked around a bit: Seems to work. But I didn't do any changes on my LDAP directory up to now.
Comment 11 Tomáš Mózes 2023-07-15 04:30:54 UTC
(In reply to Horst Prote from comment #10)
> Created attachment 865133 [details, diff] [details, diff]
> git am-able patch for phpldapadmin-1.2.6.6
> 
> Here again a git am-able patch for phpldapadmin-1.2.6.6 from my local
> overlay.
> 
> Explanation of phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch and
> phpldapadmin-1.2.6.5-openssl-1.patch: see comment #1.
> The openssl patch is now only applied if openssl:0/1.1 is installed.
> 
> The phpldapadmin-1.2.6.2-r1-default-templates.patch is my fix of the
> upstream issue https://github.com/leenooks/phpLDAPadmin/issues/49
> 
> I installed this, logged in on the website and looked around a bit: Seems to
> work. But I didn't do any changes on my LDAP directory up to now.

Could you please open a PR on github? It would be much easier to review. Thanks!
Comment 12 Horst Prote 2023-07-28 09:17:45 UTC
(In reply to Tomáš Mózes from comment #11)
> Could you please open a PR on github? It would be much easier to review.
> Thanks!

https://github.com/gentoo/gentoo/pull/32081
Comment 13 Larry the Git Cow gentoo-dev 2023-08-10 07:40:58 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8195b182b463c2b061f3c884301bd520b8b10e

commit 0d8195b182b463c2b061f3c884301bd520b8b10e
Author:     protegh <protegh@users.noreply.github.com>
AuthorDate: 2023-07-28 09:03:19 +0000
Commit:     Viorel Munteanu <ceamac@gentoo.org>
CommitDate: 2023-08-10 07:36:47 +0000

    net-nds/phpldapadmin: add 1.2.6.6
    
    The phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch fixes an error you
    get under php-8.1 when "$server->getContainer($base->getDN())" returns a
    null object (that's the case if you have a short, one component, rootdn
    in your "$servers->setValue('server','base',array(...)" config.
    
    Closes: https://bugs.gentoo.org/897680
    Signed-off-by: protegh <protegh@users.noreply.github.com>
    Closes: https://github.com/gentoo/gentoo/pull/32081
    Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>

 net-nds/phpldapadmin/Manifest                      |  1 +
 ...pldapadmin-1.2.6.4-getDN-htmlspecialchars.patch | 16 ++++++
 net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild   | 61 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)