summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-02-02 15:58:49 +0000
committer Eric Hameleers <alien@slackware.com>2013-02-02 15:58:49 +0000
commit087c0910722a2168e87581dd3f70586111655c8a (patch)
tree6422487457a69d26164056519fb72f6d478e65dd /vlc
parent8b130198ea43991e1940120ba7412e049158ed78 (diff)
downloadasb-087c0910722a2168e87581dd3f70586111655c8a.tar.gz
asb-087c0910722a2168e87581dd3f70586111655c8a.tar.xz
Address SA-1302 critical vulnerability in ASF muxer
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild13
1 files changed, 11 insertions, 2 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 5b5bc15a..b90eff16 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
# $Id$
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, Netherlands
#
# Permission to use, copy, modify, and distribute this software for
# any purpose with or without fee is hereby granted, provided that
@@ -344,6 +344,9 @@
# * Update. Rolled back the internal ffmpeg to snapshot r44967
# (git 82db8ee) (pre-planar) until the bugs caused by FFmpeg's
# planar audio changes are fixed.
+# 2.0.5-2 02/feb/2013 by Eric Hameleers <alien@slackware.com>
+# * Apply patch for VideoLAN-SA-1302 (critical vulnerability in
+# the ASF demuxer).
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -367,7 +370,7 @@
PRGNAM=vlc
PRGNAM2=npapi-vlc
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-"alien"}
PKGTYPE=${PKGTYPE:-"txz"}
@@ -3307,6 +3310,12 @@ if [ "$VERSION" = "2.0.4" ]; then
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
fi
+# Address VideoLAN-SA-1302 - fixed in 2.0.6
+if [ "$VERSION" = "2.0.5" ]; then
+ cat $SRCDIR/vlc-2.0.5_SA-1302.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
+
## VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
#if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
# rm -f m4/{lt,lib}*.m4; autoreconf -svif