Fix gcc-4.3 issue, bug#218137, thanks to Holger Ackermann

Package-Manager: portage-2.1.5_rc4

4 files changed, 43 insertions, 4 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 76c11390c191..6ba515827c63 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.36 2008/03/21 17:24:53 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.37 2008/04/18 05:26:42 alonbl Exp $
+
+  18 Apr 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/truecrypt-5.1a-gcc-4.3.patch, truecrypt-5.1a.ebuild:
+  Fix gcc-4.3 issue, bug#218137, thanks to Holger Ackermann
 
 *truecrypt-5.1a (21 Mar 2008)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index a6e85fdc1681..cc50249348d1 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -3,10 +3,11 @@ AUX truecrypt-4.3a-2.6.24.patch 1658 RMD160 c29522d767f96ae01e266fbfd8441ddd3704
 AUX truecrypt-5.0-bool.patch 1032 RMD160 7e3aa621c6b47f92d0837bf7d0c07297bb1490aa SHA1 3cbf86e4fdf47fe4e99c33ffca78b1c5af7499d2 SHA256 66c6d98f2946c1410e635969e1e95a907fdc0d9720eb14d8dd9d474661557da3
 AUX truecrypt-5.1-64bit.patch 601 RMD160 479ea2a3c6809c9b9ea1febfa969fb25d02fd5ad SHA1 1448d11833aca850cebde2b0432c8f97df1fec1d SHA256 db767f5220077f6a97c8f3ba6e439cb27a45642a34004b1302401ad43fca1aee
 AUX truecrypt-5.1a-external-wx.patch 1272 RMD160 c63b166cfd26eebf2b70df9f4152523bc4d10f3c SHA1 5e6a2585ca8923b2af71c327adf3b7c48d9adbc4 SHA256 1c00a403f2be391f2779a9ade2c8f211bc7b7fe6616584568db2f24785afd4ad
+AUX truecrypt-5.1a-gcc-4.3.patch 1274 RMD160 094298efbe8eb9f2295ed1bb66e1daddf5dc57c1 SHA1 d69ab75c9b25435f9f1a455fa4a57944db3880e4 SHA256 b89d7e3b8a5ff06c28fd0ec0c91603a792e9a348a8f00a47acdb78de4200c6da
 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.1a.tar.gz 1630227 RMD160 5ade4071b7a7691e98fd2b3c7ab452747aa9124f SHA1 5453b855036f09361c5b970d4cd3069e62a7221b SHA256 ee2fa171eaa079f2c2ef091784263883b637e976f51ba455d4bc898cb372aa66
 EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 SHA1 4995db75c00642921d84270604b1c9b0d68e2401 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820
-EBUILD truecrypt-5.1a.ebuild 1707 RMD160 c8aa196334f3bd4b4c481ce572c3faa973a6f511 SHA1 98dd75af71537083cd149031668a5aee56566bd9 SHA256 4b3124b3ee90f50cb5f66c619ad2bac1841c432e1d8b453cd5bbe469e4ca653a
-MISC ChangeLog 6484 RMD160 3b55a25010d73bd4594c88fe5bd95f314ab805e0 SHA1 d900fcaadae9ac81b702bef0b63ec7ea30d9ecbd SHA256 afabe874913a7867426c4128da81794cb7b9d825d8adb85c243d77ef8f4b3534
+EBUILD truecrypt-5.1a.ebuild 1748 RMD160 9c6edbecb6c9f4250c447b72c9bebf62cfb8c931 SHA1 bad5455a4a7bc06d58b1b353ff960e0507068243 SHA256 35d387f0ab3f6dc940e4568250d6f27a64679abf7d47d9ab8547af459465abe8
+MISC ChangeLog 6655 RMD160 a2e346b0c98944c5e8eb99d000b28bd4da223bd6 SHA1 54fc641a7af079e339b6fc0e41fd32e9ac1a8380 SHA256 059072777996ef40255e603bff54e86091bcf8e8f9523ffae3e7fe25130e8dd1
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch b/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch
new file mode 100644
index 000000000000..acd92a2eb23e
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-5.1a-gcc-4.3.patch
@@ -0,0 +1,33 @@
+diff -ubr ./truecrypt-5.1a-source/Core/FatFormatter.cpp ./truecrypt-5.1a-source-patch/Core/FatFormatter.cpp
+--- ./truecrypt-5.1a-source/Core/FatFormatter.cpp	2008-02-04 18:28:50.000000000 +0100
++++ ./truecrypt-5.1a-source-patch/Core/FatFormatter.cpp	2008-04-17 18:58:06.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include "Common/Tcdefs.h"
+ #include "Platform/Platform.h"
+ #include "FatFormatter.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
+diff -ubr ./truecrypt-5.1a-source/Platform/Memory.cpp ./truecrypt-5.1a-source-patch/Platform/Memory.cpp
+--- ./truecrypt-5.1a-source/Platform/Memory.cpp	2008-02-04 12:14:46.000000000 +0100
++++ ./truecrypt-5.1a-source-patch/Platform/Memory.cpp	2008-04-17 18:58:06.000000000 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include "Memory.h"
+ #include "Exception.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
+diff -ubr ./truecrypt-5.1a-source/Volume/EncryptionTest.cpp ./truecrypt-5.1a-source-patch/Volume/EncryptionTest.cpp
+--- ./truecrypt-5.1a-source/Volume/EncryptionTest.cpp	2008-02-04 12:14:12.000000000 +0100
++++ ./truecrypt-5.1a-source-patch/Volume/EncryptionTest.cpp	2008-04-17 18:58:06.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "EncryptionModeXTS.h"
+ #include "EncryptionTest.h"
+ #include "Pkcs5Kdf.h"
++#include <cstring>
+ 
+ namespace TrueCrypt
+ {
diff --git a/app-crypt/truecrypt/truecrypt-5.1a.ebuild b/app-crypt/truecrypt/truecrypt-5.1a.ebuild
index fb266ccf0782..f5ce651c074b 100644
--- a/app-crypt/truecrypt/truecrypt-5.1a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-5.1a.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.1a.ebuild,v 1.1 2008/03/21 17:24:53 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-5.1a.ebuild,v 1.2 2008/04/18 05:26:42 alonbl Exp $
 
 inherit eutils toolchain-funcs multilib wxwidgets
 
@@ -38,6 +38,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 	epatch "${FILESDIR}/${P}-external-wx.patch"
 	epatch "${FILESDIR}/${PN}-5.1-64bit.patch"
 	epatch "${FILESDIR}/${PN}-5.0-bool.patch"