[net-nds/phpldapadmin] 1.2.2 version bump - fixes bug #395513.

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

3 files changed, 75 insertions, 3 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index 253242e6e39f..af94d636f859 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/phpldapadmin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.54 2011/10/25 18:18:43 jmbsvicetto Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.55 2012/01/05 00:36:39 jmbsvicetto Exp $
+
+*phpldapadmin-1.2.2 (05 Jan 2012)
+
+  05 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpldapadmin-1.2.2.ebuild:
+  [net-nds/phpldapadmin] 1.2.2 version bump - fixes bug #395513.
 
 *phpldapadmin-1.2.1.1-r1 (25 Oct 2011)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 98fcac468235..fd584719ac68 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX phpldapadmin-1.2.1.1-fix-cmd-exploit.patch 716 RMD160 53234a28cbba93e29be796c84b3f735065bef428 SHA1 bb26087375bdb8ace84254b9e9c4537ab691bbaf SHA256 b0c7822c7e36d037e15839046bdfc842540b972633e293c5d96e6d3117f782e0
 AUX phpldapadmin-1.2.1.1-fix-functions-exploit.patch 939 RMD160 7c4cd4aa9290ad298afe18ef78765ba0619a365b SHA1 6c7f3b29e696b1b16ffead286962dca98970674d SHA256 94344146e0434ac7c70375f4cbfef9bcd40897c06fb3eddc0b39eaed0c5c669d
 AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 RMD160 085053d13ba91c8b69d5b0e4d6ce3fd0e627780b SHA1 8f6ea7971157091febc6a7ff2f6fe97ed908df38 SHA256 7cce069d30a5c4067743de8e91d0d6bd4d9faaaf169ed342a3890bf07ced8817
@@ -5,9 +8,28 @@ AUX postinstall2-en.txt 131 RMD160 f1f681b3b5094f555e6adfca8d70d4ca1b14ae4b SHA1
 DIST phpldapadmin-1.2.0.4.tgz 1291545 RMD160 23b6a9afd438add7ed48ff390d5b4d4400df54b4 SHA1 7b364065e91f4dca606432c42fa2ae48e54f04ce SHA256 e4887ed0db63c926162d79d603add21a669103ad2f75a7b90686a18eed8a6330
 DIST phpldapadmin-1.2.0.5.tgz 1345901 RMD160 7b3e194420d7360001faa709b046423d8ac939bf SHA1 0720ec05bfe91520bdd15e38c79f949f18d355eb SHA256 ee75da1dbba023499fdf50d6cedea9bcdb9caad017b15ed2e31700bcc61dfcfd
 DIST phpldapadmin-1.2.1.1.tgz 1468961 RMD160 c78bd0f056f7f5f8b150360e6ee0ef3f37d6560c SHA1 f30d76205891fbd01fab468af1f8430597983787 SHA256 1fa6373c500a193a8868cb6a753f3b5218a92374b792994129c0c1b69d4d1090
+DIST phpldapadmin-1.2.2.tgz 1415565 RMD160 dd93d9558c9780b014f066d070b496e2804b9565 SHA1 2904923eb25173d108b556c70fb3d42cd6e0e289 SHA256 8629ea3f14630d4dd74099c997ac9795240a6417d5d124517ba5860c12d8a239
 EBUILD phpldapadmin-1.2.0.4-r1.ebuild 983 RMD160 2228477215296b381a25ece0ac9f81d4cdead10e SHA1 340b6602090d046c526914f56a2ad55023f3e334 SHA256 cbb2de3c6c29336841d910feaf10b559158f85031f47b52d3f1574f2d985b79b
 EBUILD phpldapadmin-1.2.0.5.ebuild 970 RMD160 702248b5bf778558a6704f761755f82060f0d053 SHA1 aea420c3f57d9de49e731ab8b6e3b7cc806c36ee SHA256 b785da167be298f837071d8e8d5a741d2c6f1e18038badd54349ed111f0e04d5
 EBUILD phpldapadmin-1.2.1.1-r1.ebuild 1359 RMD160 7459adeaca2213071d4adc19e0d8417f19a1d959 SHA1 cca736aaa69b6728ca6f03ff68135f75da60b315 SHA256 f1f21dc696d4f862bfffdf45bd8b0b5d32d62fa9731713ae3dbc3c447ea3b5e4
 EBUILD phpldapadmin-1.2.1.1.ebuild 1129 RMD160 37a8f6d38c93c7eef6aa7c04e73c2e66f2df498f SHA1 ec4b1fd9da21bee274d685efda10cd81cc417005 SHA256 40f439fbda56140a71f345358aeb603b17440464497a0168b28368a157ca5591
-MISC ChangeLog 9040 RMD160 164da373a94995f0768f7ae06eaf4e047125e031 SHA1 d2d95b3cc4ce6c172e184a64c6ab9980dac0a678 SHA256 c2131f81a7b00630dcd40b14889bea39ccdb2ffe565eb3c10db4db33552c7cfc
+EBUILD phpldapadmin-1.2.2.ebuild 1136 RMD160 358d9e441b5b6b489ecdabc7f58051aeedbd84b7 SHA1 5965b38e7d6c149198725380fb2549d2b55bfc2f SHA256 301a656b15c19f35f85c9bae9607fff14c4c58664849b0dd10bb97a53d0f3f65
+MISC ChangeLog 9238 RMD160 f0b6a487c87f3da265d8d1b86cfaea8b2dd1d1b1 SHA1 6f22ad3930722e8ca0cae8b0fabb0d4a67d8cee8 SHA256 5792a468cae3ed03d879cf480c00a7eeb3102575f7aae242495af8bb2cc5c801
 MISC metadata.xml 483 RMD160 9f29226203f0c22470a627939b84edbe57d40a7c SHA1 69affdfca1b1dd98d302336a0e47d708e96317ba SHA256 4da024bde528d8117f42de927efa5e86dd4445b018a818608e1db16969957186
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPBPAvAAoJEC8ZTXQF1qEPyWUQALba67/U4o7FnEwKMxctIPTE
+uo5pqqBPvmaXaeWwS2FZJtuZWUxCsSdNJpJ6zoRPOkC3cr2NUbEMSS3aHx9q5UP2
+EzrJ4MGOCJr63nvISvcVk4n7fwR5+eJpJwVZPrPTZNc6Q8PDTpuN464eBAN8bvho
+D1TH9ktvEHPo6yx+SoKF5o3j5KY/icjFjzbgEl7IiID8GaEND0ME3aJh7sUDQbiK
+2+PY3/qCvZplOBZG6Z+d3kzfgUsA5uw6CbPZB8RVN8OzOz1cJw/LnyLuA3K38XZF
+eL6oKPXPUOHia4AuN7JAsJWKtZydIwLsgQldzK/eeqyNgx95bowNii5sEPTu6VRA
+JGHkUa6UQm4gNuXiHnZxcdJxb7ohzCgm4H1JfQiiX89GrCP740T5rWRCIWsj/XwY
+ZrpIt6hrRhPwiGIh/jD1VPY4nt4cFPPZZWewIP64ugOKdFJoHQLqK2XIU8Rm4DXf
+TVRlPqq1CsGYO+1piiLE/xdoBItPBfU4eIgkrdqjgrcEORFCazBIoquhhu39qBRm
+ymzJFC2h7ofssQmSj9zoiHha9I0BkA1u2+RowDjdy+iC3H6PJLPgPT0qGZvR8LKe
+aNqQ3xlxrplY57DvVIP527VgulJGDi/Ar5OmVp0A56IdGGKgQFHhXZhtp77e8X7V
+NL9BHFEPbln5TPDeeM9B
+=1mwr
+-----END PGP SIGNATURE-----
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.2.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.2.ebuild
new file mode 100644
index 000000000000..4da390de7ddc
--- /dev/null
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.2.ebuild,v 1.1 2012/01/05 00:36:39 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit webapp depend.php
+
+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}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
+		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+need_httpd_cgi
+need_php_httpd
+
+src_prepare() {
+	mv config/config.php.example config/config.php
+	epatch "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc INSTALL
+
+	# Restrict config file access - bug 280836
+	chown root:apache "config/config.php"
+	chmod 640 "config/config.php"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	webapp_configfile "${MY_HTDOCSDIR}/config/config.php"
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+
+	webapp_src_install
+}