diff --git a/mingw-w64-libjpeg-turbo/PKGBUILD b/mingw-w64-libjpeg-turbo/PKGBUILD index 180ba0d37c..643e2457cd 100644 --- a/mingw-w64-libjpeg-turbo/PKGBUILD +++ b/mingw-w64-libjpeg-turbo/PKGBUILD @@ -3,8 +3,8 @@ _realname=libjpeg-turbo _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)" arch=('any') url="http://libjpeg-turbo.virtualgl.org" @@ -20,14 +20,12 @@ source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta "libjpeg-turbo-match-autoconf-behavior.patch" "jpeg-7-tiff-ojpeg.patch" "jpeg-typedefs.patch" - "libjpeg-buf-oflo.patch" - 'cve-2013-6629.patch') -md5sums=('e1e65cc711a1ade1322c06ad4a647741' + "libjpeg-buf-oflo.patch") +md5sums=('2c3a68129dac443a72815ff5bb374b05' '6b00863ecdd729cb757e7f3672324f6f' '4f927780387c77244c2f89b2c6a66eb2' 'b758ab3ac6a0604c6ed5fb9d850c9a73' - '8835de1a830ae9979460f14f79e90630' - '673ac0a595ecb164e60af122a0c8df02') + '8835de1a830ae9979460f14f79e90630') prepare() { cd "$srcdir/libjpeg-turbo-$pkgver" @@ -35,7 +33,6 @@ prepare() { patch -p1 -i ${srcdir}/jpeg-7-tiff-ojpeg.patch patch -p1 -i ${srcdir}/jpeg-typedefs.patch patch -p1 -i ${srcdir}/libjpeg-buf-oflo.patch - patch -p0 -i ${srcdir}/cve-2013-6629.patch } build() { diff --git a/mingw-w64-libjpeg-turbo/cve-2013-6629.patch b/mingw-w64-libjpeg-turbo/cve-2013-6629.patch deleted file mode 100644 index 7fb02730f0..0000000000 --- a/mingw-w64-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 */