diff options
| author |   Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2010-11-11 11:57:41 -0100 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2010-11-11 11:57:41 -0100 |
| commit | e0de0797f8b30a314cdec7445b37d88d84771713 (patch) | |
| tree | 6783b5553fac6bc8a0fae0a63c82665ebf3d0ef1 /net-nds/phpldapadmin | |
| parent | Imported phpldapadmin and bumped to 1.2.0.5 release. (diff) | |
| download | jmbsvicetto-e0de0797f8b30a314cdec7445b37d88d84771713.tar.gz jmbsvicetto-e0de0797f8b30a314cdec7445b37d88d84771713.tar.bz2 jmbsvicetto-e0de0797f8b30a314cdec7445b37d88d84771713.zip | |
Added patch to fix the use of *_magic_quotes_runtime that is deprecated with php-5.3.
Diffstat (limited to 'net-nds/phpldapadmin')
| -rw-r--r-- | net-nds/phpldapadmin/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/phpldapadmin/Manifest | 5 | ||||
| -rw-r--r-- | net-nds/phpldapadmin/files/phpldapadmin-fix-magic-quotes.patch | 23 | ||||
| -rw-r--r-- | net-nds/phpldapadmin/phpldapadmin-1.2.0.5.ebuild | 4 |
4 files changed, 35 insertions, 2 deletions
diff --git a/net-nds/phpldapadmin/ChangeLog b/net-nds/phpldapadmin/ChangeLog index 11e5ff6..b46dffd 100644 --- a/net-nds/phpldapadmin/ChangeLog +++ b/net-nds/phpldapadmin/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + phpldapadmin-1.2.0.5.ebuild, +files/phpldapadmin-fix-magic-quotes.patch: + Added patch to fix the use of *_magic_quotes_runtime that is deprecated + with php-5.3. + *phpldapadmin-1.2.0.5 (11 Nov 2010) 11 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest index 302e8fc..cc108f8 100644 --- a/net-nds/phpldapadmin/Manifest +++ b/net-nds/phpldapadmin/Manifest @@ -1,5 +1,6 @@ +AUX phpldapadmin-fix-magic-quotes.patch 907 RMD160 62ae95f4c3da3e62d9ac5da09feab003a48a3747 SHA1 f19ad4b6e639acadf1dab208a8686f6f50c69c07 SHA256 10beefdc89c03fb6c13cb25fb38f4c9837b7ad4f23de97cf24273d093fddd398 AUX postinstall2-en.txt 131 RMD160 f1f681b3b5094f555e6adfca8d70d4ca1b14ae4b SHA1 deecc59339d6c83dad797c0f8cfab9ea0110153a SHA256 e2dc7bea366789a303eb9a90d1bced655cea00469202859af40bf19c00505d38 DIST phpldapadmin-1.2.0.5.tgz 1345901 RMD160 7b3e194420d7360001faa709b046423d8ac939bf SHA1 0720ec05bfe91520bdd15e38c79f949f18d355eb SHA256 ee75da1dbba023499fdf50d6cedea9bcdb9caad017b15ed2e31700bcc61dfcfd -EBUILD phpldapadmin-1.2.0.5.ebuild 983 RMD160 2228477215296b381a25ece0ac9f81d4cdead10e SHA1 340b6602090d046c526914f56a2ad55023f3e334 SHA256 cbb2de3c6c29336841d910feaf10b559158f85031f47b52d3f1574f2d985b79b -MISC ChangeLog 356 RMD160 20685bd873dafbaf1633b3360bca3408b2876620 SHA1 c5b9711a604d11442a2d73df0ccddb4afc8870d1 SHA256 4335b5f22e55bfd8a4b361b73ea1b9b72c4d8c641eba03b284b9caf6b5499933 +EBUILD phpldapadmin-1.2.0.5.ebuild 1053 RMD160 2df5af481c89c19a8248accf8d9bd9b12c76eaa4 SHA1 7c67cb6558a7ff121f0cc2640084e2b02f0be5cd SHA256 4e0ba7be4a40d229b1bc9749f7082121ab7464a5673ecda570557c965b857bf3 +MISC ChangeLog 589 RMD160 60bccaa3f49acd72160abbb3939e6f894d8681d4 SHA1 a4646fae5b810b084ba2806374b97637dc726eda SHA256 9b9960e9c490c4f3d103c0475c1f881d11cec59ea0fe40a08fe3eeb9d75fabad MISC metadata.xml 380 RMD160 c812cb4fabdae73f62c2d8cffa1ec1981d4a8d9a SHA1 9ba2c1eaa4175898656e7b78bab91bbcf67503de SHA256 47eaae7cd8741cc282bc0877ed4a848c04ea2f437de6c6065982a7369e08b574 diff --git a/net-nds/phpldapadmin/files/phpldapadmin-fix-magic-quotes.patch b/net-nds/phpldapadmin/files/phpldapadmin-fix-magic-quotes.patch new file mode 100644 index 0000000..10600c6 --- /dev/null +++ b/net-nds/phpldapadmin/files/phpldapadmin-fix-magic-quotes.patch @@ -0,0 +1,23 @@ +diff -urN phpldapadmin-1.2.0.5/lib/emuhash_functions.php phpldapadmin-1.2.0.5-new/lib/emuhash_functions.php +--- phpldapadmin-1.2.0.5/lib/emuhash_functions.php 2010-01-30 04:21:20.000000000 -0100 ++++ phpldapadmin-1.2.0.5-new/lib/emuhash_functions.php 2010-11-11 11:52:10.802038291 -0100 +@@ -58,8 +58,8 @@ + function openssl_hash($openssl_hash_id,$password_clear) { + global $emuhash_emu; + +- $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'); + $pwhandle = fopen($tmpfile,'w'); + +@@ -73,7 +73,7 @@ + $pass = fread($prog,1024); + pclose($prog); + unlink($tmpfile); +- set_magic_quotes_runtime($current_magic_quotes); ++ ini_set('magic_quotes_runtime', $current_magic_quotes); + + return $pass; + } diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.0.5.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.0.5.ebuild index 6dcea61..dbdf4c0 100644 --- a/net-nds/phpldapadmin/phpldapadmin-1.2.0.5.ebuild +++ b/net-nds/phpldapadmin/phpldapadmin-1.2.0.5.ebuild @@ -26,6 +26,10 @@ src_unpack() { mv config/config.php.example config/config.php } +src_prepare() { + epatch "${FILESDIR}/${PN}-fix-magic-quotes.patch" +} + src_install() { webapp_src_preinst |