main/libjpeg-turbo: upgrade to 1.3.1

2 files changed, 5 insertions, 43 deletions

diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD
index d41b68e6b4..24c04bdb3c 100644
--- a/main/libjpeg-turbo/APKBUILD
+++ b/main/libjpeg-turbo/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libjpeg-turbo
-pkgver=1.3.0
-pkgrel=1
+pkgver=1.3.1
+pkgrel=0
 pkgdesc="accelerated baseline JPEG compression and decompression library"
 url="http://libjpeg-turbo.virtualgl.org/"
 arch="all"
@@ -14,7 +14,6 @@ install=""
 replaces="libjpeg"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
 source="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz
-        CVE-2013-6629-CVE-2013-6630.patch
         "
 
 _builddir="$srcdir"/libjpeg-turbo-$pkgver
@@ -68,9 +67,6 @@ dev() {
         replaces="jpeg-dev"
 }
 
-md5sums="e1e65cc711a1ade1322c06ad4a647741  libjpeg-turbo-1.3.0.tar.gz
-7205b1ed38d47e8736c34c972b1f0367  CVE-2013-6629-CVE-2013-6630.patch"
-sha256sums="2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234  libjpeg-turbo-1.3.0.tar.gz
-3fa40eecb3d80c7c5a12e6ba86e95f381dcacf302d2d72f24858472999b72278  CVE-2013-6629-CVE-2013-6630.patch"
-sha512sums="4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053  libjpeg-turbo-1.3.0.tar.gz
-4ed52c38b9d3dc27f4665216b9d8ca91dbf8e8c7aefc9016e9dd86b7f18cc763223db517fc8545732e28df766630c126c0c0cbe237a51070b0ba140cce4c8b73  CVE-2013-6629-CVE-2013-6630.patch"
+md5sums="2c3a68129dac443a72815ff5bb374b05  libjpeg-turbo-1.3.1.tar.gz"
+sha256sums="c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9  libjpeg-turbo-1.3.1.tar.gz"
+sha512sums="6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081  libjpeg-turbo-1.3.1.tar.gz"
diff --git a/main/libjpeg-turbo/CVE-2013-6629-CVE-2013-6630.patch b/main/libjpeg-turbo/CVE-2013-6629-CVE-2013-6630.patch
deleted file mode 100644
index 7a93d4be23..0000000000
--- a/main/libjpeg-turbo/CVE-2013-6629-CVE-2013-6630.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jdmarker.c
-+++ b/jdmarker.c
-@@ -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. */
-@@ -464,6 +471,8 @@
- 
-     for (i = 0; i < count; i++)
-       INPUT_BYTE(cinfo, huffval[i], return FALSE);
-+
-+    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
- 
-     length -= count;
-