aboutsummaryrefslogtreecommitdiff
path: root/libraries/lame/lame.SlackBuild
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-10-07 09:16:52 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-10-11 06:19:20 +0700
commite1f77675323ccc48cca81953f9403508477d59e9 (patch)
treeccd06abb853278f4a307a2ad9d6405e9a8969659 /libraries/lame/lame.SlackBuild
parent301941fc69b12538a298ec4fb635d390820adf2e (diff)
libraries/lame: Fix CVE-2017-15018.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/lame/lame.SlackBuild')
-rw-r--r--libraries/lame/lame.SlackBuild22
1 files changed, 13 insertions, 9 deletions
diff --git a/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild
index bf04caabc0f0..2b4413247399 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