[SCM] libkdcraw packaging branch, kde4.11, updated. debian/4.10.5-1-4-g38e2fbc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkdcraw.git;a=commitdiff;h=d4f226b

The following commit has been merged in the kde4.11 branch:
commit d4f226b97ad2d56a428d58093a0e94332e24ace9
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Sep 26 13:56:16 2013 +0000

    Remove patches already applied by upstream.
---
 debian/changelog                            |    1 +
 debian/patches/libkdcraw_CVE-2013-2126.diff |   32 --------------
 debian/patches/libkdcraw_CVE-2013-2127.diff |   64 ---------------------------
 debian/patches/series                       |    2 -
 4 files changed, 1 insertion(+), 98 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 284f2cf..0a716d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libkdcraw (4:4.11.1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove patches already applied by upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:16:38 +0200
 
diff --git a/debian/patches/libkdcraw_CVE-2013-2126.diff b/debian/patches/libkdcraw_CVE-2013-2126.diff
deleted file mode 100644
index 5ef6410..0000000
--- a/debian/patches/libkdcraw_CVE-2013-2126.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit b1fc4d9e5f68ee41c453e90a6cb7d91e77e82163
-Author: Maximiliano Curia <maxy at debian.org>
-Date:   Mon Jun 17 16:26:27 2013 +0200
-
-    CVE-2013-2126: double free, fix from: https://github.com/LibRaw/LibRaw/commit/c14ae36d28e80139b2f31b5d9d7623db3b597a3a
-
-diff --git a/libraw/src/libraw_cxx.cpp b/libraw/src/libraw_cxx.cpp
-index 785db91..9279b55 100644
---- a/libraw/src/libraw_cxx.cpp
-+++ b/libraw/src/libraw_cxx.cpp
-@@ -1055,8 +1055,8 @@ int LibRaw::unpack(void)
-                 S.iheight= S.height;
-                 IO.shrink = 0;
-                 // allocate image as temporary buffer, size 
--                imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
--                imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
-+                imgdata.rawdata.raw_alloc = 0;
-+                imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
-               }
-             ID.input->seek(libraw_internal_data.unpacker_data.data_offset, SEEK_SET);
-             (this->*load_raw)();
-@@ -1073,8 +1073,8 @@ int LibRaw::unpack(void)
-         // recover saved
-         if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
-             {
--                imgdata.image = 0; 
--                imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
-+              imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
-+              imgdata.image = 0;
-             }
- 
-         // recover image sizes
diff --git a/debian/patches/libkdcraw_CVE-2013-2127.diff b/debian/patches/libkdcraw_CVE-2013-2127.diff
deleted file mode 100644
index e3cb167..0000000
--- a/debian/patches/libkdcraw_CVE-2013-2127.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-commit b990522ec738deafd92f2b6ff179a1957edf8fc5
-Author: Maximiliano Curia <maxy at debian.org>
-Date:   Mon Jun 17 18:29:49 2013 +0200
-
-    CVE-2013-2127: buffer overflow, fix from: https://github.com/LibRaw/LibRaw/commit/2f912f5b33582961b1cdbd9fd828589f8b78f21d
-
-diff --git a/libraw/src/libraw_cxx.cpp b/libraw/src/libraw_cxx.cpp
-index 785db91..a53df26 100644
---- a/libraw/src/libraw_cxx.cpp
-+++ b/libraw/src/libraw_cxx.cpp
-@@ -2198,14 +2198,15 @@ void LibRaw::subtract_black()
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #define LIM(x,min,max) MAX(min,MIN(x,max))
- #define CLIP(x) LIM(x,0,65535)
--
--            for(i=0; i< size*4; i++)
-+			int dmax = 0;
-+			for(i=0; i< size*4; i++)
-               {
-                 int val = imgdata.image[0][i];
-                 val -= cblk[i & 3];
-                 imgdata.image[0][i] = CLIP(val);
--                if(C.data_maximum < val) C.data_maximum = val;
-+                if(dmax < val) dmax = val;
-               }
-+			C.data_maximum = dmax & 0xffff;
- #undef MIN
- #undef MAX
- #undef LIM
-@@ -2221,9 +2222,10 @@ void LibRaw::subtract_black()
-           // only calculate channel maximum;
-           int idx;
-           ushort *p = (ushort*)imgdata.image;
--          C.data_maximum = 0;
-+		  int dmax = 0;
-           for(idx=0;idx<S.iheight*S.iwidth*4;idx++)
--            if(C.data_maximum < p[idx]) C.data_maximum = p[idx];
-+            if(dmax < p[idx]) dmax = p[idx];
-+		  C.data_maximum = dmax;
-         }
- }
- 
-@@ -2277,8 +2279,10 @@ void LibRaw::exp_bef(float shift, float smooth)
-             imgdata.image[i][3] = lut[imgdata.image[i][3]];
-         }
- 
--    C.data_maximum = lut[C.data_maximum];
--    C.maximum = lut[C.maximum];
-+	if(C.data_maximum <=TBLN)
-+		C.data_maximum = lut[C.data_maximum];
-+	if(C.maximum <= TBLN)
-+		C.maximum = lut[C.maximum];
-     // no need to adjust the minumum, black is already subtracted
-     free(lut);
- }
-@@ -2386,7 +2390,7 @@ int LibRaw::dcraw_process(void)
- 
-         raw2image_ex(subtract_inline); // allocate imgdata.image and copy data!
- 
--        int save_4color = O.four_color_rgb;
-+		int save_4color = O.four_color_rgb;
- 
-         if (IO.zero_is_bad) 
-           {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9240677..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-libkdcraw_CVE-2013-2126.diff
-libkdcraw_CVE-2013-2127.diff

-- 
libkdcraw packaging