gentoo auto-resync : 10:08:2023 - 09:32:05

5 files changed, 34 insertions, 9 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index f74d825a60ca..88c62768f175 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 89ba3f5b586d..ad7bfe85f7f4 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,5 +1,6 @@
 AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 BLAKE2B 833f2d7b8934b9547ce26c5ed8b63f67ef1a6d416f19fcd1455696b47385d7ee313107f698ef513cb027a9ab92580bf0cf1c246ba4b1f54d97c984eb4e5bc79d SHA512 64830cc864dbbe3d0aa72d0e1165b787287430f3ea7507c8e9df2115b03df73944c63a4e9c09a7f8c9a11d41f48327ee26c204ede3bae2209b0f47076d5587b3
+AUX phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch 1193 BLAKE2B b2dd9d435cbe60b76da6824d6ab4e432ab5ba55388a01baa49f8b5b5d83e837b9866245f168cf83cc7f81c0c759a55756d422a8299f30bcc7fb648b68e840796 SHA512 2b96b8c84085e39e76fcaa3ca19ddfd71bc967c4c07c8d7d6f504e7657b9b87c5f4c411d516c999efa17a80969161438ba2d46500c8886d080599110e4aaffa8
 AUX postinstall2-en.txt 131 BLAKE2B 7ace4170aa9f57f1eb89319f11cee249be8bbec50dad798c0be22616d31a01a3cfeb6057485c8656318c0330c3d9b4ffb1d343978742618edfc6bbf9789807e8 SHA512 f465adc204ef40675848e39e37bab3f2eb5054549e3b787953793ece683df84a52373d23383601b3c53c6b98bf8f1de83c6d83be117be9c00da7058763709d6b
-DIST phpldapadmin-1.2.6.3.tar.gz 1130061 BLAKE2B d1183a89db659eeadbf33632edabb1f24d855eea3f37d36128b5a4262a4979f1fa1f963b2d1e43c4d07c988899a7c4cfb72a6f88e13ee5a830654686eaecf183 SHA512 66aeb81c812830968df5d3a2f0ccdd479fe5d7ed3bb729c0fb9991d3efa20263a493b38bfe48c99ad2c93c2ee549f51f53e064fb1381bc7e126ca2ad2bfc3167
-EBUILD phpldapadmin-1.2.6.3.ebuild 1199 BLAKE2B 37d56b09a6248d3e6d6baaa4a0fe4d258e3f1e268fd1fe66f4e4a7f47aca65c2736fb65d1f0b6799eb5ee42bc2262986953ec45363c66c94f21a7c15ffdc07fa SHA512 2ca62382bfeeb8bd4b3ceda8167807e38062179c52605685033f331373f751101e4b82bdfccdd3ccabfa87bf1140ed151e22eb84e017fb400c711e229da9c6c6
-MISC metadata.xml 343 BLAKE2B 037d1f04d35bcbde43c48a807f9be105d8b1167c3e5984b5ff00dc5453d66bc5967f2088d0ce1b48a8386711a96b946e7fd89cf4ff3c96bca0b07a1d92ad7f62 SHA512 5ebcd69f4c2cc777502042956f7d1d116297269eb3a24c2b5bef7c905573c0ebd935afd8ff4eabffe68018792fdfe1f421bb0cf411aaacfcbcfc369a9fae2f8b
+DIST phpldapadmin-1.2.6.6.tar.gz 1132820 BLAKE2B e153d9ac3e844a1a08235c43a096a7418a2d67128bc216fe09f7a00c4f4bdf39e7646842d0c0189c5c42beb3a7823959c7d5fa21b8721f96d0204f87e9b16aad SHA512 398bb6c36a3c9b64016bebc6debeaf8048c4b6b9ebdc7a2bfa8acfa4d4458990a0a59d4e32a2abef772baba667dd495309eff2d68e39847f25a50ad79a06984d
+EBUILD phpldapadmin-1.2.6.6.ebuild 1454 BLAKE2B 6961ed6e40f13cc422c1e8a65632bec790e2173eec13850877f4dd8c86440e52d5d60b4b84424bea2bc46fdca6c29f85e2270e02c59b89346bf5e6268355b9df SHA512 bb4c52a5fde9a4aadfd32a36dbc413322dffb66a47968ce409c4b076ce42d4e60519b3e699ef133c9b6c9b22cea392f2199e803621f76e85e09d446886eb0249
+MISC metadata.xml 406 BLAKE2B 599ce88acc4b4c960294bf812aa42aad0bb7ad6654b6e161764b8a0a5706ec9f27a511c371b15d7523fd41b050dae507909593efaa73343e7c7f1ab261a8a129 SHA512 e28b13ac828e9b1299901a8084dee3b45f82aea5cdea88891074ac935f323951ce98dac0b94f820059340c1201444fc51ee4958a001faa82179c1fcb46e47b00
diff --git a/net-nds/phpldapadmin/files/phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch b/net-nds/phpldapadmin/files/phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch
new file mode 100644
index 000000000000..0e6ae997fc48
--- /dev/null
+++ b/net-nds/phpldapadmin/files/phpldapadmin-1.2.6.4-getDN-htmlspecialchars.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/897680
+
+This 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.
+--- a/lib/HTMLTree.php
++++ b/lib/HTMLTree.php
+@@ -98,7 +98,7 @@
+ 					$this->javascript .= '<div>';
+ 					$this->javascript .= '<input type="hidden" name="cmd" value="template_engine" />';
+ 					$this->javascript .= sprintf('<input type="hidden" name="server_id" value="%s" />',$server->getIndex());
+-					$this->javascript .= sprintf('<input type="hidden" name="container" value="%s" />',htmlspecialchars($server->getContainer($base->getDN())));
++					$this->javascript .= sprintf('<input type="hidden" name="container" value="%s" />',htmlspecialchars($server->getContainer($base->getDN()) ?? ''));
+ 					$this->javascript .= sprintf('<input type="hidden" name="rdn" value="%s" />',get_rdn($base->getDN()));
+ 					$this->javascript .= sprintf('<input type="hidden" name="rdn_attribute[]" value="%s" />',$rdn[0]);
+ 					$this->javascript .= sprintf('<input type="hidden" name="new_values[%s][]" value="%s" />',$rdn[0],$rdn[1]);
diff --git a/net-nds/phpldapadmin/metadata.xml b/net-nds/phpldapadmin/metadata.xml
index 072d8a766584..ca612ab12d9d 100644
--- a/net-nds/phpldapadmin/metadata.xml
+++ b/net-nds/phpldapadmin/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">phpldapadmin</remote-id>
+    <remote-id type="github">leenooks/phpLDAPadmin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.6.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild
index 19c7941c7c92..788ef2ef4e64 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.6.3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,29 +7,36 @@ inherit webapp
 
 MY_PN="phpLDAPadmin"
 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
-HOMEPAGE="http://phpldapadmin.sourceforge.net"
+HOMEPAGE="https://github.com/leenooks/phpLDAPadmin"
 SRC_URI="https://github.com/leenooks/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND="
-	>=dev-lang/php-7.2[hash(+),ldap,session,xml,nls]
+	>=dev-lang/php-8.0[hash(+),ldap,session,xml,nls]
+	dev-libs/openssl
 	virtual/httpd-php
 "
+BDEPEND="
+	media-libs/libpng
+"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
+	"${FILESDIR}/${PN}-1.2.6.4-getDN-htmlspecialchars.patch"
 )
 
 need_httpd_cgi
 
 src_prepare() {
-	mv config/config.php.example config/config.php
+	mv config/config.php.example config/config.php || die
 	default
+	# fix QA notice about broken IDAT window length
+	pngfix --out=network.png htdocs/images/default/network.png; [[ $? -lt 16 ]] || die
+	pngfix --out=document.png htdocs/images/default/document.png; [[ $? -lt 16 ]] || die
+	mv -f network.png document.png htdocs/images/default/ || die
 }
 
 src_install() {