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

maintenence update to 1.1.10

Browse Source 
SECURITY- fixx buffer overflow which allows a remote attacker to
execute arbitrary code or crash the client program via a crafted ASF
header

from brad, thanks
This commit is contained in:
jakemsr 2008-01-30 03:52:32 +00:00
parent b5209bf95e
commit c83e455e07
14 changed files with 61 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/xine-lib/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2008/01/26 04:26:00 jakemsr Exp $
# $OpenBSD: Makefile,v 1.25 2008/01/30 03:52:32 jakemsr Exp $
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output muodule for xine-lib
V= 1.1.9.1
V= 1.1.10
DISTNAME= xine-lib-${V}
PKGNAME-main= xine-lib-${V}p0
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
EXTRACT_SUFX= .tar.bz2

10
multimedia/xine-lib/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-lib-1.1.9.1.tar.bz2) = PKHkM4bAEpPdw66vi1+ATw==
RMD160 (xine-lib-1.1.9.1.tar.bz2) = k+LocALrA4uLagFQRR1a43GSxZ0=
SHA1 (xine-lib-1.1.9.1.tar.bz2) = nOsytytuqo5qsD2wbDqkoUpuaMM=
SHA256 (xine-lib-1.1.9.1.tar.bz2) = AkmG339a2XPL7RjFCiq7MMqIIgs8trKwnsLbm5SY5Oc=
SIZE (xine-lib-1.1.9.1.tar.bz2) = 7392199
MD5 (xine-lib-1.1.10.tar.bz2) = VefSsfSpBS24RyRFcqTstQ==
RMD160 (xine-lib-1.1.10.tar.bz2) = TqWNvdEDNkYUr9RdghXlN3L+YlE=
SHA1 (xine-lib-1.1.10.tar.bz2) = obPJ0apwf0NUQDQBkCppZ8u96NE=
SHA256 (xine-lib-1.1.10.tar.bz2) = +qM3gAQ2opwc8r6CajARPXHaLGqqwbP6VKIh93+jO7o=
SIZE (xine-lib-1.1.10.tar.bz2) = 7392937

26
multimedia/xine-lib/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
--- configure.orig Fri Jan 11 10:12:24 2008
+++ configure Sat Jan 12 21:01:52 2008
@@ -24490,6 +24490,9 @@ _ACEOF
$OpenBSD: patch-configure,v 1.12 2008/01/30 03:52:32 jakemsr Exp $
--- configure.orig Sat Jan 26 16:05:16 2008
+++ configure Tue Jan 29 11:48:36 2008
@@ -24494,6 +24494,9 @@ _ACEOF
fi
done
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
@@ -30599,13 +30602,13 @@ t q
@@ -30603,13 +30606,13 @@ t q
b
:q
q"
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
@@ -37494,7 +37497,7 @@ fi
@@ -37498,7 +37501,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
@@ -37745,7 +37748,7 @@ elif test "x$external_a52dec" = "xyes"; then
@@ -37749,7 +37752,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -37884,7 +37887,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
@@ -37888,7 +37891,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
else
have_a52="no"
@@ -38462,7 +38465,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
@@ -38466,7 +38469,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -38645,7 +38648,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
@@ -38649,7 +38652,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
else
{ echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
@@ -49478,7 +49481,7 @@ cat >>confdefs.h <<_ACEOF
@@ -49482,7 +49485,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -faltivec -maltivec"
@ -81,7 +81,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
fi
;;
ppc-*-linux* | powerpc-*)
@@ -49946,7 +49949,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
@@ -49955,7 +49958,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
XINE_BUILD_OS="`uname -s -r -m`"
@ -90,7 +90,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
@@ -50778,7 +50781,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
@@ -50787,7 +50790,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
{ echo "$as_me:$LINENO: result: $ac_cv_try_ldflags_ok" >&5
echo "${ECHO_T}$ac_cv_try_ldflags_ok" >&6; }
if test x"$ac_cv_try_ldflags_ok" = x"yes"; then

10
multimedia/xine-lib/patches/patch-misc_libxine_pc_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-misc_libxine_pc_in,v 1.1 2007/06/13 10:58:29 jakemsr Exp $
--- misc/libxine.pc.in.orig Fri May 25 23:09:41 2007
+++ misc/libxine.pc.in Fri May 25 23:10:32 2007
@@ -7,7 +7,7 @@ Name: libxine
$OpenBSD: patch-misc_libxine_pc_in,v 1.2 2008/01/30 03:52:32 jakemsr Exp $
--- misc/libxine.pc.in.orig Wed Jan 23 00:11:50 2008
+++ misc/libxine.pc.in Tue Jan 29 11:48:36 2008
@@ -19,7 +19,7 @@ Name: libxine
Description: The xine engine library
Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
Requires:
-Libs: -L${libdir} -lxine
+Libs: -L${libdir} -lxine @PTHREAD_LIBS@

12
multimedia/xine-lib/patches/patch-misc_xine-config_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-misc_xine-config_in,v 1.1 2007/06/13 10:58:29 jakemsr Exp $
--- misc/xine-config.in.orig Fri May 25 23:08:44 2007
+++ misc/xine-config.in Fri May 25 23:09:14 2007
@@ -104,7 +104,7 @@ if test "$echo_cflags" = "yes"; then
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+ echo -L@libdir@ -lxine @PTHREAD_LIBS@
fi
if test "$echo_plugindir" = "yes"; then
echo "@XINE_PLUGINPATH@"

8
multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.4 2008/01/15 00:36:46 jakemsr Exp $
--- src/audio_out/Makefile.in.orig Sun Jan 6 10:57:30 2008
+++ src/audio_out/Makefile.in Wed Jan 9 01:52:50 2008
@@ -722,7 +722,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.5 2008/01/30 03:52:32 jakemsr Exp $
--- src/audio_out/Makefile.in.orig Sat Jan 26 16:04:52 2008
+++ src/audio_out/Makefile.in Tue Jan 29 11:48:36 2008
@@ -725,7 +725,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
#xineplug_ao_out_irixal_la_CFLAGS = $(VISIBILITY_FLAG) $(IRIXAL_CFLAGS)
#xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c

12
multimedia/xine-lib/patches/patch-src_demuxers_asfheader_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_demuxers_asfheader_c,v 1.1 2008/01/15 01:27:05 jakemsr Exp $
--- src/demuxers/asfheader.c.orig Sat Aug 18 16:36:44 2007
+++ src/demuxers/asfheader.c Sun Jan 13 17:43:59 2008
@@ -144,7 +144,7 @@ static char *asf_reader_get_string(asf_reader_t *reade
size_t inbytesleft, outbytesleft;
char scratch[2048];
- if ((reader->size - reader->pos) < size)
+ if ((size == 0) || (reader->size - reader->pos) < size)
return NULL;
inbuf = (char *)reader->buffer + reader->pos;

29
multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- src/demuxers/demux_asf.c.orig Tue Jan 1 08:30:08 2008
+++ src/demuxers/demux_asf.c Sat Jan 12 21:11:35 2008
@@ -425,7 +425,7 @@ static int asf_read_header (demux_asf_t *this) {
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.3 2008/01/30 03:52:32 jakemsr Exp $
--- src/demuxers/demux_asf.c.orig Wed Jan 23 12:52:33 2008
+++ src/demuxers/demux_asf.c Tue Jan 29 11:48:36 2008
@@ -440,7 +440,7 @@ static int asf_read_header (demux_asf_t *this) {
xine_log(this->stream->xine, XINE_LOG_MSG,
_("demux_asf: warning: The stream id=%d is encrypted.\n"), asf_stream->stream_number);
_x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,
@ -10,24 +10,3 @@ $OpenBSD: patch-src_demuxers_demux_asf_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
this->mode = ASF_MODE_ENCRYPTED_CONTENT;
}
}
@@ -723,6 +723,9 @@ static void asf_send_buffer_nodefrag (demux_asf_t *thi
buf->size = bufsize;
timestamp = 0;
+ if (stream->frag_offset == 0)
+ buf->decoder_flags |= BUF_FLAG_FRAME_START;
+
stream->frag_offset += bufsize;
frag_len -= bufsize;
@@ -733,10 +736,6 @@ static void asf_send_buffer_nodefrag (demux_asf_t *thi
else
check_newpts (this, buf->pts, PTS_AUDIO, package_done);
-
- if (frag_offset == 0)
- buf->decoder_flags |= BUF_FLAG_FRAME_START;
-
/* test if whole packet read */
if (package_done) {
buf->decoder_flags |= BUF_FLAG_FRAME_END;

8
multimedia/xine-lib/patches/patch-src_input_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_Makefile_in,v 1.6 2008/01/15 00:36:46 jakemsr Exp $
--- src/input/Makefile.in.orig Sun Jan 6 10:57:32 2008
+++ src/input/Makefile.in Wed Jan 9 01:50:21 2008
@@ -678,7 +678,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
$OpenBSD: patch-src_input_Makefile_in,v 1.7 2008/01/30 03:52:32 jakemsr Exp $
--- src/input/Makefile.in.orig Sat Jan 26 16:04:54 2008
+++ src/input/Makefile.in Tue Jan 29 11:48:36 2008
@@ -681,7 +681,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
# ---------
# All of xine input plugins should be named like the scheme "xineplug_inp_"
#

8
multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
--- src/libfaad/Makefile.in.orig Sun Jan 6 10:57:38 2008
+++ src/libfaad/Makefile.in Wed Jan 9 01:56:17 2008
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.4 2008/01/30 03:52:32 jakemsr Exp $
--- src/libfaad/Makefile.in.orig Sat Jan 26 16:04:59 2008
+++ src/libfaad/Makefile.in Tue Jan 29 11:48:37 2008
@@ -73,43 +73,7 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/l
am__DEPENDENCIES_2 =
xineplug_decode_faad_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@ -46,7 +46,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
xineplug_decode_faad_la-xine_faad_decoder.lo
xineplug_decode_faad_la_OBJECTS = \
$(am_xineplug_decode_faad_la_OBJECTS)
@@ -596,97 +560,11 @@ SUBDIRS = codebook
@@ -599,97 +563,11 @@ SUBDIRS = codebook
xineplug_LTLIBRARIES = $(faad_module)
xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_faad_la_SOURCES = \

10
multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.5 2008/01/15 00:36:46 jakemsr Exp $
--- src/libw32dll/wine/Makefile.in.orig Sun Jan 6 10:57:48 2008
+++ src/libw32dll/wine/Makefile.in Wed Jan 9 01:50:22 2008
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.6 2008/01/30 03:52:32 jakemsr Exp $
--- src/libw32dll/wine/Makefile.in.orig Sat Jan 26 16:05:06 2008
+++ src/libw32dll/wine/Makefile.in Tue Jan 29 11:48:37 2008
@@ -65,7 +65,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libwine_la_LIBADD =
am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
@ -10,7 +10,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.5 2008/01/15 00:36:46 jakemsr
libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
@HAVE_W32DLL_TRUE@am_libwine_la_rpath =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
@@ -564,6 +564,7 @@ libwine_la_SOURCES = \
@@ -567,6 +567,7 @@ libwine_la_SOURCES = \
registry.c \
vfl.c \
win32.c \
@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.5 2008/01/15 00:36:46 jakemsr
stubs.s \
wrapper.S
@@ -668,6 +669,7 @@ distclean-compile:
@@ -671,6 +672,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@

8
multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.1 2008/01/26 04:26:01 jakemsr Exp $
--- src/xine-engine/Makefile.in.orig Sat Jan 19 15:10:27 2008
+++ src/xine-engine/Makefile.in Sat Jan 19 15:27:57 2008
@@ -574,7 +574,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.2 2008/01/30 03:52:32 jakemsr Exp $
--- src/xine-engine/Makefile.in.orig Sat Jan 26 13:05:14 2008
+++ src/xine-engine/Makefile.in Tue Jan 29 17:35:58 2008
@@ -577,7 +577,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
-lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \

14
multimedia/xine-lib/patches/patch-src_xine-engine_audio_out_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.6 2008/01/15 00:36:46 jakemsr Exp $
--- src/xine-engine/audio_out.c.orig Tue Jan 1 08:30:09 2008
+++ src/xine-engine/audio_out.c Wed Jan 9 01:50:22 2008
@@ -1083,7 +1083,7 @@ static void *ao_loop (void *this_gen) {
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.7 2008/01/30 03:52:32 jakemsr Exp $
--- src/xine-engine/audio_out.c.orig Thu Jan 24 18:32:41 2008
+++ src/xine-engine/audio_out.c Tue Jan 29 11:48:37 2008
@@ -1084,7 +1084,7 @@ static void *ao_loop (void *this_gen) {
in_buf->format.rate,
in_buf->format.mode) == 0 ) {
in_buf->stream->emergency_brake = 1;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.6 2008/01/15 00:36:46 jakemsr Ex
}
}
}
@@ -1114,7 +1114,7 @@ static void *ao_loop (void *this_gen) {
@@ -1115,7 +1115,7 @@ static void *ao_loop (void *this_gen) {
stream = xine_list_get_value (this->streams, ite);
if( !stream->emergency_brake ) {
stream->emergency_brake = 1;
@ -19,7 +19,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.6 2008/01/15 00:36:46 jakemsr Ex
}
}
pthread_mutex_unlock(&this->streams_lock);
@@ -1498,7 +1498,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
@@ -1499,7 +1499,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
if( !ret ) {
stream->emergency_brake = 1;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_xine-engine_audio_out_c,v 1.6 2008/01/15 00:36:46 jakemsr Ex
return 0;
}
} else {
@@ -2247,7 +2247,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
@@ -2252,7 +2252,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
this->audio_loop_running = 1;
pthread_attr_init(&pth_attrs);

8
multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xine-engine_xine_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
--- src/xine-engine/xine.c.orig Tue Jan 1 10:36:02 2008
+++ src/xine-engine/xine.c Wed Jan 9 01:50:22 2008
@@ -1614,7 +1614,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
$OpenBSD: patch-src_xine-engine_xine_c,v 1.4 2008/01/30 03:52:32 jakemsr Exp $
--- src/xine-engine/xine.c.orig Sat Jan 26 10:03:47 2008
+++ src/xine-engine/xine.c Tue Jan 29 11:48:37 2008
@@ -1630,7 +1630,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
pthread_mutex_lock(&this->streams_lock);
if ( (ite = xine_list_front(this->streams)) ) {
stream = xine_list_get_value(this->streams, ite);