[arch-commits] Commit in lame/trunk (CVE-2017-15018.patch PKGBUILD sse.patch)

[Antonio Rojas]

    Date: Saturday, October 14, 2017 @ 08:54:02
  Author: arojas
Revision: 307837

Update to 3.100

Modified:
  lame/trunk/PKGBUILD
Deleted:
  lame/trunk/CVE-2017-15018.patch
  lame/trunk/sse.patch

----------------------+
 CVE-2017-15018.patch |   12 ------------
 PKGBUILD             |   23 ++++++-----------------
 sse.patch            |   30 ------------------------------
 3 files changed, 6 insertions(+), 59 deletions(-)

Deleted: CVE-2017-15018.patch
===================================================================
--- CVE-2017-15018.patch	2017-10-13 23:05:00 UTC (rev 307836)
+++ CVE-2017-15018.patch	2017-10-14 08:54:02 UTC (rev 307837)
@@ -1,12 +0,0 @@
-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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-13 23:05:00 UTC (rev 307836)
+++ PKGBUILD	2017-10-14 08:54:02 UTC (rev 307837)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=lame
-pkgver=3.99.5
-pkgrel=4
+pkgver=3.100
+pkgrel=1
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
 arch=('i686' 'x86_64')
 url="http://lame.sourceforge.net/"
@@ -12,20 +12,11 @@
 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')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('83e260acbe4389b54fe08e0bdbf7cddb')
 
-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"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
               --enable-nasm \
@@ -34,9 +25,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
 }
-
-# vim:set ts=2 sw=2 et:

Deleted: sse.patch
===================================================================
--- sse.patch	2017-10-13 23:05:00 UTC (rev 307836)
+++ sse.patch	2017-10-14 08:54:02 UTC (rev 307837)
@@ -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)
- {