[net-nds/phpldapadmin] Bumped to release 1.2.1.1 - bug 367625.

Added myself as maintainer. Both with ok from Tim Harder <radhermit>.
Tried to address the config file permissions issue (bug 280836) but
it doesn't seem webapp-config supports that.

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

5 files changed, 106 insertions, 14 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index fed106abf69a..a93ffd5f912f 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,16 @@
 # 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.52 2011/02/17 08:20:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.53 2011/10/20 19:38:09 jmbsvicetto Exp $
+
+*phpldapadmin-1.2.1.1 (20 Oct 2011)
+
+  20 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpldapadmin-1.2.1.1.ebuild,
+  +files/phpldapadmin-1.2.1.1-fix-magic-quotes.patch, metadata.xml:
+  [net-nds/phpldapadmin] Bumped to release 1.2.1.1 - bug 367625.
+  Added myself as maintainer. Both with ok from Tim Harder <radhermit>.
+  Tried to address the config file permissions issue (bug 280836) but
+  it doesn't seem webapp-config supports that.
 
 *phpldapadmin-1.2.0.5 (17 Feb 2011)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 445aeb94e28d..a9701c919601 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -1,21 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 RMD160 085053d13ba91c8b69d5b0e4d6ce3fd0e627780b SHA1 8f6ea7971157091febc6a7ff2f6fe97ed908df38 SHA256 7cce069d30a5c4067743de8e91d0d6bd4d9faaaf169ed342a3890bf07ced8817
 AUX postinstall2-en.txt 131 RMD160 f1f681b3b5094f555e6adfca8d70d4ca1b14ae4b SHA1 deecc59339d6c83dad797c0f8cfab9ea0110153a SHA256 e2dc7bea366789a303eb9a90d1bced655cea00469202859af40bf19c00505d38
 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
 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
-MISC ChangeLog 8278 RMD160 acbb3b6c8b6e88ee2833c8c0c9b110e914450f53 SHA1 214114e46ad479c5ab0720b76fe25c67bc92a57f SHA256 56830f3087e5d1726afd56f0904c4dcd9374dcb69334e326e859295cbf1f2bd9
-MISC metadata.xml 370 RMD160 1e683538571368a5033eaeb2ba358710ba825aa8 SHA1 044285a73d0a6b43568dc5959a1043d9603f136f SHA256 d387ae449792182b0abd370fbbcd87f354170b54fb42a0c088fd511c9040da6a
+EBUILD phpldapadmin-1.2.1.1.ebuild 1129 RMD160 37a8f6d38c93c7eef6aa7c04e73c2e66f2df498f SHA1 ec4b1fd9da21bee274d685efda10cd81cc417005 SHA256 40f439fbda56140a71f345358aeb603b17440464497a0168b28368a157ca5591
+MISC ChangeLog 8739 RMD160 e7f46a91444c702d3fb1dcdffef2cd37f54a1b0d SHA1 cfe01976a8cc4e6b86fdf238b7c246951590ca0d SHA256 44543871ea4864ddd156d30ea197d48f4e90b6e42a8a932bfc19438c56b4e4c9
+MISC metadata.xml 483 RMD160 9f29226203f0c22470a627939b84edbe57d40a7c SHA1 69affdfca1b1dd98d302336a0e47d708e96317ba SHA256 4da024bde528d8117f42de927efa5e86dd4445b018a818608e1db16969957186
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNXNo5AAoJEEqz6FtPBkyjHG8H/Rs/b5dhDrFBZeVXQzDJYh5S
-bo4z7LmfhY+2lE97aQsskxxMo6HzAmE277k+mHG8oRlvLe5dKoCbK6qW3MtS0ymI
-tP0MrnkHUEDRKtObvNezWD0iB9L53doYGrYwIieltw2Pk1PbN4bDaOsjVUkzVDjA
-0PMIgsjjQvG/P8FdSh5xrAWhKOLB5OW1hf2c43wxZGiK37VmWGQ/RDg72NepJ6co
-Tunh5wbSw+uh/9UamTjTI2hN0sUlOYvPugOKK8oG7jSpodeoHlleX0x3Q3Ye17HC
-dk8xa75EaSXkUXy+bVlDm85nW3Rb1ytUlaEa/ERsxqgO0cXxuG344N3QJy4Hwjk=
-=qtoS
+iQIcBAEBAgAGBQJOoHiTAAoJEC8ZTXQF1qEPfzEP/1yIegcgSXa5CgtLlW0J7Xzy
+p2WLH0M5AFTY9oigP+idTwDMjMwi+ofT6ObKC4Y0I2MiJgeSGfZh7P28S3itNJJT
+GlPXHXMC3d6E97asPShZ8M3YPOyepD8j/EkfjIwCzKyfgQhMSndSB+uQvIGhoppi
+G5DY6aWzctiaZtApmGeqIleECHgP/4QCDcBmYCZ/x0vdyd8WJvp9qT2nGHQ9Glwd
+LpxtOrOwTHnOqAiIzsiG84vMoW/TgASRmmHdExWYG57NhvUN6O7mZ7IBxWoUzb8K
+ZU8eFx5CJiyyOQCTewWYEK7AG/nNQioJW2bI+G9O7Dlp9yHg6hHPLawOsm2WIOJs
+ujl7m2hqi53ySAGQfzcK7byUMDGXmEt/hexayUmKVAzLJpsGRI7mkj7ThfqafeAC
+7e6arzp8JMWSNLh70Q2/ommmfrYZ9O2SSs4mXpr3b21AZn3zVZ00KfbB4iZK2qov
+KXNV7Ebt3fVXOH+V5Sxsw4Sln4oL18gQqmAB9poF8gU31Pm2PzCgbyWni+9YmpJU
+UZ5x0mKHyaYrpp5+PVwDDWN3Ehb/QUbnRI+xeVCu6pZoubvm7473eTI1sxq8z8rk
+BcchD4FGqFYYXBOF4nBHRU0KQmHkKhFfItrHg5atKqea0Ic+KLgpFRGoQdbyfes/
+Y6unEOVGHmrDoplPbDNT
+=HZGa
 -----END PGP SIGNATURE-----
diff --git a/net-nds/phpldapadmin/files/phpldapadmin-1.2.1.1-fix-magic-quotes.patch b/net-nds/phpldapadmin/files/phpldapadmin-1.2.1.1-fix-magic-quotes.patch
new file mode 100644
index 000000000000..3a2f3a48223c
--- /dev/null
+++ b/net-nds/phpldapadmin/files/phpldapadmin-1.2.1.1-fix-magic-quotes.patch
@@ -0,0 +1,23 @@
+diff -urN phpldapadmin-1.2.1.1/lib/emuhash_functions.php phpldapadmin-1.2.1.1-new/lib/emuhash_functions.php
+--- phpldapadmin-1.2.1.1/lib/emuhash_functions.php	2011-05-11 09:40:18.000000000 +0000
++++ phpldapadmin-1.2.1.1-new/lib/emuhash_functions.php	2011-10-20 15:55:05.597714125 +0000
+@@ -59,8 +59,8 @@
+ 			global $emuhash_emu;
+ 
+ 			if (PHP_VERSION < 6) {
+-				$current_magic_quotes = @get_magic_quotes_runtime();
+-				@set_magic_quotes_runtime(0);
++				$current_magic_quotes = ini_get('magic_quotes_runtime');
++				ini_set('magic_quotes_runtime', 0);;
+ 			}
+ 
+ 			$tmpfile = tempnam($emuhash_emu['tmpdir'],'emuhash');
+@@ -78,7 +78,7 @@
+ 			unlink($tmpfile);
+ 
+ 			if (PHP_VERSION < 6)
+-				@set_magic_quotes_runtime($current_magic_quotes);
++				ini_set('magic_quotes_runtime', $current_magic_quotes);
+ 
+ 			return $pass;
+ 		}
diff --git a/net-nds/phpldapadmin/metadata.xml b/net-nds/phpldapadmin/metadata.xml
index 000d4c287a52..6779c3452c8a 100644
--- a/net-nds/phpldapadmin/metadata.xml
+++ b/net-nds/phpldapadmin/metadata.xml
@@ -3,8 +3,14 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-		<email>vostorga@gentoo.org</email>
-		<name>Víctor Ostorga</name>
+  <email>vostorga@gentoo.org</email>
+  <name>Víctor Ostorga</name>
 </maintainer>
-<longdescription>phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server.</longdescription>
+<maintainer>
+  <email>jmbsvicetto@gentoo.org</email>
+  <name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+<longdescription>
+  phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server.
+</longdescription>
 </pkgmetadata>
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.1.1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.1.1.ebuild
new file mode 100644
index 000000000000..4a04a475a749
--- /dev/null
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.1.1.ebuild,v 1.1 2011/10/20 19:38:09 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}/${P}-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
+}