Version bump wrt security bug #104293

(Portage version: 2.0.51.22-r2)

5 files changed, 60 insertions, 11 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 1d7845f3cf38..4083472ad3ed 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/phpldapadmin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.15 2005/08/21 15:41:46 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.16 2005/08/31 16:28:39 rl03 Exp $
+
+*phpldapadmin-0.9.7_alpha6 (31 Aug 2005)
+
+  31 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/welcome.php.patch,
+  +phpldapadmin-0.9.7_alpha6.ebuild:
+  Version bump wrt security bug #104293
 
 *phpldapadmin-0.9.7_alpha4 (21 Aug 2005)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 89cb545da7d4..65a631744663 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 97afc085ffc474a07103d8fd3f0e3e88 phpldapadmin-0.9.6c.ebuild 1018
 MD5 83cd6adf810538b4569700dda6ea9eab phpldapadmin-0.9.5.ebuild 1013
 MD5 0a19f9770201f2e8ff7bb48f7cb9d27c phpldapadmin-0.9.7_alpha4.ebuild 926
+MD5 e1807e5db55e0c5819936687d1c638ab phpldapadmin-0.9.7_alpha6.ebuild 935
 MD5 8dfa8d6d4a0ce8b94e07eeaaa9d40726 ChangeLog 2119
 MD5 e9b9e4888a6ca818b883131b53ab9c04 phpldapadmin-0.9.6.ebuild 1017
 MD5 2b9f3758019e1a5695a4e4d3e3152383 metadata.xml 275
 MD5 62c674c040dea528ab9e02009ebc835c files/digest-phpldapadmin-0.9.5 70
 MD5 9a33a746aab9a3fa0100f27794427bda files/digest-phpldapadmin-0.9.6 70
 MD5 c876b6e9a2ec430d216f871bc38eff76 files/digest-phpldapadmin-0.9.7_alpha4 77
+MD5 e85a808069c28b9286faae1a04dc2389 files/digest-phpldapadmin-0.9.7_alpha6 77
 MD5 633f669b517977c88d2e02a8f6c8254c files/digest-phpldapadmin-0.9.6c 71
 MD5 306450e12d7022d610333cf736164286 files/postinstall-en.txt 124
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDCKDNEzitwsaoONoRAtqOAJ96nG5R4zYz3tMFaysZoypoiBSNmwCghNPf
-wK8jtGy1lp1g/1E0d34cw2k=
-=z9/t
------END PGP SIGNATURE-----
+MD5 b798e91898b186ba4354f10a38bc47b2 files/welcome.php.patch 170
diff --git a/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6 b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6
new file mode 100644
index 000000000000..6e5ed72c1c10
--- /dev/null
+++ b/net-nds/phpldapadmin/files/digest-phpldapadmin-0.9.7_alpha6
@@ -0,0 +1 @@
+MD5 08109739708f5b00c197422fb883a7b9 phpldapadmin-0.9.7-alpha6.tar.gz 739882
diff --git a/net-nds/phpldapadmin/files/welcome.php.patch b/net-nds/phpldapadmin/files/welcome.php.patch
new file mode 100644
index 000000000000..aac33f508599
--- /dev/null
+++ b/net-nds/phpldapadmin/files/welcome.php.patch
@@ -0,0 +1,9 @@
+--- welcome.php.old	2005-08-31 12:21:24.000000000 -0400
++++ welcome.php	2005-08-31 12:24:08.000000000 -0400
+@@ -39,6 +39,3 @@
+ </center>
+ </body>
+ </html>
+-
+-<?php }
+-?>
diff --git a/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
new file mode 100644
index 000000000000..1a201e8e76e1
--- /dev/null
+++ b/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-0.9.7_alpha6.ebuild,v 1.1 2005/08/31 16:28:39 rl03 Exp $
+
+inherit eutils webapp
+
+MY_P=${P/_alpha/-alpha}
+
+DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server."
+HOMEPAGE="http://phpldapadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE=""
+S=${WORKDIR}/${MY_P}
+
+DEPEND="virtual/php"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv config.php.example config.php
+	epatch ${FILESDIR}/welcome.php.patch
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL doc/*
+
+	cp -r . ${D}${MY_HTDOCSDIR}
+	cd ${D}${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}