Better solution for bug 121182: use uint32_t for 32-bit unsigned integers

instead of using different typedefs per platform
(Portage version: 2.1_pre4-r1)

5 files changed, 110 insertions, 11 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index bd751b5bf215..0eda142bb5c3 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.27 2006/02/02 01:24:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.28 2006/02/02 14:08:41 agriffis Exp $
+
+*pycrypto-2.0.1-r3 (02 Feb 2006)
+
+  02 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/pycrypto-2.0.1-uint32.patch, +pycrypto-2.0.1-r3.ebuild:
+  Better solution for bug 121182: use uint32_t for 32-bit unsigned integers
+  instead of using different typedefs per platform
 
   01 Feb 2006; Mike Frysinger <vapier@gentoo.org>
   +files/pycrypto-2.0.1-gmp.patch, pycrypto-2.0.1-r2.ebuild:
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 7fb240cc36a6..29ea27a50f6b 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bd345e9e3a0790b7e3ef67b6d36771cf ChangeLog 3664
 RMD160 47ca6c3cf5f038a8026e9939a5839b93d02ea447 ChangeLog 3664
 SHA256 88f93fb35beef280e5e497f6120fcdf7ac3b8297f5e8fd440a6d471ff6f95a7e ChangeLog 3664
@@ -25,6 +22,9 @@ SHA256 94427cf1651edc0397aa2b3124298a998b809ac7a5522e9fb6f7ed7edc3d89a0 files/di
 MD5 e4a3877aceb3f8d3124d9c742f9eef06 files/digest-pycrypto-2.0.1-r2 244
 RMD160 7388a77e1c70274a3d2fb079e1c3e1aa47024256 files/digest-pycrypto-2.0.1-r2 244
 SHA256 94427cf1651edc0397aa2b3124298a998b809ac7a5522e9fb6f7ed7edc3d89a0 files/digest-pycrypto-2.0.1-r2 244
+MD5 e4a3877aceb3f8d3124d9c742f9eef06 files/digest-pycrypto-2.0.1-r3 244
+RMD160 7388a77e1c70274a3d2fb079e1c3e1aa47024256 files/digest-pycrypto-2.0.1-r3 244
+SHA256 94427cf1651edc0397aa2b3124298a998b809ac7a5522e9fb6f7ed7edc3d89a0 files/digest-pycrypto-2.0.1-r3 244
 MD5 1cef0f805deeb0a9632606f1f97cce29 files/pycrypto-2.0.1-bindist.patch 1561
 RMD160 b0064385698a1cb9ed741b2e68ed682b4d395a61 files/pycrypto-2.0.1-bindist.patch 1561
 SHA256 c95a6b3628d5472f749004c5d9a95a812d1b9c1fc7bfa5a538fa64210a021d9a files/pycrypto-2.0.1-bindist.patch 1561
@@ -34,6 +34,9 @@ SHA256 c20f8d91ee74c4c0347957386c60b38a510c368e3778ae80f015af68c963d29d files/py
 MD5 f069c9d2982308d3b8043000d596c6a7 files/pycrypto-2.0.1-ia64.patch 442
 RMD160 c027362c20b414ec07e7eda9ee0002d4c75c78c4 files/pycrypto-2.0.1-ia64.patch 442
 SHA256 7ccfa05d0b5ebe9bc9a9edc40226f6bc8adbff27aaae0da70881f53afdaf506c files/pycrypto-2.0.1-ia64.patch 442
+MD5 b3a3f729857328b1801aa072802cc955 files/pycrypto-2.0.1-uint32.patch 1078
+RMD160 40f20f4d3a89b8927eaee415418e1d9f2b2be33b files/pycrypto-2.0.1-uint32.patch 1078
+SHA256 b8cb928cbf1713eff06c6899cb773c9a02f28e85de02e7d6f45ed1be413b47dd files/pycrypto-2.0.1-uint32.patch 1078
 MD5 5b03cb0967f5fb96991f2463fa415797 metadata.xml 1774
 RMD160 b0aeda4d69c1dc4ec798f05f617a2d0ddf8c29ab metadata.xml 1774
 SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2 metadata.xml 1774
@@ -52,16 +55,12 @@ SHA256 6983f7e85395d0cf0104f68849ee80ebe140db5331b684276a9ba477d230f5fa pycrypto
 MD5 a4a9fef9a374b8ad224bff7f51339503 pycrypto-2.0.1-r2.ebuild 1382
 RMD160 3035d8b89fb7fa308614e2b63c47be846e84b2ff pycrypto-2.0.1-r2.ebuild 1382
 SHA256 1262a47101a4f01a69a28028ecb917847fe7addc7e068f9f288bb2755eb55c92 pycrypto-2.0.1-r2.ebuild 1382
+MD5 4d808919a0102d906c0b10315c3288d1 pycrypto-2.0.1-r3.ebuild 1385
+RMD160 26720121ff0f5ddd90a421c2eaf53d7867e0e112 pycrypto-2.0.1-r3.ebuild 1385
+SHA256 70ae470351a200cb51045af2e18bf051b4bbdf2093884f11c2822f7f79c7bbc9 pycrypto-2.0.1-r3.ebuild 1385
 MD5 13d0293b0075a1d14f88ce4df3a1188b pycrypto-2.0.1.ebuild 762
 RMD160 70e38bec63b2448e0cfdbbfe8fbf3ab07a30fe17 pycrypto-2.0.1.ebuild 762
 SHA256 b85d654c25a7403b351ac536c0a855d4f8c898d59a98b88b0e68d7e808b03870 pycrypto-2.0.1.ebuild 762
 MD5 1ff484937e9f3be035fe383ea160e8ad pycrypto-2.0.ebuild 573
 RMD160 6e9022da62464f414b34ac0be186d585f2e20f4c pycrypto-2.0.ebuild 573
 SHA256 da063c1de165847585cc5a452f343a4101a9baee19e6a9c367e77fb54a74f64a pycrypto-2.0.ebuild 573
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD4V9m2+ySkm8kpY0RAufJAJ98wqWYnr/X/K7qAQ3ShvburY9NhgCgwJhs
-u8h8xJpP24I5+0yldRGAJ0U=
-=7/X/
------END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/files/digest-pycrypto-2.0.1-r3 b/dev-python/pycrypto/files/digest-pycrypto-2.0.1-r3
new file mode 100644
index 000000000000..4e5b88462ffb
--- /dev/null
+++ b/dev-python/pycrypto/files/digest-pycrypto-2.0.1-r3
@@ -0,0 +1,3 @@
+MD5 4d5674f3898a573691ffb335e8d749cd pycrypto-2.0.1.tar.gz 154292
+RMD160 5ce938a24f77f414e42680c17ef9b6dc8de94a2e pycrypto-2.0.1.tar.gz 154292
+SHA256 b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea pycrypto-2.0.1.tar.gz 154292
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch
new file mode 100644
index 000000000000..8822737097fc
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.0.1-uint32.patch
@@ -0,0 +1,39 @@
+--- src/RIPEMD.c.agriffis	2005-06-13 20:14:57.000000000 -0400
++++ src/RIPEMD.c	2006-02-02 08:59:43.000000000 -0500
+@@ -99,15 +99,9 @@
+       (c) = ROL((c), 10);\
+    }
+ 
+-typedef    unsigned char        byte;   /* unsigned 8-bit integer */
+-#ifdef __alpha__
+-typedef    unsigned int        word;   /* unsigned 32-bit integer */
+-#elif defined(__amd64__)
+-typedef    uint32_t            word;   /* unsigned 32-bit integer */
+-#else
+-typedef    unsigned long        word;   /* unsigned 32-bit integer */
+-#endif
+-typedef unsigned char   BYTE;
++typedef    unsigned char        byte;
++typedef    uint32_t             word;
++
+ #define RMD_DATASIZE    64
+ #define RMD_DIGESTSIZE  20
+ #define RMDsize 160
+@@ -137,7 +131,7 @@
+ {
+ 	word tmp;
+ 	int dataCount, i;
+-	BYTE *p;
++	byte *p;
+ 
+ 	/* Update bitcount */
+ 	tmp = shsInfo->countLo;
+@@ -151,7 +145,7 @@
+ 	/* Handle any leading odd-sized chunks */
+ 	if(dataCount)
+         {
+-		p = ( BYTE * ) shsInfo->data + dataCount;
++		p = ( byte * ) shsInfo->data + dataCount;
+ 
+ 		dataCount = RMD_DATASIZE - dataCount;
+ 		if( count < dataCount )
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r3.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..8b19dd86494f
--- /dev/null
+++ b/dev-python/pycrypto/pycrypto-2.0.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r3.ebuild,v 1.1 2006/02/02 14:08:41 agriffis Exp $
+
+inherit eutils distutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Python Cryptography Toolkit"
+HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
+SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86"
+IUSE="bindist gmp test"
+
+RDEPEND="virtual/python
+	gmp? ( dev-libs/gmp )"
+DEPEND="${RDEPEND}
+	test? ( =dev-python/sancho-0.11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
+	epatch "${FILESDIR}"/${P}-gmp.patch
+	epatch "${FILESDIR}"/pycrypto-2.0.1-uint32.patch
+}
+
+src_compile() {
+	use gmp \
+		&& export USE_GMP=1 \
+		|| export USE_GMP=0
+	# sha256 hashes occasionally trigger ssp when built with
+	# -finline-functions (implied by -O3).
+	gcc-specs-ssp && append-flags -fno-inline-functions
+	distutils_src_compile
+}
+
+src_test() {
+	export PYTHONPATH=$(ls -d "${S}"/build/lib.*/)
+	python ./test.py || die "test failed"
+	if use test ; then
+		local x
+		cd test
+		for x in test_*.py ; do
+			python ${x} || die "${x} failed"
+		done
+	fi
+}
+
+DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"