[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.

(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)

4 files changed, 87 insertions, 4 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/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
+}