[arch-commits] Commit in lib32-libjpeg-turbo/trunk (PKGBUILD cve-2013-6629.patch)

[Florian Pritz]

    Date: Sunday, April 20, 2014 @ 22:52:47
  Author: bluewind
Revision: 109881

upgpkg: lib32-libjpeg-turbo 1.3.1-1

upstream update

Modified:
  lib32-libjpeg-turbo/trunk/PKGBUILD
Deleted:
  lib32-libjpeg-turbo/trunk/cve-2013-6629.patch

---------------------+
 PKGBUILD            |   15 ++++-----------
 cve-2013-6629.patch |   36 ------------------------------------
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-20 20:51:24 UTC (rev 109880)
+++ PKGBUILD	2014-04-20 20:52:47 UTC (rev 109881)
@@ -4,8 +4,8 @@
 
 _pkgbasename=libjpeg-turbo
 pkgname=lib32-$_pkgbasename
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
 arch=('x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -16,16 +16,9 @@
 conflicts=('lib32-libjpeg' 'lib32-turbojpeg')
 replaces=('lib32-libjpeg' 'lib32-turbojpeg')
 options=('!libtool')
-source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz
-        'cve-2013-6629.patch')
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
-          '10f2cf2276244d2b94d35bfca24639bc83ce1185')
+source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz)
+sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468')
 
-prepare() {
-  cd "$_pkgbasename-$pkgver"
-  patch -i ../cve-2013-6629.patch # FS#38094
-}
-
 build() {
   cd "$_pkgbasename-$pkgver"
 

Deleted: cve-2013-6629.patch
===================================================================
--- cve-2013-6629.patch	2014-04-20 20:51:24 UTC (rev 109880)
+++ cve-2013-6629.patch	2014-04-20 20:52:47 UTC (rev 109881)
@@ -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 */