[SCM] libkdcraw packaging branch, kde4.11, updated. debian/4.11.2-1

[Maximiliano Curia]

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

The following commit has been merged in the kde4.11 branch:
commit c173cee3befdfc2d89e5a2c07387a1969890447e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Oct 1 20:11:12 2013 +0200

    Refresh patch.
---
 debian/changelog                            |    1 +
 debian/patches/libkdcraw_CVE-2013-143x.diff |   32 +++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca36fa1..b9784a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libkdcraw (4:4.11.1-0r0) UNRELEASED; urgency=low
   * Remove patches already applied by upstream.
   * Update symbols file.
   * Update lintian-override.
+  * Refresh patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:16:38 +0200
 
diff --git a/debian/patches/libkdcraw_CVE-2013-143x.diff b/debian/patches/libkdcraw_CVE-2013-143x.diff
index 4ec04f7..2d461db 100644
--- a/debian/patches/libkdcraw_CVE-2013-143x.diff
+++ b/debian/patches/libkdcraw_CVE-2013-143x.diff
@@ -5,10 +5,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721231
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721239
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721340
 
-Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
+Index: libkdcraw/libraw/internal/dcraw_common.cpp
 ===================================================================
---- libkdcraw-4.10.2.orig/libraw/internal/dcraw_common.cpp	2013-10-01 01:33:56.779280640 -0400
-+++ libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp	2013-10-01 01:34:42.691282426 -0400
+--- libkdcraw.orig/libraw/internal/dcraw_common.cpp	2013-10-01 20:08:24.478682563 +0200
++++ libkdcraw/libraw/internal/dcraw_common.cpp	2013-10-01 20:08:24.474682721 +0200
 @@ -606,7 +606,10 @@
  int CLASS ljpeg_diff (ushort *huff)
  {
@@ -30,7 +30,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
  
    len = bits._gethuff_lj(buf,*huff,huff+1);
    if (len == 16 && (!dng_version || dng_version >= 0x1010000))
-@@ -755,6 +760,10 @@
+@@ -742,6 +747,10 @@
  
  
    if (!ljpeg_start (&jh, 0)) return;
@@ -41,7 +41,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
    jwide = jh.wide * jh.clrs;
  
  #ifdef LIBRAW_LIBRARY_BUILD
-@@ -768,18 +777,25 @@
+@@ -755,18 +764,25 @@
        {
            // not sliced
            slicesW[slicesWcnt++] = raw_width; // safe fallback
@@ -77,7 +77,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
                {
                    t_y = 0;
                    t_x += slicesW[t_s++];
-@@ -830,12 +846,28 @@
+@@ -817,12 +833,28 @@
                pixno++;
                if (0 == --pixelsInSlice)
                    {
@@ -106,7 +106,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
        if (raw_width == 3984 && (col -= 2) < 0)
  	col += (row--,raw_width);
        if (row >= 0) RAW(row,col) = val;
-@@ -5173,6 +5205,7 @@
+@@ -5135,6 +5167,7 @@
  	  data_offset = get4()+base;
  	  ifd++;  break;
  	}
@@ -114,7 +114,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
  	while (len--) {
  	  i = ftell(ifp);
  	  fseek (ifp, get4()+base, SEEK_SET);
-@@ -5386,7 +5419,7 @@
+@@ -5353,7 +5386,7 @@
  	break;
        case 50715:			/* BlackLevelDeltaH */
        case 50716:			/* BlackLevelDeltaV */
@@ -123,7 +123,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
  	  num += getreal(type);
  	black += num/len + 0.5;
  	break;
-@@ -5519,9 +5552,12 @@
+@@ -5486,9 +5519,12 @@
    if (thumb_offset) {
      fseek (ifp, thumb_offset, SEEK_SET);
      if (ljpeg_start (&jh, 1)) {
@@ -139,7 +139,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
      }
    }
    for (i=0; i < tiff_nifds; i++) {
-@@ -5529,7 +5565,8 @@
+@@ -5496,7 +5532,8 @@
  	max_samp = tiff_ifd[i].samples;
      if (max_samp > 3) max_samp = 3;
      if ((tiff_ifd[i].comp != 6 || tiff_ifd[i].samples != 3) &&
@@ -149,7 +149,7 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
  	tiff_ifd[i].t_width*tiff_ifd[i].t_height > raw_width*raw_height) {
        raw_width     = tiff_ifd[i].t_width;
        raw_height    = tiff_ifd[i].t_height;
-@@ -5606,17 +5643,19 @@
+@@ -5582,17 +5619,19 @@
  	  !strstr(model2,"DEBUG RAW")))
        is_raw = 0;
    for (i=0; i < tiff_nifds; i++)
@@ -180,11 +180,11 @@ Index: libkdcraw-4.10.2/libraw/internal/dcraw_common.cpp
    if (thm >= 0) {
      thumb_misc |= tiff_ifd[thm].samples << 5;
      switch (tiff_ifd[thm].comp) {
-Index: libkdcraw-4.10.2/libraw/src/libraw_datastream.cpp
+Index: libkdcraw/libraw/src/libraw_datastream.cpp
 ===================================================================
---- libkdcraw-4.10.2.orig/libraw/src/libraw_datastream.cpp	2013-10-01 01:33:56.779280640 -0400
-+++ libkdcraw-4.10.2/libraw/src/libraw_datastream.cpp	2013-10-01 01:33:56.763280640 -0400
-@@ -44,7 +44,12 @@
+--- libkdcraw.orig/libraw/src/libraw_datastream.cpp	2013-10-01 20:08:24.478682563 +0200
++++ libkdcraw/libraw/src/libraw_datastream.cpp	2013-10-01 20:08:24.474682721 +0200
+@@ -64,7 +64,12 @@
  
  LibRaw_byte_buffer *LibRaw_abstract_datastream::make_byte_buffer(unsigned int sz)
  {
@@ -197,7 +197,7 @@ Index: libkdcraw-4.10.2/libraw/src/libraw_datastream.cpp
      read(ret->get_buffer(),sz,1);
      return ret;
  }
-@@ -416,7 +421,10 @@
+@@ -441,7 +446,10 @@
  
  LibRaw_byte_buffer *LibRaw_buffer_datastream::make_byte_buffer(unsigned int sz)
  {

-- 
libkdcraw packaging