cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to vlc-0.8.6e

Browse Source 
This is a bugfix release. VLC media player 0.8.6d and earlier versions
suffer from security vulnerabilities in the Web interface, Subtitle
demuxer, Real RTSP demuxer, SDL_image library and MP4 demuxer.

See http://www.videolan.org/security/sa0801.php and
http://www.videolan.org/security/sa0802.php for more details.

from brad, OK naddy
This commit is contained in:
jakemsr 2008-03-02 02:27:04 +00:00
parent 441c607617
commit 375747e383
8 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/vlc/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.65 2008/02/02 09:51:05 steven Exp $
# $OpenBSD: Makefile,v 1.66 2008/03/02 02:27:04 jakemsr Exp $
SHARED_ONLY= Yes
COMMENT-main= videolan client; multimedia player
V= 0.8.6d
V= 0.8.6e
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-main= ${DISTNAME}
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@ -47,7 +47,7 @@ RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
WANTLIB-main= ICE SM X11 Xext Xinerama Xv Xxf86vm c freetype m ncurses \
pthread stdc++ usbhid z Xau Xdmcp Xrandr Xrender \
SDL jpeg tiff faad ogg vorbis vorbisenc faac mp3lame ossaudio
SDL jpeg tiff faad ogg vorbis vorbisenc faac mp3lame
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.61
@ -192,7 +192,7 @@ CONFIGURE_ARGS+=--enable-arts
LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
# any FLAVOR of vlc will do
RUN_DEPENDS-arts=::x11/vlc
WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre pthread
WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre
.else
CONFIGURE_ARGS+=--disable-arts
.endif

10
x11/vlc/distinfo
View File

@ -1,5 +1,5 @@
MD5 (vlc-0.8.6d.tar.gz) = Qk60levWTV209l+8yJTgvA==
RMD160 (vlc-0.8.6d.tar.gz) = AiiDaIyKJxaDPsOB2otGQDhQGuw=
SHA1 (vlc-0.8.6d.tar.gz) = pMHg+ijNfhPuFtkOSpOS0eU+WkE=
SHA256 (vlc-0.8.6d.tar.gz) = wg5UeCr5yKrPewNo2zvXpzwG3vAn5BpmRfyjxcl/TxI=
SIZE (vlc-0.8.6d.tar.gz) = 16286700
MD5 (vlc-0.8.6e.tar.gz) = 5LZOOLlehKUrUd1DO6Zpcg==
RMD160 (vlc-0.8.6e.tar.gz) = CURpXFoW2R0S4/Z814aFrEmfQVo=
SHA1 (vlc-0.8.6e.tar.gz) = AL9WfnavhtDImFOreuxYaxc7Ozk=
SHA256 (vlc-0.8.6e.tar.gz) = iqcN8Ujic24r65+1lOiNFrKwedIivG+I7j8ENorf668=
SIZE (vlc-0.8.6e.tar.gz) = 16285612

18
x11/vlc/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
--- configure.ac.orig Tue Nov 27 08:11:35 2007
+++ configure.ac Sat Dec 1 22:31:03 2007
@@ -198,7 +198,7 @@ case "${target_os}" in
$OpenBSD: patch-configure_ac,v 1.11 2008/03/02 02:27:04 jakemsr Exp $
--- configure.ac.orig Sun Feb 24 14:01:55 2008
+++ configure.ac Thu Feb 28 11:22:52 2008
@@ -199,7 +199,7 @@ case "${target_os}" in
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
;;
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
AC_CHECK_TOOL(WINDRES, windres, :)
case "${target_os}" in
@@ -214,7 +214,7 @@ case "${target_os}" in
@@ -215,7 +215,7 @@ case "${target_os}" in
#endif],
SYS=mingw32, SYS=cygwin)
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
SYS=mingwce
;;
esac
@@ -656,6 +656,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
@@ -657,6 +657,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "${THREAD_LIB}" = "error"; then
@ -29,7 +29,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "${THREAD_LIB}" = "error"; then
@@ -2693,7 +2696,7 @@ dnl Look for a ffmpeg-config (we are on debian )
@@ -2694,7 +2697,7 @@ dnl Look for a ffmpeg-config (we are on debian )
else
dnl Trying with pkg-config
@ -38,7 +38,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
@@ -3355,13 +3358,13 @@ AC_ARG_ENABLE(png,
@@ -3356,13 +3359,13 @@ AC_ARG_ENABLE(png,
[ --enable-png PNG support (default enabled)])
if test "${enable_png}" != "no"; then
AC_CHECK_HEADERS(png.h, [
@ -49,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
+ VLC_ADD_LDFLAGS([png],[-lpng -lz -lm])
VLC_ADD_PLUGINS([png])
VLC_ADD_PLUGINS([osdmenu])
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
- [],[-lz])
+ [],[-lz -lm])
LDFLAGS="${LDFLAGS_save}"

8
x11/vlc/patches/patch-modules_access_ftp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_access_ftp_c,v 1.4 2007/04/08 17:34:20 ajacoutot Exp $
--- modules/access/ftp.c.orig Sat Dec 9 02:12:17 2006
+++ modules/access/ftp.c Sun Apr 8 10:45:29 2007
@@ -542,7 +542,7 @@ static int ftp_ReadCommand( access_t *p_access,
$OpenBSD: patch-modules_access_ftp_c,v 1.5 2008/03/02 02:27:04 jakemsr Exp $
--- modules/access/ftp.c.orig Thu Jan 17 16:31:51 2008
+++ modules/access/ftp.c Thu Feb 28 11:18:08 2008
@@ -544,7 +544,7 @@ static int ftp_ReadCommand( access_t *p_access,
return( i_answer / 100 );
}

10
x11/vlc/patches/patch-modules_audio_output_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.2 2007/12/11 11:07:54 jakemsr Exp $
--- modules/audio_output/Makefile.in.orig Tue Nov 27 14:23:14 2007
+++ modules/audio_output/Makefile.in Sat Dec 1 23:27:42 2007
@@ -713,6 +713,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.3 2008/03/02 02:27:04 jakemsr Exp $
--- modules/audio_output/Makefile.in.orig Sun Feb 24 14:07:20 2008
+++ modules/audio_output/Makefile.in Thu Feb 28 11:18:09 2008
@@ -715,6 +715,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
-rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
libarts_plugin_la_LIBADD = $(LTLIBVLC)
@ -9,7 +9,7 @@ $OpenBSD: patch-modules_audio_output_Makefile_in,v 1.2 2007/12/11 11:07:54 jakem
libarts_a_SOURCES = $(SOURCES_arts)
libarts_builtin_la_SOURCES = $(SOURCES_arts)
libarts_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic arts`
@@ -2065,7 +2066,7 @@ all-modules:
@@ -2067,7 +2068,7 @@ all-modules:
# Build a plugin with the adequate linker and linker's flags
_plugin.a_plugin$(LIBEXT):

12
x11/vlc/patches/patch-modules_codec_ffmpeg_mux_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_codec_ffmpeg_mux_c,v 1.1 2008/01/26 11:27:05 jakemsr Exp $
--- modules/codec/ffmpeg/mux.c.orig Sun Jan 20 02:12:43 2008
+++ modules/codec/ffmpeg/mux.c Sun Jan 20 02:12:57 2008
@@ -133,7 +133,7 @@ int E_(OpenMux)( vlc_object_t *p_this )
return VLC_EGENERIC;
}
- p_sys->oc->pb = p_sys->io;
+ p_sys->oc->pb = &p_sys->io;
p_sys->oc->nb_streams = 0;
p_sys->b_write_header = VLC_TRUE;

8
x11/vlc/patches/patch-modules_demux_ogg_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_demux_ogg_c,v 1.5 2007/04/22 13:21:12 aanriot Exp $
--- modules/demux/ogg.c.orig Sun Apr 22 10:52:35 2007
+++ modules/demux/ogg.c Sun Apr 22 10:53:24 2007
@@ -1365,7 +1365,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_thi
$OpenBSD: patch-modules_demux_ogg_c,v 1.6 2008/03/02 02:27:04 jakemsr Exp $
--- modules/demux/ogg.c.orig Sun Feb 24 14:01:53 2008
+++ modules/demux/ogg.c Thu Feb 28 11:18:09 2008
@@ -1374,7 +1374,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_thi
uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
p_oggpacket->bytes - 1 );
if( p && p[0] == '\r' && p[1] == '\n' )

8
x11/vlc/patches/patch-share_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-share_Makefile_in,v 1.4 2007/12/11 11:07:54 jakemsr Exp $
--- share/Makefile.in.orig Tue Nov 27 14:23:56 2007
+++ share/Makefile.in Sat Dec 1 22:31:03 2007
@@ -848,7 +848,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
$OpenBSD: patch-share_Makefile_in,v 1.5 2008/03/02 02:27:04 jakemsr Exp $
--- share/Makefile.in.orig Sun Feb 24 14:07:49 2008
+++ share/Makefile.in Thu Feb 28 11:18:09 2008
@@ -850,7 +850,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
skins2/default.vlt:
mkdir -p skins2