Date: Sunday, April 20, 2014 @ 22:52:50 Author: bluewind Revision: 109882
archrelease: copy trunk to multilib-x86_64 Added: lib32-libjpeg-turbo/repos/multilib-x86_64/PKGBUILD (from rev 109881, lib32-libjpeg-turbo/trunk/PKGBUILD) Deleted: lib32-libjpeg-turbo/repos/multilib-x86_64/PKGBUILD lib32-libjpeg-turbo/repos/multilib-x86_64/cve-2013-6629.patch ---------------------+ PKGBUILD | 109 +++++++++++++++++++++++--------------------------- cve-2013-6629.patch | 36 ---------------- 2 files changed, 51 insertions(+), 94 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-04-20 20:52:47 UTC (rev 109881) +++ PKGBUILD 2014-04-20 20:52:50 UTC (rev 109882) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> -# Contributor: Simone Sclavi 'Ito' <darkh...@gmail.com> - -_pkgbasename=libjpeg-turbo -pkgname=lib32-$_pkgbasename -pkgver=1.3.0 -pkgrel=4 -pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)" -arch=('x86_64') -url="http://libjpeg-turbo.virtualgl.org/" -license=('GPL' 'custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('nasm' gcc-multilib) -provides=('lib32-libjpeg=8.0.2' 'lib32-turbojpeg') -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') - -prepare() { - cd "$_pkgbasename-$pkgver" - patch -i ../cve-2013-6629.patch # FS#38094 -} - -build() { - cd "$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # it doesn't seem necessary.... - # sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure - ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd - - make -} - -check() { - cd "$_pkgbasename-$pkgver" - make test - } - -package() { - cd "$_pkgbasename-$pkgver" - - make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ - exampledir=/usr/share/doc/libjpeg-turbo install - - rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} Copied: lib32-libjpeg-turbo/repos/multilib-x86_64/PKGBUILD (from rev 109881, lib32-libjpeg-turbo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-04-20 20:52:50 UTC (rev 109882) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> +# Contributor: Simone Sclavi 'Ito' <darkh...@gmail.com> + +_pkgbasename=libjpeg-turbo +pkgname=lib32-$_pkgbasename +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/" +license=('GPL' 'custom') +depends=('lib32-glibc' $_pkgbasename) +makedepends=('nasm' gcc-multilib) +provides=('lib32-libjpeg=8.0.2' 'lib32-turbojpeg') +conflicts=('lib32-libjpeg' 'lib32-turbojpeg') +replaces=('lib32-libjpeg' 'lib32-turbojpeg') +options=('!libtool') +source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz) +sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468') + +build() { + cd "$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # it doesn't seem necessary.... + # sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd + + make +} + +check() { + cd "$_pkgbasename-$pkgver" + make test + } + +package() { + cd "$_pkgbasename-$pkgver" + + make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ + exampledir=/usr/share/doc/libjpeg-turbo install + + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} Deleted: cve-2013-6629.patch =================================================================== --- cve-2013-6629.patch 2014-04-20 20:52:47 UTC (rev 109881) +++ cve-2013-6629.patch 2014-04-20 20:52:50 UTC (rev 109882) @@ -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 */