Fix 64bit issues, bug#209449, thanks to Aron for testing

Package-Manager: portage-2.1.4.1

4 files changed, 105 insertions, 4 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 9334fa2355f8..22d4480c99eb 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.29 2008/02/08 18:42:12 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.30 2008/02/09 20:42:26 alonbl Exp $
+
+  09 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/truecrypt-5.0-64bit.patch, truecrypt-5.0.ebuild:
+  Fix 64bit issues, bug#209449, thanks to Aron for testing
 
 *truecrypt-5.0 (08 Feb 2008)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 5580e67d8275..a70cd42862f5 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,10 +1,11 @@
 AUX truecrypt-4.3a-2.6.23.patch 707 RMD160 fa1221f99cddc9cd4e2c3768f4387d6b17320849 SHA1 2344a65fd9b8ccddcb65cb4c188bccf59bff5360 SHA256 199ab45e983203cfe0602175073c0b6fab2a1009e7699ea154613a3398bf3476
 AUX truecrypt-4.3a-2.6.24.patch 1658 RMD160 c29522d767f96ae01e266fbfd8441ddd37049f71 SHA1 b138b60c5b036243c13d294cf61a2e905f1c4b83 SHA256 d12dd2252daf753f3d56dd504627de0f5f652a67781e930d717d1a86b46e4636
+AUX truecrypt-5.0-64bit.patch 4507 RMD160 ad3e45014ced1d6769f6b04426683e28ae94b9da SHA1 9dc34ff69dad98c8b84c5f8a99a232bfc6b01d06 SHA256 3783a8b9969f2c345f8492629aefc5900b309ab0b8aded391ac3aed4172acfe9
 AUX truecrypt-5.0-build.patch 1147 RMD160 d5baa75497b027b594c4a31f99bd5320bb9c0da3 SHA1 6467d4bfcae0f0cdd1ff86f21719d3f7d710fa8d SHA256 8eba4bbc03a27678e6bd073988129ec22934fafa84466b03c22b587c7d37deb8
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a
 DIST truecrypt-5.0.tar.gz 1554178 RMD160 7f5b9c4dfb19563ab8f8ccc087f632c3fa5a6811 SHA1 f6e71f757425cedc76f023a91b78a073e279cdac SHA256 2c63694431a8b14a1d9e753d6624a8d75b1184def5acc4ac18167aac0a630c94
 EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 SHA1 4995db75c00642921d84270604b1c9b0d68e2401 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820
-EBUILD truecrypt-5.0.ebuild 1797 RMD160 6f962be4f7f22633039fd8a1deafbc3f83f7acf8 SHA1 a91c6b2d3bd19e881b5cdfe832b77cb5b016d619 SHA256 49c654c700c54538bd42ae2a468aaa03719634c6307ff80ad1469136d5ab5738
-MISC ChangeLog 5015 RMD160 2f072da4ab712a3745612b34f99c1e1b1864c834 SHA1 1caaa4fb41a3fef9865646efd3dba9c9b6d90b3e SHA256 5301a1aa6281c5e4411a3b5777aeabb6f43b95887d67ff4825a7c49ea80e8eba
+EBUILD truecrypt-5.0.ebuild 1836 RMD160 853d0e6779087934d972b0717d01ff1a327d4133 SHA1 30a9523cb074cf1a3b595398232cd651118d01e4 SHA256 d0d99a0c163d3d6c94103ada378058b2088e2ee3d0a7da56c71963431f8bbc93
+MISC ChangeLog 5181 RMD160 9024737ad7255f6bf807389503a53d54738e9abd SHA1 1efc541490c6e741dbc774759f998eb4006e736a SHA256 b686b0963daf2d046ca7ba776521f6f2daacd1cf59996a3c2f07de736668072b
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/truecrypt/files/truecrypt-5.0-64bit.patch b/app-crypt/truecrypt/files/truecrypt-5.0-64bit.patch
new file mode 100644
index 000000000000..69d13839a8bf
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-5.0-64bit.patch
@@ -0,0 +1,95 @@
+diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.cpp truecrypt-5.0-source/Platform/StringConverter.cpp
+--- truecrypt-5.0-source.org/Platform/StringConverter.cpp	2008-02-04 13:14:18.000000000 +0200
++++ truecrypt-5.0-source/Platform/StringConverter.cpp	2008-02-09 21:38:23.000000000 +0200
+@@ -32,12 +32,14 @@
+ 		return s.str();
+ 	}
+ 
++#if __WORDSIZE == 32
+ 	wstring StringConverter::FromNumber (int64 number)
+ 	{
+ 		wstringstream s;
+ 		s << number;
+ 		return s.str();
+ 	}
++#endif
+ 
+ 	wstring StringConverter::FromNumber (int number)
+ 	{
+@@ -60,12 +62,14 @@
+ 		return s.str();
+ 	}
+ 
++#if __WORDSIZE == 32
+ 	wstring StringConverter::FromNumber (uint64 number)
+ 	{
+ 		wstringstream s;
+ 		s << number;
+ 		return s.str();
+ 	}
++#endif
+ 
+ 	string StringConverter::GetTrailingNumber (const string &str)
+ 	{
+diff -urNP truecrypt-5.0-source.org/Platform/StringConverter.h truecrypt-5.0-source/Platform/StringConverter.h
+--- truecrypt-5.0-source.org/Platform/StringConverter.h	2008-02-04 13:14:16.000000000 +0200
++++ truecrypt-5.0-source/Platform/StringConverter.h	2008-02-09 21:38:03.000000000 +0200
+@@ -19,11 +19,15 @@
+ 	public:
+ 		static wstring FromNumber (double number);
+ 		static wstring FromNumber (int number);
++#if __WORDSIZE == 32
+ 		static wstring FromNumber (int64 number);
++#endif
+ 		static wstring FromNumber (long number);
+ 		static wstring FromNumber (unsigned int number);
+ 		static wstring FromNumber (unsigned long number);
++#if __WORDSIZE == 32
+ 		static wstring FromNumber (uint64 number);
++#endif
+ 		static string GetTrailingNumber (const string &str);
+ 		static string GetTypeName (const type_info &typeInfo);
+ 		static wstring QuoteSpaces (const wstring &str);
+--- truecrypt-5.0-source.org/Platform/PlatformTest.cpp	2008-02-04 13:14:16.000000000 +0200
++++ truecrypt-5.0-source/Platform/PlatformTest.cpp	2008-02-09 21:49:15.000000000 +0200
+@@ -270,7 +270,11 @@ namespace TrueCrypt
+ 		// shared_ptr, make_shared, StringConverter, foreach
+ 		list <shared_ptr <uint64> > numList;
+ 		
++#if __WORDSIZE == 32
+ 		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeULL))));
++#else
++		numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber (0xFFFFffffFFFFfffeUL))));
++#endif
+ 		numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
+ 		numList.push_front (make_shared <uint64> (3));
+ 
+--- truecrypt-5.0-source.org/Main/StringFormatter.h	2008-02-04 13:14:14.000000000 +0200
++++ truecrypt-5.0-source/Main/StringFormatter.h	2008-02-09 22:15:04.000000000 +0200
+@@ -27,11 +27,15 @@ namespace TrueCrypt
+ 		StringFormatterArg (const wstring &str) :	Empty (false), Referenced (false), StringArg (str) { }
+ 		StringFormatterArg (const wxString &str) :	Empty (false), Referenced (false), StringArg (str) { }
+ 		StringFormatterArg (int number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#if __WORDSIZE == 32
+ 		StringFormatterArg (int64 number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#endif
+ 		StringFormatterArg (long number) :			Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
+ 		StringFormatterArg (unsigned int number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
+ 		StringFormatterArg (unsigned long number) :	Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#if __WORDSIZE == 32
+ 		StringFormatterArg (uint64 number) :		Empty (false), Referenced (false), StringArg (StringConverter::FromNumber (number)) { }
++#endif
+ 
+ 		operator wxString () { Referenced = true; return StringArg; }
+ 
+--- truecrypt-5.0-source.org/Main/Forms/VolumeSizeWizardPage.cpp	2008-02-04 13:14:46.000000000 +0200
++++ truecrypt-5.0-source/Main/Forms/VolumeSizeWizardPage.cpp	2008-02-09 22:27:35.000000000 +0200
+@@ -55,7 +55,7 @@ namespace TrueCrypt
+ 	{
+ 		uint64 prefixMult = 1;
+ 		if (VolumeSizePrefixChoice->GetSelection() != wxNOT_FOUND)
+-			prefixMult = reinterpret_cast <int> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));
++			prefixMult = reinterpret_cast <uint64> (VolumeSizePrefixChoice->GetClientData (VolumeSizePrefixChoice->GetSelection()));
+ 		
+ 		uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));
+ 		if (val <= 0x7fffFFFFffffFFFFull / prefixMult)
diff --git a/app-crypt/truecrypt/truecrypt-5.0.ebuild b/app-crypt/truecrypt/truecrypt-5.0.ebuild
index f3768ddd5bb7..73eb0b80c3e0 100644
--- a/app-crypt/truecrypt/truecrypt-5.0.ebuild
+++ b/app-crypt/truecrypt/truecrypt-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-5.0.ebuild,v 1.1 2008/02/08 18:42:12 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-5.0.ebuild,v 1.2 2008/02/09 20:42:26 alonbl Exp $
 
 #
 # NOTES:
@@ -40,6 +40,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-64bit.patch"
 }
 
 src_compile() {