Fix for http://pecl.php.net/bugs/bug.php?id=5765. Patch by Lars Strojny <lars@strojny.net>.

Package-Manager: portage-2.1.2_pre2-r6

4 files changed, 41 insertions, 13 deletions

diff --git a/dev-php5/pecl-crack/ChangeLog b/dev-php5/pecl-crack/ChangeLog
index 74c7551778c0..9dc3c5daa2e3 100644
--- a/dev-php5/pecl-crack/ChangeLog
+++ b/dev-php5/pecl-crack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php5/pecl-crack
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.11 2006/09/29 07:17:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.12 2006/10/08 19:45:08 sebastian Exp $
+
+  08 Oct 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  +files/fix-pecl-bug-5765.patch, pecl-crack-0.4.ebuild:
+  Fix for http://pecl.php.net/bugs/bug.php?id=5765. Patch by Lars Strojny
+  <lars@strojny.net>.
 
 *pecl-crack-0.4 (29 Sep 2006)
 
diff --git a/dev-php5/pecl-crack/Manifest b/dev-php5/pecl-crack/Manifest
index 4abda4a33228..99004211175f 100644
--- a/dev-php5/pecl-crack/Manifest
+++ b/dev-php5/pecl-crack/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fix-pecl-bug-5765.patch 375 RMD160 ffa88c2df971ad7979e3c3ec4c2d1c850e3fef19 SHA1 9c922ce9c4cafc52d746cdb89c0fd6b8ed570ae7 SHA256 1a4f72c1c51cbc95eaa68776fdc677a740ae2cc04e21000a2260548fb7f85b74
+MD5 3e38dd470a508ceeb7da6ea7db8a2ef4 files/fix-pecl-bug-5765.patch 375
+RMD160 ffa88c2df971ad7979e3c3ec4c2d1c850e3fef19 files/fix-pecl-bug-5765.patch 375
+SHA256 1a4f72c1c51cbc95eaa68776fdc677a740ae2cc04e21000a2260548fb7f85b74 files/fix-pecl-bug-5765.patch 375
 DIST crack-0.4.tgz 25524 RMD160 335b1cecb0ccd958fa01c499a636e0e22a5a46ea SHA1 aa1554747ef2d1c96e4a47fdb0057828661a918a SHA256 00a5250a6c82b39c1aefcb6e1ce0980da5df49c9bfc6ade9a8e867d89e87f560
-EBUILD pecl-crack-0.4.ebuild 463 RMD160 cd965d289284bf6668670f42b282273e7c81c608 SHA1 c5acbee5263a0926c6044ed995b77e3419c3711b SHA256 98cf0bad74d543268071ed2b6bbd807d889b5001b7c0e4ed335023ebebc17db2
-MD5 e65862fe423f565fe42bbc2e879cba16 pecl-crack-0.4.ebuild 463
-RMD160 cd965d289284bf6668670f42b282273e7c81c608 pecl-crack-0.4.ebuild 463
-SHA256 98cf0bad74d543268071ed2b6bbd807d889b5001b7c0e4ed335023ebebc17db2 pecl-crack-0.4.ebuild 463
-MISC ChangeLog 1588 RMD160 357d6003c61256521dbf352ecc8938bf2ced6fb7 SHA1 efd0ab0aba495186c73c3afc892cfefeef73dfc2 SHA256 79095dc690d54bee01a3dcc53356aba2a81e0afa66e078b6f5d5978ebc3bc36b
-MD5 df6e190a30f363d5772f51e6ae465e63 ChangeLog 1588
-RMD160 357d6003c61256521dbf352ecc8938bf2ced6fb7 ChangeLog 1588
-SHA256 79095dc690d54bee01a3dcc53356aba2a81e0afa66e078b6f5d5978ebc3bc36b ChangeLog 1588
+EBUILD pecl-crack-0.4.ebuild 606 RMD160 e7a08f802e5baa07cbdbc6d38c6f0028622d8945 SHA1 de58f59f4922e0a0cf5dae63dfbcfffe2eb52848 SHA256 51be1c6043bf2d5ff8e3dd5ca2d2a30dad2500317d6945230788f9a165f917fd
+MD5 ec9ec684ed028ff496f9f8d6ce5e8b07 pecl-crack-0.4.ebuild 606
+RMD160 e7a08f802e5baa07cbdbc6d38c6f0028622d8945 pecl-crack-0.4.ebuild 606
+SHA256 51be1c6043bf2d5ff8e3dd5ca2d2a30dad2500317d6945230788f9a165f917fd pecl-crack-0.4.ebuild 606
+MISC ChangeLog 1799 RMD160 96723b3f866f7d2f2897dd5e3a01b772dfe0a38e SHA1 5bde0a48bfcf1e5a07625e8821f1afa9bee4dbbe SHA256 1f40025f0d3f4667d9dce7283d6ae12529d6bd6750931ad4a04febeeb8528591
+MD5 ebf62b2a2623008eae6a5a381b5ac733 ChangeLog 1799
+RMD160 96723b3f866f7d2f2897dd5e3a01b772dfe0a38e ChangeLog 1799
+SHA256 1f40025f0d3f4667d9dce7283d6ae12529d6bd6750931ad4a04febeeb8528591 ChangeLog 1799
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -20,7 +24,7 @@ SHA256 23496a5eaff76efb6ad04a1e45943a935bcac061306db6504577d7066ed244a4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHMiTaGfFFLhbXWkRAuN+AKCD8ThgkXAVVDcHDEE3krhJmPWM3gCfSY+c
-Ctgcxna8k4wugvAzfJ7AFL0=
-=CQI0
+iD8DBQFFKVVKaGfFFLhbXWkRAt6nAKCKv7IXwXDjX9sUVQ6ixTVVqZDAYgCfQYju
+iJ8hgGTwi7jdhqkJD92wYQ4=
+=p4EH
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/pecl-crack/files/fix-pecl-bug-5765.patch b/dev-php5/pecl-crack/files/fix-pecl-bug-5765.patch
new file mode 100644
index 000000000000..c180d5310b1b
--- /dev/null
+++ b/dev-php5/pecl-crack/files/fix-pecl-bug-5765.patch
@@ -0,0 +1,11 @@
+--- crack-0.4/libcrack/src/cracklib.h   2005-09-21 11:00:06.000000000 +0200
++++ crack-0.4-new/libcrack/src/cracklib.h       2006-10-08 20:44:00.618783250 +0200
+@@ -46,7 +46,7 @@
+ 
+ typedef unsigned char int8;
+ typedef unsigned short int int16;
+-typedef unsigned long int int32;
++typedef unsigned int int32;
+ 
+ #ifndef NUMWORDS
+ # define NUMWORDS                           16
diff --git a/dev-php5/pecl-crack/pecl-crack-0.4.ebuild b/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
index 6b3e020e0b6e..1e88917fb590 100644
--- a/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
+++ b/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.4.ebuild,v 1.1 2006/09/29 07:17:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.4.ebuild,v 1.2 2006/10/08 19:45:08 sebastian Exp $
 
 PHP_EXT_NAME="crack"
 PHP_EXT_INI="yes"
@@ -15,3 +15,11 @@ SLOT="0"
 IUSE=""
 
 need_php_by_category
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch for http://pecl.php.net/bugs/bug.php?id=5765
+	epatch "${FILESDIR}/fix-pecl-bug-5765.patch"
+}