From fa7784c59d87741fc39bcd59ab7560f54a3ffd37 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 10 Apr 2014 17:48:57 +0000
Subject: [PATCH] extra/libjpeg-turbo to 1.3.1-1

---
 extra/libjpeg-turbo/PKGBUILD            | 16 +++--------
 extra/libjpeg-turbo/cve-2013-6629.patch | 36 -------------------------
 2 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 extra/libjpeg-turbo/cve-2013-6629.patch

diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index d6921a081..4bd1fdad9 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -8,26 +8,18 @@
 #  - added --without-simd to configure, no NEON
 
 pkgname=libjpeg-turbo
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.1
+pkgrel=1
 pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
 url='http://libjpeg-turbo.virtualgl.org/'
 license=('GPL' 'custom')
 arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'cve-2013-6629.patch')
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
-          '10f2cf2276244d2b94d35bfca24639bc83ce1185')
-
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468')
 provides=('libjpeg=8.0.2' 'turbojpeg')
 conflicts=('libjpeg' 'turbojpeg')
 replaces=('libjpeg' 'turbojpeg')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -i ../cve-2013-6629.patch # FS#38094
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --without-simd
diff --git a/extra/libjpeg-turbo/cve-2013-6629.patch b/extra/libjpeg-turbo/cve-2013-6629.patch
deleted file mode 100644
index 7fb02730f..000000000
--- a/extra/libjpeg-turbo/cve-2013-6629.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: jdmarker.c
-===================================================================
---- jdmarker.c	(revision 1088)
-+++ jdmarker.c	(revision 1089)
-@@ -304,7 +304,7 @@
- /* Process a SOS marker */
- {
-   INT32 length;
--  int i, ci, n, c, cc;
-+  int i, ci, n, c, cc, pi;
-   jpeg_component_info * compptr;
-   INPUT_VARS(cinfo);
- 
-@@ -348,6 +348,13 @@
-     
-     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
- 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-+
-+    /* This CSi (cc) should differ from the previous CSi */
-+    for (pi = 0; pi < i; pi++) {
-+      if (cinfo->cur_comp_info[pi] == compptr) {
-+        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-+      }
-+    }
-   }
- 
-   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
-@@ -465,6 +472,8 @@
-     for (i = 0; i < count; i++)
-       INPUT_BYTE(cinfo, huffval[i], return FALSE);
- 
-+    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
-+
-     length -= count;
- 
-     if (index & 0x10) {		/* AC table definition */