Date: Wednesday, December 11, 2013 @ 05:56:37
Author: bisson
Revision: 201420
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libjpeg-turbo/repos/extra-i686/PKGBUILD
(from rev 201419, libjpeg-turbo/trunk/PKGBUILD)
libjpeg-turbo/repos/extra-i686/cve-2013-6629.patch
(from rev 201419, libjpeg-turbo/trunk/cve-2013-6629.patch)
libjpeg-turbo/repos/extra-x86_64/PKGBUILD
(from rev 201419, libjpeg-turbo/trunk/PKGBUILD)
libjpeg-turbo/repos/extra-x86_64/cve-2013-6629.patch
(from rev 201419, libjpeg-turbo/trunk/cve-2013-6629.patch)
Deleted:
libjpeg-turbo/repos/extra-i686/PKGBUILD
libjpeg-turbo/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 43 ---------------
extra-i686/cve-2013-6629.patch | 36 +++++++++++++
extra-x86_64/PKGBUILD | 43 ---------------
extra-x86_64/cve-2013-6629.patch | 36 +++++++++++++
5 files changed, 172 insertions(+), 86 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-12-11 04:56:04 UTC (rev 201419)
+++ extra-i686/PKGBUILD 2013-12-11 04:56:37 UTC (rev 201420)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Contributor: Simone Sclavi 'Ito' <[email protected]>
-
-pkgname=libjpeg-turbo
-pkgver=1.3.0
-pkgrel=3
-pkgdesc='JPEG image codec with accelerated baseline compression and
decompression'
-url='http://libjpeg-turbo.virtualgl.org/'
-license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-makedepends=('nasm')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
-
-provides=('libjpeg=8.0.2' 'turbojpeg')
-conflicts=('libjpeg' 'turbojpeg')
-replaces=('libjpeg' 'turbojpeg')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make test
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make \
- DESTDIR="${pkgdir}" \
- docdir="/usr/share/doc/${pkgname}" \
- exampledir="/usr/share/doc/${pkgname}" \
- install
-
- install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
- ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s
../../doc/libjpeg-turbo/README{,-turbo.txt}
- install -m644 jpegint.h "${pkgdir}/usr/include" # required by other
software
-}
Copied: libjpeg-turbo/repos/extra-i686/PKGBUILD (from rev 201419,
libjpeg-turbo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-12-11 04:56:37 UTC (rev 201420)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: Simone Sclavi 'Ito' <[email protected]>
+
+pkgname=libjpeg-turbo
+pkgver=1.3.0
+pkgrel=4
+pkgdesc='JPEG image codec with accelerated baseline compression and
decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
+license=('GPL' 'custom')
+arch=('i686' 'x86_64')
+makedepends=('nasm')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'cve-2013-6629.patch')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
+ '10f2cf2276244d2b94d35bfca24639bc83ce1185')
+
+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
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make test
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make \
+ DESTDIR="${pkgdir}" \
+ docdir="/usr/share/doc/${pkgname}" \
+ exampledir="/usr/share/doc/${pkgname}" \
+ install
+
+ install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+ ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s
../../doc/libjpeg-turbo/README{,-turbo.txt}
+ install -m644 jpegint.h "${pkgdir}/usr/include" # required by other
software
+}
Copied: libjpeg-turbo/repos/extra-i686/cve-2013-6629.patch (from rev 201419,
libjpeg-turbo/trunk/cve-2013-6629.patch)
===================================================================
--- extra-i686/cve-2013-6629.patch (rev 0)
+++ extra-i686/cve-2013-6629.patch 2013-12-11 04:56:37 UTC (rev 201420)
@@ -0,0 +1,36 @@
+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 */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-12-11 04:56:04 UTC (rev 201419)
+++ extra-x86_64/PKGBUILD 2013-12-11 04:56:37 UTC (rev 201420)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Contributor: Simone Sclavi 'Ito' <[email protected]>
-
-pkgname=libjpeg-turbo
-pkgver=1.3.0
-pkgrel=3
-pkgdesc='JPEG image codec with accelerated baseline compression and
decompression'
-url='http://libjpeg-turbo.virtualgl.org/'
-license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-makedepends=('nasm')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
-
-provides=('libjpeg=8.0.2' 'turbojpeg')
-conflicts=('libjpeg' 'turbojpeg')
-replaces=('libjpeg' 'turbojpeg')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make test
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make \
- DESTDIR="${pkgdir}" \
- docdir="/usr/share/doc/${pkgname}" \
- exampledir="/usr/share/doc/${pkgname}" \
- install
-
- install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
- ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s
../../doc/libjpeg-turbo/README{,-turbo.txt}
- install -m644 jpegint.h "${pkgdir}/usr/include" # required by other
software
-}
Copied: libjpeg-turbo/repos/extra-x86_64/PKGBUILD (from rev 201419,
libjpeg-turbo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-12-11 04:56:37 UTC (rev 201420)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: Simone Sclavi 'Ito' <[email protected]>
+
+pkgname=libjpeg-turbo
+pkgver=1.3.0
+pkgrel=4
+pkgdesc='JPEG image codec with accelerated baseline compression and
decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
+license=('GPL' 'custom')
+arch=('i686' 'x86_64')
+makedepends=('nasm')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'cve-2013-6629.patch')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
+ '10f2cf2276244d2b94d35bfca24639bc83ce1185')
+
+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
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make test
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make \
+ DESTDIR="${pkgdir}" \
+ docdir="/usr/share/doc/${pkgname}" \
+ exampledir="/usr/share/doc/${pkgname}" \
+ install
+
+ install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+ ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s
../../doc/libjpeg-turbo/README{,-turbo.txt}
+ install -m644 jpegint.h "${pkgdir}/usr/include" # required by other
software
+}
Copied: libjpeg-turbo/repos/extra-x86_64/cve-2013-6629.patch (from rev 201419,
libjpeg-turbo/trunk/cve-2013-6629.patch)
===================================================================
--- extra-x86_64/cve-2013-6629.patch (rev 0)
+++ extra-x86_64/cve-2013-6629.patch 2013-12-11 04:56:37 UTC (rev 201420)
@@ -0,0 +1,36 @@
+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 */
