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

security/bugfix update

Browse Source 
from the release notes:

VLC media player 0.8.6e and earlier versions suffer from security
vulnerabilities in the Subtitle demuxer, Real RTSP demuxer, MP4
demuxer and Cinepak codec.

from brad@
This commit is contained in:
jakemsr 2008-04-04 00:53:01 +00:00
parent e9b586b0a3
commit 316ff80c5c
4 changed files with 29 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/vlc/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.67 2008/03/24 04:46:26 jakemsr Exp $
# $OpenBSD: Makefile,v 1.68 2008/04/04 00:53:01 jakemsr Exp $
SHARED_ONLY= Yes
COMMENT-main= videolan client; multimedia player
V= 0.8.6e
V= 0.8.6f
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
CATEGORIES= x11
@ -171,7 +171,7 @@ FLAVOR?=
.if !${FLAVOR:L:Mno_web}
MULTI_PACKAGES+=-web
COMMENT-web= mozilla plugin for embedded media playback
PKGNAME-web= vlc-web-${V}p0
PKGNAME-web= vlc-web-${V}
BUILD_DEPENDS+= :xulrunner-devel-*:devel/xulrunner,-devel
CONFIGURE_ARGS+=--enable-mozilla
CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
@ -187,7 +187,7 @@ CONFIGURE_ARGS+=--disable-mozilla
.if !${FLAVOR:L:Mno_arts}
MULTI_PACKAGES+=-arts
COMMENT-arts= artsd audio output module for vlc
FULLPKGNAME-arts=vlc-arts-${V}p0
FULLPKGNAME-arts=vlc-arts-${V}
CONFIGURE_ARGS+=--enable-arts
LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
# any FLAVOR of vlc will do
@ -200,7 +200,7 @@ CONFIGURE_ARGS+=--disable-arts
.if !${FLAVOR:L:Mno_esd}
MULTI_PACKAGES+=-esd
COMMENT-esd= esound audio output module for vlc
FULLPKGNAME-esd=vlc-esd-${V}p0
FULLPKGNAME-esd=vlc-esd-${V}
CONFIGURE_ARGS+=--enable-esd
LIB_DEPENDS-esd=esd.>=2::audio/esound
# any FLAVOR of vlc will do

10
x11/vlc/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (vlc-0.8.6f.tar.gz) = KUuDry02FliNlH4dAIumzQ==
RMD160 (vlc-0.8.6f.tar.gz) = DPeg1THUhBRhqiV5IBB5rtDXCXE=
SHA1 (vlc-0.8.6f.tar.gz) = WmHZ2i3rmEFx8u6bpd10+NdpQIk=
SHA256 (vlc-0.8.6f.tar.gz) = V7AFtA3uT6d39gBZlDp4mwXsKa2QmIDoLZCvNDaS2Qo=
SIZE (vlc-0.8.6f.tar.gz) = 16661357

121
x11/vlc/patches/patch-include_vlc_threads_funcs_h
View File

@ -1,111 +1,14 @@
$OpenBSD: patch-include_vlc_threads_funcs_h,v 1.4 2007/04/08 17:34:20 ajacoutot Exp $
--- include/vlc_threads_funcs.h.orig Sat Dec 9 02:12:27 2006
+++ include/vlc_threads_funcs.h Sun Apr 8 10:45:29 2007
@@ -69,7 +69,7 @@ static inline int __vlc_mutex_lock( const char * psz_f
{
int i_result;
/* In case of error : */
- int i_thread = -1;
+ long i_thread = -1;
const char * psz_error = "";
#if defined( PTH_INIT_IN_PTH_H )
@@ -111,7 +111,7 @@ static inline int __vlc_mutex_lock( const char * psz_f
i_result = pthread_mutex_lock( &p_mutex->mutex );
if ( i_result )
$OpenBSD: patch-include_vlc_threads_funcs_h,v 1.5 2008/04/04 00:53:01 jakemsr Exp $
--- include/vlc_threads_funcs.h.orig Mon Mar 31 15:07:51 2008
+++ include/vlc_threads_funcs.h Thu Apr 3 03:51:08 2008
@@ -486,8 +486,8 @@ static inline int __vlc_cond_wait( const char * psz_fi
{
- i_thread = (int)pthread_self();
+ i_thread = (long)pthread_self();
psz_error = strerror(i_result);
}
@@ -124,7 +124,7 @@ static inline int __vlc_mutex_lock( const char * psz_f
if( i_result )
{
msg_Err( p_mutex->p_this,
- "thread %u: mutex_lock failed at %s:%d (%d:%s)",
+ "thread %lu: mutex_lock failed at %s:%d (%d:%s)",
i_thread, psz_file, i_line, i_result, psz_error );
}
return i_result;
@@ -141,7 +141,7 @@ static inline int __vlc_mutex_unlock( const char * psz
{
int i_result;
/* In case of error : */
- int i_thread = -1;
+ long i_thread = -1;
const char * psz_error = "";
#if defined( PTH_INIT_IN_PTH_H )
@@ -184,7 +184,7 @@ static inline int __vlc_mutex_unlock( const char * psz
i_result = pthread_mutex_unlock( &p_mutex->mutex );
if ( i_result )
{
- i_thread = (int)pthread_self();
+ i_thread = (long)pthread_self();
psz_error = strerror(i_result);
}
@@ -197,7 +197,7 @@ static inline int __vlc_mutex_unlock( const char * psz
if( i_result )
{
msg_Err( p_mutex->p_this,
- "thread %u: mutex_unlock failed at %s:%d (%d:%s)",
+ "thread %lu: mutex_unlock failed at %s:%d (%d:%s)",
i_thread, psz_file, i_line, i_result, psz_error );
}
@@ -227,7 +227,7 @@ static inline int __vlc_cond_signal( const char * psz_
{
int i_result;
/* In case of error : */
- int i_thread = -1;
+ long i_thread = -1;
const char * psz_error = "";
#if defined( PTH_INIT_IN_PTH_H )
@@ -322,7 +322,7 @@ static inline int __vlc_cond_signal( const char * psz_
i_result = pthread_cond_signal( &p_condvar->cond );
if ( i_result )
{
- i_thread = (int)pthread_self();
+ i_thread = (long)pthread_self();
psz_error = strerror(i_result);
}
@@ -339,7 +339,7 @@ static inline int __vlc_cond_signal( const char * psz_
if( i_result )
{
msg_Err( p_condvar->p_this,
- "thread %u: cond_signal failed at %s:%d (%d:%s)",
+ "thread %lu: cond_signal failed at %s:%d (%d:%s)",
i_thread, psz_file, i_line, i_result, psz_error );
}
@@ -357,7 +357,7 @@ static inline int __vlc_cond_wait( const char * psz_fi
{
int i_result;
/* In case of error : */
- int i_thread = -1;
+ long i_thread = -1;
const char * psz_error = "";
#if defined( PTH_INIT_IN_PTH_H )
@@ -512,7 +512,7 @@ static inline int __vlc_cond_wait( const char * psz_fi
if ( i_result )
{
- i_thread = (int)pthread_self();
+ i_thread = (long)pthread_self();
psz_error = strerror(i_result);
}
@@ -525,7 +525,7 @@ static inline int __vlc_cond_wait( const char * psz_fi
if( i_result )
{
msg_Err( p_condvar->p_this,
- "thread %u: cond_wait failed at %s:%d (%d:%s)",
+ "thread %lu: cond_wait failed at %s:%d (%d:%s)",
i_thread, psz_file, i_line, i_result, psz_error );
}
/* People keep pissing me off with this. --Meuuh */
msg_Dbg( p_condvar->p_this,
- "thread %u: secret message triggered "
- "at %s:%d (%s)", (int)pthread_self(),
+ "thread %lu: secret message triggered "
+ "at %s:%d (%s)", (long)pthread_self(),
psz_file, i_line, strerror(i_result) );
i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );

14
x11/vlc/patches/patch-modules_codec_faad_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_codec_faad_c,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/codec/faad.c.orig Tue Apr 17 17:45:11 2007
+++ modules/codec/faad.c Fri May 11 23:50:40 2007
@@ -315,6 +315,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
$OpenBSD: patch-modules_codec_faad_c,v 1.4 2008/04/04 00:53:01 jakemsr Exp $
--- modules/codec/faad.c.orig Mon Mar 31 15:15:33 2008
+++ modules/codec/faad.c Thu Apr 3 03:35:55 2008
@@ -359,6 +359,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
p_dec->fmt_out.audio.i_rate = frame.samplerate;
p_dec->fmt_out.audio.i_channels = frame.channels;
@ -11,9 +11,9 @@ $OpenBSD: patch-modules_codec_faad_c,v 1.3 2007/06/05 01:53:04 jolan Exp $
/* Adjust stream info when dealing with SBR/PS */
if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
@@ -336,6 +339,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
free( psz_cat );
p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
@@ -383,6 +386,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
}
p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
}
+#endif