[catdoc/el5: 12/12] Merge remote-tracking branch 'origin/el6' into el5

[drago01]

commit a099f267eacedee8c47a7b2d5e28107f45341a4a
Merge: aa5c7ea 4a28325
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Fri Nov 2 11:29:07 2012 +0100

    Merge remote-tracking branch 'origin/el6' into el5

 ...c-0.94.2-bufferoverflow-rh872390-rh872391.patch |   15 +++++++++++++++
 catdoc.spec                                        |   10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --cc catdoc.spec
index e6a1401,3be406e..a638f3c
--- a/catdoc.spec
+++ b/catdoc.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name: catdoc
  Version: 0.94.2
- Release: 3%{?dist}
 -Release: 7%{?dist}
++Release: 4%{?dist}
  Summary: A program which converts Microsoft office files to plain text        
  
  Group: Applications/Text   
@@@ -26,7 -28,8 +28,9 @@@ from Powerpoint file
  %prep
  %setup -q
  %patch0 -p1 -b .makefilefix
+ %patch1 -p1 -b .bufferoverflow
+ 
 +
  %build
  %configure
  make %{?_smp_mflags}
@@@ -55,8 -58,19 +59,10 @@@ rm -rf $RPM_BUILD_ROO
  %doc COPYING README NEWS
  
  
- 
  %changelog
 -* Fri Nov 02 2012 Adel Gadllah <adel.gadllah at gmail.com> - 0.94.2-7
++* Fri Nov 02 2012 Adel Gadllah <adel.gadllah at gmail.com> - 0.94.2-4
+ - Fix buffer overflow vulnerability; RH#872390 / RH#872392
+ 
 -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
 -* Fri Feb 08 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.94.2-4
 -- Rebuild for gcc-4.3
 -
  * Sun Nov 11 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.94.2-3
  - Preserve timestamps