[arch-commits] Commit in lame/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Fri Oct 6 22:23:46 UTC 2017
Date: Friday, October 6, 2017 @ 22:23:45
Author: arojas
Revision: 307067
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lame/repos/extra-i686/CVE-2017-15018.patch
(from rev 307066, lame/trunk/CVE-2017-15018.patch)
lame/repos/extra-i686/PKGBUILD
(from rev 307066, lame/trunk/PKGBUILD)
lame/repos/extra-i686/sse.patch
(from rev 307066, lame/trunk/sse.patch)
lame/repos/extra-x86_64/CVE-2017-15018.patch
(from rev 307066, lame/trunk/CVE-2017-15018.patch)
lame/repos/extra-x86_64/PKGBUILD
(from rev 307066, lame/trunk/PKGBUILD)
lame/repos/extra-x86_64/sse.patch
(from rev 307066, lame/trunk/sse.patch)
Deleted:
lame/repos/extra-i686/PKGBUILD
lame/repos/extra-i686/sse.patch
lame/repos/extra-x86_64/PKGBUILD
lame/repos/extra-x86_64/sse.patch
-----------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++
/sse.patch | 60 +++++++++++++++++++++++++
extra-i686/CVE-2017-15018.patch | 12 +++++
extra-i686/PKGBUILD | 40 -----------------
extra-i686/sse.patch | 30 ------------
extra-x86_64/CVE-2017-15018.patch | 12 +++++
extra-x86_64/PKGBUILD | 40 -----------------
extra-x86_64/sse.patch | 30 ------------
8 files changed, 168 insertions(+), 140 deletions(-)
Copied: lame/repos/extra-i686/CVE-2017-15018.patch (from rev 307066, lame/trunk/CVE-2017-15018.patch)
===================================================================
--- extra-i686/CVE-2017-15018.patch (rev 0)
+++ extra-i686/CVE-2017-15018.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,12 @@
+diff -rupN src/lame-3.99.5/libmp3lame/set_get.c ../lame/libmp3lame/set_get.c
+--- lame-3.99.5/libmp3lame/set_get.c 2011-05-07 12:05:17.000000000 -0400
++++ lame/libmp3lame/set_get.c 2017-09-06 11:07:30.000000000 -0400
+@@ -68,6 +68,8 @@ int
+ lame_set_in_samplerate(lame_global_flags * gfp, int in_samplerate)
+ {
+ if (is_lame_global_flags_valid(gfp)) {
++ if (in_samplerate < 1)
++ return -1;
+ /* input sample rate in Hz, default = 44100 Hz */
+ gfp->samplerate_in = in_samplerate;
+ return 0;
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-10-06 22:23:01 UTC (rev 307066)
+++ extra-i686/PKGBUILD 2017-10-06 22:23:45 UTC (rev 307067)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=lame
-pkgver=3.99.5
-pkgrel=3
-pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
-arch=('i686' 'x86_64')
-url="http://lame.sourceforge.net/"
-depends=('ncurses')
-makedepends=('nasm')
-license=('LGPL')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
- "sse.patch")
-md5sums=('84835b313d4a8b68f5349816d33e07ce'
- 'ca77f3259ed398ae1c55073dacdd752f')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i ../sse.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --enable-nasm \
- --enable-shared
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: lame/repos/extra-i686/PKGBUILD (from rev 307066, lame/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=lame
+pkgver=3.99.5
+pkgrel=4
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
+arch=('i686' 'x86_64')
+url="http://lame.sourceforge.net/"
+depends=('ncurses')
+makedepends=('nasm')
+license=('LGPL')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ "sse.patch" CVE-2017-15018.patch)
+md5sums=('84835b313d4a8b68f5349816d33e07ce'
+ 'ca77f3259ed398ae1c55073dacdd752f'
+ 'f3707ae5dbc6c84018b925ce98ce6158')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i ../sse.patch
+ patch -Np1 -i ../CVE-2017-15018.patch # https://sourceforge.net/p/lame/bugs/480/
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-nasm \
+ --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/sse.patch
===================================================================
--- extra-i686/sse.patch 2017-10-06 22:23:01 UTC (rev 307066)
+++ extra-i686/sse.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -1,30 +0,0 @@
-xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
-xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
-psabi]
- const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
- ^
-In file included from xmm_quantize_sub.c:37:0:
-/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
- _mm_loadu_ps (float const *__P)
- ^
-xmm_quantize_sub.c:65:18: error: called from here
- const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
- ^
---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700
-+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700
-@@ -35,6 +35,7 @@
- #ifdef HAVE_XMMINTRIN_H
-
- #include <xmmintrin.h>
-+#pragma GCC target("sse")
-
- typedef union {
- int32_t _i_32[4]; /* unions are initialized by its first member */
-@@ -124,6 +125,7 @@
- }
-
-
-+#pragma GCC target("sse2")
- void
- fht_SSE2(FLOAT * fz, int n)
- {
Copied: lame/repos/extra-i686/sse.patch (from rev 307066, lame/trunk/sse.patch)
===================================================================
--- extra-i686/sse.patch (rev 0)
+++ extra-i686/sse.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,30 @@
+xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
+xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
+psabi]
+ const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+ ^
+In file included from xmm_quantize_sub.c:37:0:
+/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
+ _mm_loadu_ps (float const *__P)
+ ^
+xmm_quantize_sub.c:65:18: error: called from here
+ const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+ ^
+--- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700
++++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700
+@@ -35,6 +35,7 @@
+ #ifdef HAVE_XMMINTRIN_H
+
+ #include <xmmintrin.h>
++#pragma GCC target("sse")
+
+ typedef union {
+ int32_t _i_32[4]; /* unions are initialized by its first member */
+@@ -124,6 +125,7 @@
+ }
+
+
++#pragma GCC target("sse2")
+ void
+ fht_SSE2(FLOAT * fz, int n)
+ {
Copied: lame/repos/extra-x86_64/CVE-2017-15018.patch (from rev 307066, lame/trunk/CVE-2017-15018.patch)
===================================================================
--- extra-x86_64/CVE-2017-15018.patch (rev 0)
+++ extra-x86_64/CVE-2017-15018.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,12 @@
+diff -rupN src/lame-3.99.5/libmp3lame/set_get.c ../lame/libmp3lame/set_get.c
+--- lame-3.99.5/libmp3lame/set_get.c 2011-05-07 12:05:17.000000000 -0400
++++ lame/libmp3lame/set_get.c 2017-09-06 11:07:30.000000000 -0400
+@@ -68,6 +68,8 @@ int
+ lame_set_in_samplerate(lame_global_flags * gfp, int in_samplerate)
+ {
+ if (is_lame_global_flags_valid(gfp)) {
++ if (in_samplerate < 1)
++ return -1;
+ /* input sample rate in Hz, default = 44100 Hz */
+ gfp->samplerate_in = in_samplerate;
+ return 0;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-10-06 22:23:01 UTC (rev 307066)
+++ extra-x86_64/PKGBUILD 2017-10-06 22:23:45 UTC (rev 307067)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=lame
-pkgver=3.99.5
-pkgrel=3
-pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
-arch=('i686' 'x86_64')
-url="http://lame.sourceforge.net/"
-depends=('ncurses')
-makedepends=('nasm')
-license=('LGPL')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
- "sse.patch")
-md5sums=('84835b313d4a8b68f5349816d33e07ce'
- 'ca77f3259ed398ae1c55073dacdd752f')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i ../sse.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --enable-nasm \
- --enable-shared
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: lame/repos/extra-x86_64/PKGBUILD (from rev 307066, lame/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=lame
+pkgver=3.99.5
+pkgrel=4
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
+arch=('i686' 'x86_64')
+url="http://lame.sourceforge.net/"
+depends=('ncurses')
+makedepends=('nasm')
+license=('LGPL')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ "sse.patch" CVE-2017-15018.patch)
+md5sums=('84835b313d4a8b68f5349816d33e07ce'
+ 'ca77f3259ed398ae1c55073dacdd752f'
+ 'f3707ae5dbc6c84018b925ce98ce6158')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i ../sse.patch
+ patch -Np1 -i ../CVE-2017-15018.patch # https://sourceforge.net/p/lame/bugs/480/
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-nasm \
+ --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/sse.patch
===================================================================
--- extra-x86_64/sse.patch 2017-10-06 22:23:01 UTC (rev 307066)
+++ extra-x86_64/sse.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -1,30 +0,0 @@
-xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
-xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
-psabi]
- const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
- ^
-In file included from xmm_quantize_sub.c:37:0:
-/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
- _mm_loadu_ps (float const *__P)
- ^
-xmm_quantize_sub.c:65:18: error: called from here
- const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
- ^
---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700
-+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700
-@@ -35,6 +35,7 @@
- #ifdef HAVE_XMMINTRIN_H
-
- #include <xmmintrin.h>
-+#pragma GCC target("sse")
-
- typedef union {
- int32_t _i_32[4]; /* unions are initialized by its first member */
-@@ -124,6 +125,7 @@
- }
-
-
-+#pragma GCC target("sse2")
- void
- fht_SSE2(FLOAT * fz, int n)
- {
Copied: lame/repos/extra-x86_64/sse.patch (from rev 307066, lame/trunk/sse.patch)
===================================================================
--- extra-x86_64/sse.patch (rev 0)
+++ extra-x86_64/sse.patch 2017-10-06 22:23:45 UTC (rev 307067)
@@ -0,0 +1,30 @@
+xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
+xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
+psabi]
+ const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+ ^
+In file included from xmm_quantize_sub.c:37:0:
+/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
+ _mm_loadu_ps (float const *__P)
+ ^
+xmm_quantize_sub.c:65:18: error: called from here
+ const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+ ^
+--- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700
++++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700
+@@ -35,6 +35,7 @@
+ #ifdef HAVE_XMMINTRIN_H
+
+ #include <xmmintrin.h>
++#pragma GCC target("sse")
+
+ typedef union {
+ int32_t _i_32[4]; /* unions are initialized by its first member */
+@@ -124,6 +125,7 @@
+ }
+
+
++#pragma GCC target("sse2")
+ void
+ fht_SSE2(FLOAT * fz, int n)
+ {
More information about the arch-commits
mailing list