[libkdcraw/f19: 12/14] Revert "- bz#970713, CVE-2013-2126, double-free flaw when handling"

[Rex Dieter]

commit 61f54c8adf21500dc191c75e228be4e42b8e191f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:42:24 2013 -0500

    Revert "- bz#970713, CVE-2013-2126, double-free flaw when handling"
    
    This reverts commit 7a4c94bbf0349798a855749c052c041e4b46af89.

 libkdcraw-4.10.5-CVE-2013-2126.patch |   24 ------------------------
 libkdcraw.spec                       |   12 ++----------
 2 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/libkdcraw.spec b/libkdcraw.spec
index b49cec8..6d551a1 100644
--- a/libkdcraw.spec
+++ b/libkdcraw.spec
@@ -1,7 +1,7 @@
 Name:    libkdcraw
 Summary: A C++ interface around LibRaw library
 Version: 4.10.5
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 # libkdcraw is GPLv2+,
 # LibRaw(bundled) is LGPLv2
@@ -18,8 +18,7 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 # fix libjpeg detection for libjpeg-turbo, hopefully upstreamable
 # (the hack to add jpeg_mem_src from RawSpeed to LibRaw might not be though)
 Patch50: libkdcraw-4.10.0-libjpeg-turbo.patch
-# upstream patches
-Patch100: libkdcraw-4.10.5-CVE-2013-2126.patch
+
 BuildRequires: kdelibs4-devel
 %if 0%{?fedora} > 17
 # libjpeg-turbo-1.2.90+ provides jpeg_mem_src
@@ -60,9 +59,6 @@ Requires: kdelibs4-devel
 %setup -q
 %patch50 -p1 -b .libjpeg-turbo
 
-# upstream patches
-%patch100 -p1 -b .CVE-2013-2126
-
 # copy/rename a few things for easier inclusion as %%doc
 cp -a libraw/README README.libraw
 cp -a libraw/COPYRIGHT COPYRIGHT.libraw
@@ -119,10 +115,6 @@ fi
 
 
 %changelog
-* Mon Jul 15 2013 Than Ngo <than at redhat.com> - 4.10.5-2
-- bz#970713, CVE-2013-2126, double-free flaw when handling
-  damaged full-color in Foveon and sRAW files
-
 * Sun Jun 30 2013 Than Ngo <than at redhat.com> - 4.10.5-1
 - 4.10.5