From 1f25f13d4a6eaf906c6da69fa3cd648760bb19a0 Mon Sep 17 00:00:00 2001
From: Christophe GRENIER <grenier@fedoraproject.org>
Date: Apr 24 2009 06:31:32 +0000
Subject: Add patch for PhotoRec 6.11 to add missing bound checking in EXIF

    processing

---

diff --git a/.cvsignore b/.cvsignore
index 0a0a6d6..314c0e9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
+photorec_611_exif_bound_checking.patch
diff --git a/sources b/sources
index 7f18ffa..4b2bd77 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
+dba57525125fbb372f470832af2d91c1  photorec_611_exif_bound_checking.patch
diff --git a/testdisk.spec b/testdisk.spec
index 83f1a80..b2bd68d 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -4,11 +4,12 @@ Summary(fr.UTF8):	Outil pour vérifier et restorer des partitions
 Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
 Name:		testdisk
 Version:	6.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
+Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
@@ -30,10 +31,10 @@ FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr.UTF8
-Outil pour vérifier et restorer des partitions. Fonctionne avec
+TestDisk vérifie et récupère les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-Il gère plus d'une centaine de formats de fichiers dont les jpeg, les documents
+PhotoRec gère plus d'une centaine de formats de fichiers dont les jpeg, les documents
 MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
@@ -79,6 +80,7 @@ This package contains testdisk & photorec documentation.
 %prep
 %setup -q
 %setup -q -a 1
+%patch0 -p1
 
 %build
 %configure --without-ewf
@@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc
 
 %changelog
+* Fri Apr 24 2009 Christophe Grenier <grenier@cgsecurity.org> 6.11-2
+- Add upstream patch that add missing bound checks when parsing EXIF information
+
 * Sun Apr 19 2009 Christophe Grenier <grenier@cgsecurity.org> 6.11-1
 - Update to latest version