improved patch from upstream with additional checks

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 14 insertions, 6 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 43825389bd71..d83cf43b8036 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.35 2009/04/23 14:12:38 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.36 2009/05/07 04:53:18 dragonheart Exp $
+
+*testdisk-6.11-r1 (07 May 2009)
+
+  07 May 2009; Daniel Black <dragonheart@gentoo.org>
+  -files/testdisk-6.11-exif_bound_checking.patch,
+  +files/testdisk-6.11-exif_bound_checking-v2.patch, -testdisk-6.11.ebuild,
+  +testdisk-6.11-r1.ebuild:
+  improved patch from upstream with additional checks
 
 *testdisk-6.11 (23 Apr 2009)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 2f31f1cd8d4b..b975d08ea339 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,4 +1,4 @@
-AUX testdisk-6.11-exif_bound_checking.patch 5379 RMD160 165ae6d65f885aa0996b113baceeedf290fa24b8 SHA1 48f20be4c7da37b5e6f6d859d1d59a3457bedf23 SHA256 6e31b22483aeabc8e8911825a8cc1fe04d594d8ad05ff43364c262ea44b36ef7
+AUX testdisk-6.11-exif_bound_checking-v2.patch 5379 RMD160 165ae6d65f885aa0996b113baceeedf290fa24b8 SHA1 48f20be4c7da37b5e6f6d859d1d59a3457bedf23 SHA256 6e31b22483aeabc8e8911825a8cc1fe04d594d8ad05ff43364c262ea44b36ef7
 AUX testdisk-6.8-jpeg.patch 906 RMD160 f7bd8d37075b56e9ecaf9d1229ac7158e903c903 SHA1 be62fb01f9e5f362175d504e128e9119f267e71f SHA256 d65b14f780b07d0f84cad44fd25d8f82ebf9b45ea0229b19c721cbdf53d7e1a8
 DIST testdisk-6.10.tar.bz2 1474157 RMD160 4280290ad49de525c59e92983256c7694541d622 SHA1 21104146148ab98ba2a5a757398336a2345eca36 SHA256 539e7ec274126a827dfa4df751d71d15e03cf66c3fa73aac8f552d486c779593
 DIST testdisk-6.11.tar.bz2 1553183 RMD160 0021601688ec779debd0a225305845b42605aaf9 SHA1 6d25ceaed5a7f5e35466b0ad75a4bca104f66532 SHA256 1d49183063f811ab968658235252cfc3b623faa6188b8e4d6ff8c20e79564075
@@ -6,8 +6,8 @@ DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac
 DIST testdisk-6.8-ntfsprogs2.patch.bz2 8751 RMD160 465a4b34f2f6f9f114c98011c07f15b7b8ab26fb SHA1 2405aaaed4bce405600046adf6e83dec6c4126a9 SHA256 6e30a089825b5271499be816de4b907bf62f790655c9c34bec49ddd9699d182a
 DIST testdisk-6.8.tar.bz2 768698 RMD160 e9fd360e126cbce21c3a17711ea02dc33206cceb SHA1 7e461905fcd275edf019a87ac18bcb4401a2b379 SHA256 390a8c9d537105b8839e7dec60873b59c0a971f31be539c331f29be8d98cd833
 EBUILD testdisk-6.10.ebuild 2040 RMD160 3df60a2758f2be2000496b82c94f56b4285dd983 SHA1 c2b204027ff19fc136d430916a687c3855ef896f SHA256 4f9f89a529ed1e92a2b3f86dfebcbcb1c57ed0cf37adf4bb60720a14e446e5c3
-EBUILD testdisk-6.11.ebuild 2106 RMD160 af7f97ca95be2a2344ed5ae1a30ba350f25c70b4 SHA1 54edb8b352a62c7162bb9ec69704bc0fff496d39 SHA256 bf11cea830516d846027a308d4b154c714f9cc13d1bb6422e2772d11720850a9
+EBUILD testdisk-6.11-r1.ebuild 2112 RMD160 0a6c5b5e69b336e70635fdc35066e9b5516ec875 SHA1 07e297796b12b75295ac96f841e7f4f17816e70b SHA256 b99f4285c6364b82d0743c553b45876f267d31a0c827337ad9fd420c7b3f61a3
 EBUILD testdisk-6.5.ebuild 1884 RMD160 c46783e1a4bec218740583ccfa59ac8dacbd459c SHA1 c420cbc0c874a0902a0a8ad772632144a12580fd SHA256 333ff0be16200c147ba9d09293e2b2be36da139b6dece1305a2ef87ccbb3fed4
 EBUILD testdisk-6.8-r1.ebuild 2094 RMD160 24b1e082b7bb9387b913ccb114df1cac16245194 SHA1 49ca9cbb933624304cbb76973d113d6c3395b45a SHA256 96740ae642f63cfe0dc61f2a31930a5fe8a310d5806a6c8d4bcf8e8daa58dbd0
-MISC ChangeLog 6186 RMD160 189da8327181d2c22139701ed645d993cddc6246 SHA1 f520d999849fe687d3c264ebb9eacbef830de40c SHA256 0f51d6d9d05e0114432c6bdaf1dfb8007814a6d5ab67b422d44b9fe3bde366dd
+MISC ChangeLog 6481 RMD160 4cf92321d87a76412407feb7274a6f55999d66b4 SHA1 903be3fa73056c67180b6bc9b6024c4356be1773 SHA256 b02bbab7ffd4da00c8f34e4a117ff1e551edbae25fcce325d6130985bd8b1181
 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406
diff --git a/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking.patch b/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch
index b0f5020999c3..b0f5020999c3 100644
--- a/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking.patch
+++ b/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch
diff --git a/app-admin/testdisk/testdisk-6.11.ebuild b/app-admin/testdisk/testdisk-6.11-r1.ebuild
index 7f44d72f7d57..3c3252ec6c5a 100644
--- a/app-admin/testdisk/testdisk-6.11.ebuild
+++ b/app-admin/testdisk/testdisk-6.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.11.ebuild,v 1.1 2009/04/23 14:12:38 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.11-r1.ebuild,v 1.1 2009/05/07 04:53:18 dragonheart Exp $
 
 EAPI=2
 inherit eutils flag-o-matic
@@ -26,7 +26,7 @@ RDEPEND="!static? ( ${DEPEND} )"
 #S=${WORKDIR}/${P}-WIP
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-exif_bound_checking.patch
+	epatch "${FILESDIR}"/${P}-exif_bound_checking-v2.patch
 }
 
 src_configure() {