Revbump that should work with php 5.4. Bug 423869. Thanks to hanno for digging up the patch

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 86 insertions, 3 deletions

diff --git a/dev-php/pecl-crack/ChangeLog b/dev-php/pecl-crack/ChangeLog
index 178d85e50ded..5b706795c3d1 100644
--- a/dev-php/pecl-crack/ChangeLog
+++ b/dev-php/pecl-crack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-crack
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/ChangeLog,v 1.1 2011/12/14 22:32:31 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/ChangeLog,v 1.2 2012/08/19 08:41:34 olemarkus Exp $
+
+*pecl-crack-0.4-r2 (19 Aug 2012)
+
+  19 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  +files/fix-php-5-4-support.patch, +pecl-crack-0.4-r2.ebuild:
+  Revbump that should work with php 5.4. Bug 423869. Thanks to hanno for digging
+  up the patch
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> pecl-crack-0.4.ebuild:
   Drop sparc keywords
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
index 31d7485b7aee..1c5f4189f715 100644
--- a/dev-php/pecl-crack/Manifest
+++ b/dev-php/pecl-crack/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fix-pecl-bug-5765.patch 375 SHA256 1a4f72c1c51cbc95eaa68776fdc677a740ae2cc04e21000a2260548fb7f85b74 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500 WHIRLPOOL 040ae981d77681384f96f4c4713a0668b33e7e3c8551edbc1c80c0372f6387b457920b4695c8b8bffbcad2afaae3fce8ac5c3960992c70af61c1c7bef88b4ab9
+AUX fix-php-5-4-support.patch 704 SHA256 174cbbf61218b3e34b0d615c3bd9568a1c55d58eb29f7afcc6b05bf0deb05ee2 SHA512 e42a28874f538ef5ae1e2dcf5e9aac40a051a3af1a85afe47a283affcd38fe846c37ac1f46dae3bbe3ebdb9fc4dac5245f5ba3023f315bf188ba0a9af910f294 WHIRLPOOL d658c30934f8580f369461fef5f9b0a3273a1cb524fd0eeeee3fc01f413c6c71eedd6b1c40e5899d9c39685356f44de3d54adf02b2eb9e3aa63cc10259ef7979
 DIST crack-0.4.tgz 25524 SHA256 00a5250a6c82b39c1aefcb6e1ce0980da5df49c9bfc6ade9a8e867d89e87f560 SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f WHIRLPOOL 2b6d26cf65912f6fac72733711ed48e0c859df28a3c7a2b351e607edcc51f15fea7cfef01419b3fd56267ddf9c57f4a75f93e64015c0db9d14e5799ac1a411c7
 EBUILD pecl-crack-0.4-r1.ebuild 690 SHA256 a59c84497adbc3dcec57966276f6d28efa30911535a0d4b3312a369c6b1a66f7 SHA512 e5e6a9755728b05e2f44b14c4181890b47d1b88b3ae33b66c3fb6c72f0b7bb7f5a12ed12324882dbfa6a3a4be43f9432842fbaeada983d4750fd5a1e07e7c3db WHIRLPOOL ece56e598b79b8d9545266bc03c663f73fc25cc1a4db543801ddc54e778e2ad648c8d5748457ffaebc5924c456d56b4b31e20afb3cf17f4d99aca709a3805b66
-MISC ChangeLog 3467 SHA256 b7943d89c3d1d618f49cd5a61589cbb2af266e1b378d19593fe42a8ec39c04d1 SHA512 3304f5741235b210e7f49486ae9c859de4cd5c61d28c0968c8f64d74a52a5b7a508ae06323b3a402a7319611fafcb68f420a461507a9e78264339305287f2055 WHIRLPOOL e1b2945270cb62e8c733b0205433de44777893394f1c5cbf72cd783a9f801e96970ad820fecbe6e0a1767f65681d39f6d89028fd78d33f37741d1b2bcc6f8a1e
+EBUILD pecl-crack-0.4-r2.ebuild 681 SHA256 6d63f4af1aae64db82ea0106c2dbbc2fcaecb5f578f6849966dafae9789d51cf SHA512 7df611fd1371a7338df68f6e4755b4d65fc85ec61f3ae16f11fbc5abd191f1ec524a95af0cc543dff76d28cd49dae2710b26167b517568c9c42a1736999ccc29 WHIRLPOOL 7b8c302ffe7df935ce374fe65ec74f4a4935b909233ec9d63b66ddc2ae71d3725d4f0c81f495c3e17621eb12a4fec4c72dfc82890c2e31798694fc26e5a97cf3
+MISC ChangeLog 3720 SHA256 e195225f1d9b83092ea0e5780b6a015e2b14a8b3c66036444a88381263c7eefa SHA512 f5d1b83fc8c4f545fc13216f703aeb4182f88557da083a93077ee073d7f047ff278a84aba9992db3e4ca8c3bf3dd2704505474569153be8e8cfb9c839e83792d WHIRLPOOL fc5a4e61d3aae380451dd482f5e6020638ecaf614dec0f69bfd2278d22cf9bbf50f6dee92efd61ea8e19057daf047ce7d94d5bcbba4b1654a8735a1f497debaa
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQMKbGAAoJEGurSuXEqSv1m9sH/0/BnqVO9wvAfvA4KWz14ONI
+Hx//MAaywjXgem+/lPJjfXSXWMQl5gW1jpm8tbd/cPcxhBz2B/fzv7dXqvq67J0p
+7ouzmb6ByjixL3d2AoIMaI4DkiVGxTptTpinYBHNrRgMCnga1KvnFheL0+qgUp8P
+s6iLIOfbBXUdBAnoUohvSpQa8yBninfuv7WdrnBWCqaAkOj+Mx6oD4ry2Lrptjiz
+YR+aMviwg9g3zFAjm0Hj7qcAgEr43STDZwL5OYeu530C2ab0NskhRdxx31Ce5cCw
+by2R2/R24Qfnj4CXfwdxIt8wwtZBxp5ozpa/FNbrwKDWDDhLV6CHbydNo8I4qYM=
+=igvA
+-----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-crack/files/fix-php-5-4-support.patch b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
new file mode 100644
index 000000000000..4709ad8dd116
--- /dev/null
+++ b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
@@ -0,0 +1,30 @@
+Gentoo bug: 423869
+Thanks to hanno
+
+--- pecl/crack/trunk/crack.c	2008/07/17 10:02:47	262854
++++ pecl/crack/trunk/crack.c	2012/06/07 16:13:34	326013
+@@ -38,7 +38,7 @@
+ 
+ /* {{{ crack_functions[]
+  */
+-function_entry crack_functions[] = {
++zend_function_entry crack_functions[] = {
+ 	PHP_FE(crack_opendict,			NULL)
+ 	PHP_FE(crack_closedict,			NULL)
+ 	PHP_FE(crack_check,				NULL)
+@@ -94,6 +94,7 @@
+ 	int filename_len;
+ 	int result = SUCCESS;
+ 	
++#if PHP_VERSION_ID < 50400
+ 	if (PG(safe_mode)) {
+ 		filename_len = strlen(path) + 10;
+ 		filename = (char *) emalloc(filename_len);
+@@ -125,6 +126,7 @@
+ 			return FAILURE;
+ 		}
+ 	}
++#endif
+ 	
+ 	if (php_check_open_basedir(path TSRMLS_CC)) {
+ 		return FAILURE;
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
new file mode 100644
index 000000000000..45f800ab5b18
--- /dev/null
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild,v 1.1 2012/08/19 08:41:34 olemarkus Exp $
+
+EAPI="4"
+
+PHP_EXT_NAME="crack"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="EXPERIMENTAL"
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP interface to the cracklib libraries."
+LICENSE="PHP-3 CRACKLIB"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots) ; do
+		cd "${WORKDIR}/${slot}"
+		epatch "${FILESDIR}/fix-php-5-4-support.patch"
+	done
+	php-ext-source-r2_src_prepare
+}