From e1f77675323ccc48cca81953f9403508477d59e9 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 7 Oct 2017 09:16:52 +0700
Subject: [PATCH] libraries/lame: Fix CVE-2017-15018.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/lame/CVE-2017-15018.patch.gz | Bin 0 -> 307 bytes
 libraries/lame/lame.SlackBuild         |  22 +++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 libraries/lame/CVE-2017-15018.patch.gz

diff --git a/libraries/lame/CVE-2017-15018.patch.gz b/libraries/lame/CVE-2017-15018.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..30d768d4f0bf977ab28ea6510907082317b9bf79
GIT binary patch
literal 307
zcmV-30nGj%iwFoKIM`VL14C9tEiy1MH!U$WFflkTaA9;~XaI#z%WlFj5IomkF-Jn!
zWX&rO+KMBm{z7EHi7c5kN}L|(&(}$51EQ#Nu;kf!>>f>?gX*?=LsK7Ot4^9`(Rv*%
zVr%xNYSuAvqg_^L7ab5qz2?uMAR_#i@HAy9i5J8P<TT|)DwBwR0OC2b2*VH$Yr2Gl
zcul;7lqo0ajPDY*ThMYfSt9iB3jS+KC;HH=OEP8Fs8eNit(+e9bYb83%4WG$MT0Sl
zyqa_-+(-j~Pk|05$H+9<oi+PV)*MIP9t2(+;(}g(9ffDeV3>EPwQK7VBsb!hi^qP0
zs&)8wqPLn7yYmD%>Rh$f;RW-#^vCbc7{`OxFF~(EqrciKZ<e?!x|H)qd;#?nwVM?J
F005-5j@<wN

literal 0
HcmV?d00001

diff --git a/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild
index bf04caabc0..2b44132473 100644
--- a/libraries/lame/lame.SlackBuild
+++ b/libraries/lame/lame.SlackBuild
@@ -25,12 +25,12 @@
 
 PRGNAM=lame
 VERSION=${VERSION:-3.99.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -55,7 +55,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e  
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -65,10 +65,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix for the newer gcc
 # http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html
@@ -76,6 +76,9 @@ case $(uname -m) in
   i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
 esac
 
+# Fix CVE-2017-15018
+zcat $CWD/CVE-2017-15018.patch.gz | patch -p1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --htmldir=/usr/doc/$PRGNAM-$VERSION \
   --enable-nasm \
+  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make pkgdocdir=/usr/doc/$PRGNAM-$VERSION