Add a patch to allow phpldapadmin to build against php-5.5. Bump to EAPI 5. Fixes bug 482340 - thanks to Alexander Stein.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

4 files changed, 227 insertions, 17 deletions

diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog
index b95a77bd2dfd..49944577c514 100644
--- a/net-nds/phpldapadmin/ChangeLog
+++ b/net-nds/phpldapadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/phpldapadmin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.57 2012/11/12 12:04:32 jmbsvicetto Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/ChangeLog,v 1.58 2014/04/11 01:36:30 jmbsvicetto Exp $
+
+*phpldapadmin-1.2.3-r1 (11 Apr 2014)
+
+  11 Apr 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/phpldapadmin-fix-php5.5-support.patch, +phpldapadmin-1.2.3-r1.ebuild:
+  Add a patch to allow phpldapadmin to build against php-5.5. Bump to EAPI 5.
+  Fixes bug 482340 - thanks to Alexander Stein.
 
 *phpldapadmin-1.2.3 (12 Nov 2012)
 
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index aad02d38f1e5..c48288673f63 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -5,6 +5,7 @@ AUX phpldapadmin-1.2.1.1-fix-cmd-exploit.patch 716 SHA256 b0c7822c7e36d037e15839
 AUX phpldapadmin-1.2.1.1-fix-functions-exploit.patch 939 SHA256 94344146e0434ac7c70375f4cbfef9bcd40897c06fb3eddc0b39eaed0c5c669d SHA512 0668f5d2e8b7882b9e092ac089d7ec18fe78f3bd67c5a4d7abeba044e65a6385e3f69205e2f3a3ef3a99ffd84be95c66ed3573ce78ce6c60c2b4f6237aa35a37 WHIRLPOOL 81e2f45244f2a1483f05a600b2c39b7a3a21329220f54737dc928e6e755db07fc69d57a3aa37d93604e711d4927b9bd8b84436bf0f74ba4f91bffa06a273dcbd
 AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 SHA256 7cce069d30a5c4067743de8e91d0d6bd4d9faaaf169ed342a3890bf07ced8817 SHA512 64830cc864dbbe3d0aa72d0e1165b787287430f3ea7507c8e9df2115b03df73944c63a4e9c09a7f8c9a11d41f48327ee26c204ede3bae2209b0f47076d5587b3 WHIRLPOOL a539598b966e53b3df565711546adea1515621d015b3c1de4375a7d92735c56d551101d1cbfd0d216fdd843ad1311573cb4ac7867d175ecd8e8154da6fc1b794
 AUX phpldapadmin-1.2.2-base.patch 1115 SHA256 33c012fc00d0a170ff57e50624ec0e1018ace3fe9350a5a02ffe2ae8e1751d33 SHA512 d44c85a7cc6a6a0502e049e39127c11c196f08f1e5363422343ff8a63e49a1a2ffd7b7c46a4a4ac7623f2efad564dc60f240a2b3c4d2242a53df4163ff0ee82d WHIRLPOOL 9d28ca35ce5926f58456df07d38e1e9e2d0ad8e080a196bdbc607217a3db5f34daa3657188b831c4075b53099c16bc2e8ae6b32a05d645f41da89159382aef7a
+AUX phpldapadmin-fix-php5.5-support.patch 5157 SHA256 bc9c6ff55c4559007bfaf884ff34ce621de7ae27c4a82c89c6af36cab6b92003 SHA512 c0f990fea6e8f312d36f7eea754d3f4f1c2356a5e233c5df82fa1ce4b194d160ad40ce2ef85441f6686feecffae831770591e44cc67982bee63e870464da7f7b WHIRLPOOL 2b0a69d00246c6572e7f3f1974656bda2b91ae8bbe3c31470045943f9a65e35a5012baaf8c4dcc7668ea9401aa5ccb9ac9753a393997232916dc62b9169bba9e
 AUX postinstall2-en.txt 131 SHA256 e2dc7bea366789a303eb9a90d1bced655cea00469202859af40bf19c00505d38 SHA512 f465adc204ef40675848e39e37bab3f2eb5054549e3b787953793ece683df84a52373d23383601b3c53c6b98bf8f1de83c6d83be117be9c00da7058763709d6b WHIRLPOOL 1903859baaaf44d93eaae4605878d282c8c7020cbab9e7b670b11716433dc5a6d70074ceec2a80533727e0e72c5f6325b03b65fab1bf8692684bd57dc9223b39
 DIST phpldapadmin-1.2.0.4.tgz 1291545 SHA256 e4887ed0db63c926162d79d603add21a669103ad2f75a7b90686a18eed8a6330
 DIST phpldapadmin-1.2.0.5.tgz 1345901 SHA256 ee75da1dbba023499fdf50d6cedea9bcdb9caad017b15ed2e31700bcc61dfcfd
@@ -17,23 +18,24 @@ EBUILD phpldapadmin-1.2.1.1-r1.ebuild 1359 SHA256 f1f21dc696d4f862bfffdf45bd8b0b
 EBUILD phpldapadmin-1.2.1.1.ebuild 1129 SHA256 40f439fbda56140a71f345358aeb603b17440464497a0168b28368a157ca5591 SHA512 778660012b1fb5f9ad79423d0d8f48773fa9fea03e2ea00ba871ea5256ca9667096feb6322abdac6a582cc6521f0c7c52a8500115726eba1cc3cdf3baa98504d WHIRLPOOL 9122097285cb27b93ecc9ceb90750182ea6523d714c410ea6c7d24ea999917d8e087da862c1fa3d7d41f68954235c3e47e2e3c56b1d2c76622428ae8cdaa738e
 EBUILD phpldapadmin-1.2.2-r1.ebuild 1315 SHA256 28fff8e9869aae9519cfadd4e24e8acbbb509e18b0eef5ab8f9a9d372aba933c SHA512 c37a6d8ca8155ff145d3e8f3394c0ced4fce34556d41358044d335418d4a723fa15a5ddd0168c9f04d9b754705ae6da1400178b059e356d0f4b52bd39387685f WHIRLPOOL 152e91e4986bc088a74fa479580bade5d395a91e831c38377c2ab4a80243dc69bb5383f79b3c2a1083f8e312c5d2213305cdb936c0e06411b0ebb54e3a07f9b4
 EBUILD phpldapadmin-1.2.2.ebuild 1136 SHA256 301a656b15c19f35f85c9bae9607fff14c4c58664849b0dd10bb97a53d0f3f65 SHA512 4f085d667979d58c50cf5a4032a2d80c5c6410ce58d0aaf9bb5c5cf96cbd981876d909b67044e9ab61637363e22b3aa131e42b1e37fbcf7954d1656c559edbe8 WHIRLPOOL 9eba2b05ad32458567ed2a493411f8768833691fd7959071137aa9f7c45f671784567e3f8a6997581e18cfdfa2802ef995e43875a1933f150493f4eba52458bc
+EBUILD phpldapadmin-1.2.3-r1.ebuild 1517 SHA256 55645e77daaf0992ad164134e9d77cb4b0b519030b6dde822216756c4905a3e7 SHA512 12f57194efe23cba76d016d45a9710dfdc96c7ff1bfc8b5f5dfae8fa51627880094c1661ec0fc99786b9a4171346897df02d8cdcc7daece923b0f9176c7765ca WHIRLPOOL 50f98994bd4879e55bd5c07b339bd9ed75e468bbe9cf3cef0ecebd810c652721cd453f526a0d797ca19cb5fe5181885bb0256ee3705fdca6314135742b225b08
 EBUILD phpldapadmin-1.2.3.ebuild 1274 SHA256 5d1a3ec34b1b2d9ee6e3837cb83e964c373a0f1b961135835a33a3d877a4d86a SHA512 317c2c38434c03fe1297d43ae2c78c724d6e6ebdc67f7bc53b9af2af9b317917ce3d5b9e7bbb9a37b1e4c7fa1b6e1dbb4c777db284a33a111284c6a1e4562e16 WHIRLPOOL 77a10d5d73fd139ad8bbaa166c293adc9a47cbc60214da7149e49b99da2119982ea134ead487a9b5abc1a24c1485e9618ab924b27ea8e222c79ffe7886bc1736
-MISC ChangeLog 9686 SHA256 9ec648816c0ea54abae0cad00e4ad90e42eddb3f8b4892718e2b348f553b65d9 SHA512 61b68d707bba9810da6d741672dd390359c5b8d9f14f1d519f0f66ed9e3a1604b43bd0126b3403abec5ce4737356416cfe9bed62920e873db83cbb97378d11f8 WHIRLPOOL 26fc24b299ec5a049bfa7f473680d7b52311cd70487b177cb9a9110aeb7f59d6b2448224de7e0850a1b3979d54e2133d62df51397a68f9492ccd75b4bc330b93
+MISC ChangeLog 9997 SHA256 4e76e36520ae6bb75fbb5468cf2acd07dd415bc4ededc65cb384b71a75d5e80d SHA512 731e53d90832bdbbd029db4fd51615020c34b2f15175c22b171689115a723d66041cdfb5c87edcf549d9211dba61638a48782b5654340411f887f9236fe5a875 WHIRLPOOL f06acfc3239dbce9b85374840424dc4d280f31bd165b05b29f8e107d232dc4ed936def689437a6419350835762c16c3bf7cf9b89bd933ea3cbd598577ca3dcb2
 MISC metadata.xml 483 SHA256 4da024bde528d8117f42de927efa5e86dd4445b018a818608e1db16969957186 SHA512 a7c5dc00056dbb3a8ea5257813ac1c46ff47a61ce3bff3ebcee72958a002d5431014ddcbf1c360af18ef8add9028f69d96f25eeb5ec90f593d45f6c650ca40a4 WHIRLPOOL 6d16bccda8ef58a5802e4169d250128dfc92e023af8743834f3819605aa27f500b4c08a943e1f6762623ebf4ac53689fc53f9572976e9cea4d9fa7ec09311c37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQoOWhAAoJEC8ZTXQF1qEPDH8QAJoP921F5g6eybv9WUmNk5EC
-pCHNsiHKWOJ9HbSvX/adWZMmReD5wUyH5uzeb3wmfF7+YUbTmy6Es33Z4ABGEIai
-3Tw8RfXTyELtQj3Z2x8vXL6fucSQqYoYvV/GWcLOiyx3NFMQD4ECZBKLtLQkVLIO
-gzrlqXPc8zJPUCaELRz+9FU9f7qOorTT5/CSgfEg/k0gyQxNr+fOXwgYgiZtYnqA
-bfhzL6Fni97twJ+k2j70KBa5nEM5kramWXwec77bhh5iWDFSIbIOKrd3e/f1N371
-7WFUIkKlorWJ9Zupg589qRauXNxR9fD5kaS8qy5sH0kLpiMM05ZokmbHbtCgGCP6
-YsqBI2dTf6tFknQ/VPNQEnE0JNAyONBQbQCaROCm3MqcjEmPIB5u06l1gguFdPsb
-48kzYz/T0nBEuCVFiJ6Syr0qKMczz0rJlDgM7AZdVKEFcZpiogIQYbNfEJYGC3p6
-0yRFuTirDtvgT6+zhzqPbg4nwt1KKG7Juf0HGakSvfsDy09XMZmCkZi/Aqxb5UfY
-2mkCcHNKpInTFEloF0dtQmePW33v/xfU2G2ALcUijmC6+6Bwk9FGCtdVNoiqqZfe
-1GLxass+reIbaSVf/UatrfDIp85pBnQYm/qVdYEgcYc/E3pUV5n7+Coxbb0rvf/n
-DSAUkyplPotgglrmP7DS
-=9cWQ
+iQIcBAEBCAAGBQJTR0XBAAoJEC8ZTXQF1qEP+9YQAIzATIfZQxRV98WYLgvoY75v
+8rCmkyD0aPFx65Al+bryPqjcRmFdRHACTpL8GaCL3pjGcPcNgsvgO1Fj6j8FL2/N
+11G86O/GYprQZTbTfwVt99NmmTrNSlKaqusZKAkjzO9uoqmZsK6ax9rVjjFRybgK
+EQ0DdjvGucJFsrAMZlFOed06l6sHo+FeOCYWJvPXc10MDzAYZgRdYNuWtzUQ1fXP
+MRQ1jYEwwLdoF3V9BThEnz5jUI9qcjDqSO+wjHoeM2E6uJsDZt75cAGd45+2j4/o
+FMvF3+Z98HqWqMZGQE93KR6uVnhui8okamzUnDaX/IOiKzVlp6/DR1mTAvfFQoBV
+VdD6yC8vk4WMjJo5LQ75sblrKF4yBAmOJAmpU7jsxUQH7ERITPyEdUmI8pwhv2ii
+2uOGr/Ca6AxuI94wbVBBxSWfkmoTPcq7vZrxzatAwBOqKDcw0hRMnZQ/093VR84L
+o38VIctqhPsiUEG9RejWFUoLWZcYykextuKQOfKPzGkQSgSfFtF8fUdpuLcWvIi5
+XMi/qrDr37E4rNqTmzGP4yuXThN/1UQozayUa9g8xuleX1IGRbsYvhrLLbWZUq1J
+yH/UQyEkCyAkbW60eJ8ejMK+SThAQNIxyomIgeggLCIxgVAxyuyadQrjCDIDYfcE
+AGzqb1MMQq6tq1lNRIAs
+=RwrP
 -----END PGP SIGNATURE-----
diff --git a/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch b/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch
new file mode 100644
index 000000000000..df6a7c163758
--- /dev/null
+++ b/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch
@@ -0,0 +1,152 @@
+commit 7e53dab990748c546b79f0610c3a7a58431e9ebc
+Author: Michael Laccetti <michael@laccetti.com>
+Date:   Thu Aug 29 09:13:56 2013 -0400
+
+    Fixed two issues to get phpLdapAdmin to work under PHP 5.5.x
+    1) password_hash is an actual function, so renamed instances to password_hash_custom (HT: https://sourceforge.net/mailarchive/message.php?msg_id=31302386)
+    2) Fixed the preg_replace to preg_replace_callback to use the /e/ functionality in the officially endorsed fashion
+
+diff --git a/lib/PageRender.php b/lib/PageRender.php
+index 7d86a54..eed5d5f 100644
+--- a/lib/PageRender.php
++++ b/lib/PageRender.php
+@@ -287,7 +287,7 @@ class PageRender extends Visitor {
+ 						break;
+ 
+ 					default:
+-						$vals[$i] = password_hash($passwordvalue,$enc);
++						$vals[$i] = password_hash_custom($passwordvalue,$enc);
+ 				}
+ 
+ 				$vals = array_unique($vals);
+@@ -957,7 +957,7 @@ class PageRender extends Visitor {
+ 		if (trim($val))
+ 			$enc_type = get_enc_type($val);
+ 		else
+-			$enc_type = $server->getValue('appearance','password_hash');
++			$enc_type = $server->getValue('appearance','password_hash_custom');
+ 
+ 		$obfuscate_password = obfuscate_password_display($enc_type);
+ 
+@@ -982,7 +982,7 @@ class PageRender extends Visitor {
+ 		if (trim($val))
+ 			$enc_type = get_enc_type($val);
+ 		else
+-			$enc_type = $server->getValue('appearance','password_hash');
++			$enc_type = $server->getValue('appearance','password_hash_custom');
+ 
+ 		echo '<table cellspacing="0" cellpadding="0"><tr><td valign="top">';
+ 
+diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php
+index c346660..7532539 100644
+--- a/lib/ds_ldap.php
++++ b/lib/ds_ldap.php
+@@ -1116,13 +1116,24 @@ class ldap extends DS {
+ 
+ 		if (is_array($dn)) {
+ 			$a = array();
+-			foreach ($dn as $key => $rdn)
+-				$a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++			foreach ($dn as $key => $rdn) {
++				$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++					function ($m) {
++						return ''.chr(hexdec('\\1')).'';
++					},
++					$rdn
++					);
++			}
+ 
+ 			return $a;
+ 
+ 		} else
+-			return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++			 return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++				function ($m) {
++					return ''.chr(hexdec('\\1')).'';
++				},
++				$dn
++			);
+ 	}
+ 
+ 	public function getRootDSE($method=null) {
+diff --git a/lib/ds_ldap_pla.php b/lib/ds_ldap_pla.php
+index 7ece393..6b0990e 100644
+--- a/lib/ds_ldap_pla.php
++++ b/lib/ds_ldap_pla.php
+@@ -16,7 +16,7 @@ class ldap_pla extends ldap {
+ 	function __construct($index) {
+ 		parent::__construct($index);
+ 
+-		$this->default->appearance['password_hash'] = array(
++		$this->default->appearance['password_hash_custom'] = array(
+ 			'desc'=>'Default HASH to use for passwords',
+ 			'default'=>'md5');
+ 
+diff --git a/lib/functions.php b/lib/functions.php
+index 56d8bf3..5ac3caf 100644
+--- a/lib/functions.php
++++ b/lib/functions.php
+@@ -2127,7 +2127,7 @@ function password_types() {
+  *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
+  * @return string The hashed password.
+  */
+-function password_hash($password_clear,$enc_type) {
++function password_hash_custom($password_clear,$enc_type) {
+ 	if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+ 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
+ 
+@@ -2318,7 +2318,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
+ 
+ 		# SHA crypted passwords
+ 		case 'sha':
+-			if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
++			if (strcasecmp(password_hash_custom($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
+ 				return true;
+ 			else
+ 				return false;
+@@ -2327,7 +2327,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
+ 
+ 		# MD5 crypted passwords
+ 		case 'md5':
+-			if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
++			if( strcasecmp(password_hash_custom($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
+ 				return true;
+ 			else
+ 				return false;
+@@ -2392,7 +2392,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
+ 
+ 		# SHA512 crypted passwords
+ 		case 'sha512':
+-			if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
++			if (strcasecmp(password_hash_custom($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
+ 				return true;
+ 			else
+ 				return false;
+@@ -2564,13 +2564,24 @@ function dn_unescape($dn) {
+ 	if (is_array($dn)) {
+ 		$a = array();
+ 
+-		foreach ($dn as $key => $rdn)
+-			$a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++		foreach ($dn as $key => $rdn) {
++			$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++				function ($m) {
++					return ''.chr(hexdec('\\1')).'';
++				},
++				$rdn
++			);
++		}
+ 
+ 		return $a;
+ 
+ 	} else {
+-		return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++		 return  preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++			 function ($m) {
++				return ''.chr(hexdec('\\1')).'';
++			},
++			$dn
++		);
+ 	}
+ }
+ 
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..690ec5d1e434
--- /dev/null
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild,v 1.1 2014/04/11 01:36:30 jmbsvicetto Exp $
+
+EAPI=5
+
+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"
+	# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd
+
+	epatch "${FILESDIR}/${PN}-fix-php5.5-support.patch"
+	# http://sourceforge.net/u/nihilisticz/phpldapadmin/ci/7e53dab990748c546b79f0610c3a7a58431e9ebc/
+	# This patch has been requested to be merged, but there's no recent activity by upstream
+}
+
+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
+}