SECURITY update to 1.1.16.2; CVE-2008-5239, CVE-2008-5240, TKADV2009-004
from Brad (maintainer).
This commit is contained in:
parent
b456db4c75
commit
18357e3cf8
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2009/02/09 20:35:50 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2009/02/16 01:24:24 sthen Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= multimedia decoding library
|
||||
|
||||
V= 1.1.16.1
|
||||
V= 1.1.16.2
|
||||
DISTNAME= xine-lib-${V}
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (xine-lib-1.1.16.1.tar.bz2) = neEdt+JixWTP26mEGgkuvg==
|
||||
RMD160 (xine-lib-1.1.16.1.tar.bz2) = PHaxL66Muofm07zq/L8vs++U4WQ=
|
||||
SHA1 (xine-lib-1.1.16.1.tar.bz2) = gnCSVKBgPjlxBYqs+FeJJrddSiA=
|
||||
SHA256 (xine-lib-1.1.16.1.tar.bz2) = n8JS0G5dskJlyDB2Z2vR8dDgk1cyufIex/yqw1v4CjY=
|
||||
SIZE (xine-lib-1.1.16.1.tar.bz2) = 7382381
|
||||
MD5 (xine-lib-1.1.16.2.tar.bz2) = M23R9iZun5Q0MMpgCbeqfg==
|
||||
RMD160 (xine-lib-1.1.16.2.tar.bz2) = gNpr8hJ7w0nbvJ2g9VKYaREGeLQ=
|
||||
SHA1 (xine-lib-1.1.16.2.tar.bz2) = +qPZIH2RGlNRYaPNVmCqnmuQTCg=
|
||||
SHA256 (xine-lib-1.1.16.2.tar.bz2) = Z/JGn67pZLdfQ0WVR7Xi+aQHuNwwy+/6mJzOMS4WssE=
|
||||
SIZE (xine-lib-1.1.16.2.tar.bz2) = 7407399
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
--- configure.ac.orig Sun Jan 11 18:58:58 2009
|
||||
+++ configure.ac Sun Jan 11 19:24:07 2009
|
||||
@@ -206,6 +206,10 @@ AC_PROG_GMSGFMT_PLURAL
|
||||
$OpenBSD: patch-configure_ac,v 1.3 2009/02/16 01:24:24 sthen Exp $
|
||||
--- configure.ac.orig Tue Feb 10 13:32:37 2009
|
||||
+++ configure.ac Wed Feb 11 00:55:39 2009
|
||||
@@ -212,6 +212,10 @@ AC_PROG_GMSGFMT_PLURAL
|
||||
|
||||
AC_CHECK_FUNCS([nl_langinfo])
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
dnl ---------------------------------------------
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
dnl ---------------------------------------------
|
||||
@@ -539,9 +543,9 @@ t q
|
||||
@@ -545,9 +549,9 @@ t q
|
||||
b
|
||||
:q
|
||||
q"
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()])
|
||||
|
||||
|
||||
@@ -1261,7 +1265,7 @@ if test "x$enable_a52dec" = "xno"; then
|
||||
@@ -1267,7 +1271,7 @@ if test "x$enable_a52dec" = "xno"; then
|
||||
AC_MSG_RESULT([a52dec support disabled])
|
||||
elif test "x$external_a52dec" = "xyes"; then
|
||||
have_a52="yes"
|
||||
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
[
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
@@ -1352,9 +1356,10 @@ if test "x$with_mng" = "xyes"; then
|
||||
@@ -1358,9 +1362,10 @@ if test "x$with_mng" = "xyes"; then
|
||||
AC_CHECK_LIB(mng, mng_initialize,
|
||||
[ AC_CHECK_HEADER(libmng.h,
|
||||
[ have_libmng=yes
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
AC_SUBST(MNG_LIBS)
|
||||
else
|
||||
have_libmng=no
|
||||
@@ -1547,6 +1552,28 @@ AM_CONDITIONAL([HAVE_JACK], [test "x$have_jack" = "xye
|
||||
@@ -1556,6 +1561,28 @@ AM_CONDITIONAL([HAVE_JACK], [test "x$have_jack" = "xye
|
||||
|
||||
|
||||
dnl ---------------------------------------------
|
||||
@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/02/02 22:00:42 sthen Exp $
|
||||
dnl gnome-vfs support
|
||||
dnl ---------------------------------------------
|
||||
|
||||
@@ -2505,7 +2532,7 @@ dnl ---------------------------------------------
|
||||
@@ -2504,7 +2531,7 @@ dnl ---------------------------------------------
|
||||
|
||||
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
|
||||
XINE_BUILD_OS="`uname -s -r -m`"
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/audio_out/Makefile.in.orig Wed Jan 7 11:16:50 2009
|
||||
+++ src/audio_out/Makefile.in Thu Jan 8 01:02:34 2009
|
||||
@@ -171,6 +171,18 @@ xineplug_ao_out_jack_la_LINK = $(LIBTOOL) --tag=CC $(A
|
||||
$OpenBSD: patch-src_audio_out_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/audio_out/Makefile.in.orig Tue Feb 10 13:34:49 2009
|
||||
+++ src/audio_out/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -174,6 +174,18 @@ xineplug_ao_out_jack_la_LINK = $(LIBTOOL) --tag=CC $(A
|
||||
$(xineplug_ao_out_jack_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@HAVE_JACK_TRUE@am_xineplug_ao_out_jack_la_rpath = -rpath \
|
||||
@HAVE_JACK_TRUE@ $(xineplugdir)
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
xineplug_ao_out_none_la_DEPENDENCIES = $(XINE_LIB) \
|
||||
$(am__DEPENDENCIES_1)
|
||||
am_xineplug_ao_out_none_la_OBJECTS = \
|
||||
@@ -234,6 +246,7 @@ SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
@@ -237,6 +249,7 @@ SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
$(xineplug_ao_out_file_la_SOURCES) \
|
||||
$(xineplug_ao_out_fusionsound_la_SOURCES) \
|
||||
$(xineplug_ao_out_jack_la_SOURCES) \
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
$(xineplug_ao_out_none_la_SOURCES) \
|
||||
$(xineplug_ao_out_oss_la_SOURCES) \
|
||||
$(xineplug_ao_out_pulseaudio_la_SOURCES) \
|
||||
@@ -247,6 +260,7 @@ DIST_SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
@@ -250,6 +263,7 @@ DIST_SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
|
||||
$(xineplug_ao_out_file_la_SOURCES) \
|
||||
$(xineplug_ao_out_fusionsound_la_SOURCES) \
|
||||
$(xineplug_ao_out_jack_la_SOURCES) \
|
||||
@ -36,16 +36,16 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
$(xineplug_ao_out_none_la_SOURCES) \
|
||||
$(xineplug_ao_out_oss_la_SOURCES) \
|
||||
$(xineplug_ao_out_pulseaudio_la_SOURCES) \
|
||||
@@ -358,6 +372,8 @@ IRIXAL_LIBS = @IRIXAL_LIBS@
|
||||
@@ -356,6 +370,8 @@ IRIXAL_LIBS = @IRIXAL_LIBS@
|
||||
IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
|
||||
JACK_CFLAGS = @JACK_CFLAGS@
|
||||
JACK_LIBS = @JACK_LIBS@
|
||||
+SNDIO_CFLAGS = @SNDIO_CFLAGS@
|
||||
+SNDIO_LIBS = @SNDIO_LIBS@
|
||||
KSTAT_LIBS = @KSTAT_LIBS@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_NOUNDEFINED = @LDFLAGS_NOUNDEFINED@
|
||||
@@ -586,6 +602,7 @@ EXTRA_DIST = audio_irixal_out.c
|
||||
@@ -587,6 +603,7 @@ EXTRA_DIST = audio_irixal_out.c
|
||||
@HAVE_PULSEAUDIO_TRUE@pulseaudio_module = xineplug_ao_out_pulseaudio.la
|
||||
@HAVE_FUSIONSOUND_TRUE@fusionsound_module = xineplug_ao_out_fusionsound.la
|
||||
@HAVE_JACK_TRUE@jack_module = xineplug_ao_out_jack.la
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
|
||||
# IMPORTANT:
|
||||
# ---------
|
||||
@@ -603,7 +620,8 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplu
|
||||
@@ -604,7 +621,8 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplu
|
||||
$(pulseaudio_module) \
|
||||
$(directx2_module) \
|
||||
$(fusionsound_module) \
|
||||
@ -63,7 +63,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
|
||||
xineplug_ao_out_none_la_SOURCES = audio_none_out.c
|
||||
xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
|
||||
@@ -670,6 +688,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
|
||||
@@ -671,6 +689,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
|
||||
xineplug_ao_out_jack_la_LIBADD = $(XINE_LIB) $(JACK_LIBS) $(LTLIBINTL)
|
||||
xineplug_ao_out_jack_la_CFLAGS = $(VISIBILITY_FLAG) $(JACK_CFLAGS)
|
||||
xineplug_ao_out_jack_la_LDFLAGS = -avoid-version -module
|
||||
@ -74,7 +74,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -748,6 +770,8 @@ xineplug_ao_out_fusionsound.la: $(xineplug_ao_out_fusi
|
||||
@@ -749,6 +771,8 @@ xineplug_ao_out_fusionsound.la: $(xineplug_ao_out_fusi
|
||||
$(xineplug_ao_out_fusionsound_la_LINK) $(am_xineplug_ao_out_fusionsound_la_rpath) $(xineplug_ao_out_fusionsound_la_OBJECTS) $(xineplug_ao_out_fusionsound_la_LIBADD) $(LIBS)
|
||||
xineplug_ao_out_jack.la: $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_DEPENDENCIES)
|
||||
$(xineplug_ao_out_jack_la_LINK) $(am_xineplug_ao_out_jack_la_rpath) $(xineplug_ao_out_jack_la_OBJECTS) $(xineplug_ao_out_jack_la_LIBADD) $(LIBS)
|
||||
@ -83,7 +83,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
xineplug_ao_out_none.la: $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_DEPENDENCIES)
|
||||
$(xineplug_ao_out_none_la_LINK) -rpath $(xineplugdir) $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_LIBADD) $(LIBS)
|
||||
xineplug_ao_out_oss.la: $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_DEPENDENCIES)
|
||||
@@ -772,6 +796,7 @@ distclean-compile:
|
||||
@@ -773,6 +797,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_file_la-audio_file_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_fusionsound_la-audio_fusionsound_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_jack_la-audio_jack_out.Plo@am__quote@
|
||||
@ -91,7 +91,7 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_none_la-audio_none_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_oss_la-audio_oss_out.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_pulseaudio_la-audio_pulse_out.Plo@am__quote@
|
||||
@@ -860,6 +885,13 @@ xineplug_ao_out_jack_la-audio_jack_out.lo: audio_jack_
|
||||
@@ -861,6 +886,13 @@ xineplug_ao_out_jack_la-audio_jack_out.lo: audio_jack_
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_jack_out.c' object='xineplug_ao_out_jack_la-audio_jack_out.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_jack_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_jack_la-audio_jack_out.lo `test -f 'audio_jack_out.c' || echo '$(srcdir)/'`audio_jack_out.c
|
||||
|
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-src_combined_ffmpeg_Makefile_in,v 1.1 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/combined/ffmpeg/Makefile.in.orig Tue Feb 10 13:34:50 2009
|
||||
+++ src/combined/ffmpeg/Makefile.in Fri Feb 13 12:44:19 2009
|
||||
@@ -889,8 +889,7 @@ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/
|
||||
|
||||
avcodec_audio.list avcodec_video.list:
|
||||
echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
|
||||
- sed -e $(AV_CODECS)'! d; s/^\s*//; s/[=,].*//; /^$$/ d' |\
|
||||
- head -n -1 >$@
|
||||
+ sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@
|
||||
|
||||
# Generate the mappings. These are #included where needed.
|
||||
ff_%_list.h: $(srcdir)/mkcodeclist.pl avcodec_%.list $(srcdir)/xine_%.list
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_input_Makefile_in,v 1.13 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/input/Makefile.in.orig Wed Jan 7 11:16:52 2009
|
||||
+++ src/input/Makefile.in Thu Jan 8 01:02:34 2009
|
||||
@@ -597,7 +597,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
|
||||
$OpenBSD: patch-src_input_Makefile_in,v 1.14 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/input/Makefile.in.orig Tue Feb 10 13:34:51 2009
|
||||
+++ src/input/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -598,7 +598,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_"
|
||||
#
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_input_input_file_c,v 1.4 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/input/input_file.c.orig Wed Jan 7 11:14:32 2009
|
||||
+++ src/input/input_file.c Thu Jan 8 01:02:34 2009
|
||||
@@ -208,7 +208,7 @@ static buf_element_t *file_plugin_read_block (input_pl
|
||||
$OpenBSD: patch-src_input_input_file_c,v 1.5 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/input/input_file.c.orig Tue Feb 10 12:32:23 2009
|
||||
+++ src/input/input_file.c Wed Feb 11 00:55:26 2009
|
||||
@@ -210,7 +210,7 @@ static buf_element_t *file_plugin_read_block (input_pl
|
||||
xine_log (this->stream->xine, XINE_LOG_MSG,
|
||||
_("input_file: read error (%s)\n"), strerror(errno));
|
||||
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_file_c,v 1.4 2009/02/02 22:00:42 sthen Exp $
|
||||
}
|
||||
buf->free_buffer (buf);
|
||||
buf = NULL;
|
||||
@@ -364,11 +364,11 @@ static int file_plugin_open (input_plugin_t *this_gen
|
||||
@@ -366,11 +366,11 @@ static int file_plugin_open (input_plugin_t *this_gen
|
||||
|
||||
if (this->fh == -1) {
|
||||
if (errno == EACCES) {
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-src_input_input_file_c,v 1.4 2009/02/02 22:00:42 sthen Exp $
|
||||
xine_log (this->stream->xine, XINE_LOG_MSG,
|
||||
_("input_file: File not found: >%s<\n"), this->mrl);
|
||||
}
|
||||
@@ -405,7 +405,7 @@ static int file_plugin_open (input_plugin_t *this_gen
|
||||
@@ -407,7 +407,7 @@ static int file_plugin_open (input_plugin_t *this_gen
|
||||
#endif
|
||||
|
||||
if (file_plugin_get_length (this_gen) == 0) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/input/input_http.c.orig Wed Jan 7 11:14:32 2009
|
||||
+++ src/input/input_http.c Thu Jan 8 01:02:34 2009
|
||||
$OpenBSD: patch-src_input_input_http_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/input/input_http.c.orig Tue Feb 10 12:32:23 2009
|
||||
+++ src/input/input_http.c Wed Feb 11 00:55:26 2009
|
||||
@@ -409,7 +409,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
|
||||
|
||||
error:
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
|
||||
return read_bytes;
|
||||
}
|
||||
@@ -679,7 +679,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -681,7 +681,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
if (http_plugin_basicauth (this_class->proxyuser,
|
||||
this_class->proxypassword,
|
||||
this->proxyauth, BUFSIZE)) {
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -688,7 +688,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -690,7 +690,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
|
||||
if (!_x_parse_url(this->mrl, &this->proto, &this->host, &this->port,
|
||||
&this->user, &this->password, &this->uri)) {
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
return 0;
|
||||
}
|
||||
use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
|
||||
@@ -698,7 +698,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -700,7 +700,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
|
||||
if (this->user && strlen(this->user)) {
|
||||
if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -752,7 +752,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -754,7 +754,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
} while ((res == XIO_TIMEOUT) && (progress <= 100000));
|
||||
|
||||
if (res != XIO_READY) {
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
return -3;
|
||||
}
|
||||
}
|
||||
@@ -792,7 +792,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -794,7 +794,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
"\015\012",
|
||||
VERSION);
|
||||
if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) {
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't send request\n");
|
||||
return -4;
|
||||
}
|
||||
@@ -836,7 +836,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -838,7 +838,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
(sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
|
||||
&httpcode, httpstatus) != 2)
|
||||
) {
|
||||
@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
xine_log (this->stream->xine, XINE_LOG_MSG,
|
||||
_("input_http: invalid http answer\n"));
|
||||
return -6;
|
||||
@@ -847,20 +847,20 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -849,20 +849,20 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
_("input_http: 3xx redirection: >%d %s<\n"),
|
||||
httpcode, httpstatus);
|
||||
} else if (httpcode == 404) {
|
||||
@ -88,7 +88,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.6 2009/02/02 22:00:42 sthen Exp $
|
||||
xine_log (this->stream->xine, XINE_LOG_MSG,
|
||||
_("input_http: http status not 2xx: >%d %s<\n"),
|
||||
httpcode, httpstatus);
|
||||
@@ -957,7 +957,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
@@ -959,7 +959,7 @@ static int http_plugin_open (input_plugin_t *this_gen
|
||||
} else
|
||||
len ++;
|
||||
if ( len >= BUFSIZE ) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.12 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/libw32dll/wine/Makefile.in.orig Wed Jan 7 11:16:59 2009
|
||||
+++ src/libw32dll/wine/Makefile.in Thu Jan 8 01:02:35 2009
|
||||
@@ -61,7 +61,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.13 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/libw32dll/wine/Makefile.in.orig Tue Feb 10 13:34:58 2009
|
||||
+++ src/libw32dll/wine/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -64,7 +64,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
|
||||
libwine_la_LIBADD =
|
||||
am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
|
||||
ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.12 2009/02/02 22:00:42 sthen
|
||||
libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
|
||||
@HAVE_W32DLL_TRUE@am_libwine_la_rpath =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
|
||||
@@ -431,6 +431,7 @@ libwine_la_SOURCES = \
|
||||
@@ -432,6 +432,7 @@ libwine_la_SOURCES = \
|
||||
registry.c \
|
||||
vfl.c \
|
||||
win32.c \
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.12 2009/02/02 22:00:42 sthen
|
||||
stubs.s \
|
||||
wrapper.S
|
||||
|
||||
@@ -536,6 +537,7 @@ distclean-compile:
|
||||
@@ -537,6 +538,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Plo@am__quote@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.5 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/post/deinterlace/Makefile.in.orig Wed Jan 7 11:17:01 2009
|
||||
+++ src/post/deinterlace/Makefile.in Thu Jan 8 01:02:35 2009
|
||||
@@ -427,7 +427,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
|
||||
$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.6 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/post/deinterlace/Makefile.in.orig Tue Feb 10 13:34:59 2009
|
||||
+++ src/post/deinterlace/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -428,7 +428,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
|
||||
vidixdir = $(XINE_PLUGINDIR)/vidix
|
||||
SUBDIRS = plugins
|
||||
EXTRA_DIST =
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.5 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/post/deinterlace/plugins/Makefile.in.orig Wed Jan 7 11:17:01 2009
|
||||
+++ src/post/deinterlace/plugins/Makefile.in Thu Jan 8 01:02:35 2009
|
||||
@@ -859,7 +859,7 @@ maintainer-clean-generic:
|
||||
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.6 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/post/deinterlace/plugins/Makefile.in.orig Tue Feb 10 13:35:00 2009
|
||||
+++ src/post/deinterlace/plugins/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -860,7 +860,7 @@ maintainer-clean-generic:
|
||||
-rm -f Makefile.in
|
||||
|
||||
# Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.8 2009/02/02 22:00:42 sthen Exp $
|
||||
--- src/xine-engine/Makefile.in.orig Wed Jan 7 11:17:04 2009
|
||||
+++ src/xine-engine/Makefile.in Thu Jan 8 01:02:35 2009
|
||||
@@ -436,7 +436,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
|
||||
$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.9 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/xine-engine/Makefile.in.orig Tue Feb 10 13:35:03 2009
|
||||
+++ src/xine-engine/Makefile.in Wed Feb 11 00:55:39 2009
|
||||
@@ -437,7 +437,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) \
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.6 2008/01/15 00:36:46 jakemsr Exp $
|
||||
--- src/xine-engine/audio_decoder.c.orig Tue Jan 1 08:30:09 2008
|
||||
+++ src/xine-engine/audio_decoder.c Wed Jan 9 01:50:22 2008
|
||||
@@ -461,7 +461,9 @@ static void *audio_decoder_loop (void *stream_gen) {
|
||||
$OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.7 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/xine-engine/audio_decoder.c.orig Tue Feb 10 12:32:23 2009
|
||||
+++ src/xine-engine/audio_decoder.c Wed Feb 11 00:55:26 2009
|
||||
@@ -463,7 +463,9 @@ static void *audio_decoder_loop (void *stream_gen) {
|
||||
int _x_audio_decoder_init (xine_stream_t *stream) {
|
||||
|
||||
pthread_attr_t pth_attrs;
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-src_xine-engine_audio_decoder_c,v 1.6 2008/01/15 00:36:46 jakems
|
||||
int err;
|
||||
|
||||
if (stream->audio_out == NULL) {
|
||||
@@ -499,10 +501,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
|
||||
@@ -501,10 +503,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) {
|
||||
*/
|
||||
|
||||
pthread_attr_init(&pth_attrs);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_xine-engine_xine_c,v 1.7 2008/07/02 01:02:42 brad Exp $
|
||||
--- src/xine-engine/xine.c.orig Wed Jun 25 09:04:09 2008
|
||||
+++ src/xine-engine/xine.c Sun Jun 29 20:54:15 2008
|
||||
@@ -1669,7 +1669,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
|
||||
$OpenBSD: patch-src_xine-engine_xine_c,v 1.8 2009/02/16 01:24:24 sthen Exp $
|
||||
--- src/xine-engine/xine.c.orig Tue Feb 10 12:32:24 2009
|
||||
+++ src/xine-engine/xine.c Wed Feb 11 00:55:26 2009
|
||||
@@ -1671,7 +1671,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);
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2009/02/02 22:00:42 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2009/02/16 01:24:24 sthen Exp $
|
||||
@pkgpath ${BASE_PKGPATH},jack
|
||||
%%i386%%
|
||||
bin/xine-config
|
||||
@ -37,6 +37,7 @@ include/xine/video_overlay.h
|
||||
include/xine/vo_scale.h
|
||||
include/xine/xine_buffer.h
|
||||
include/xine/xine_internal.h
|
||||
include/xine/xine_mmx.h
|
||||
include/xine/xine_plugin.h
|
||||
include/xine/xineintl.h
|
||||
include/xine/xineutils.h
|
||||
@ -160,6 +161,9 @@ share/doc/xine-lib/hackersguide/overlays.png
|
||||
share/doc/xine-lib/hackersguide/post_frame.png
|
||||
share/locale/cs/LC_MESSAGES/libxine1.mo
|
||||
share/locale/de/LC_MESSAGES/libxine1.mo
|
||||
share/locale/en_US/
|
||||
share/locale/en_US/LC_MESSAGES/
|
||||
share/locale/en_US/LC_MESSAGES/libxine1.mo
|
||||
share/locale/eo/LC_MESSAGES/libxine1.mo
|
||||
share/locale/es/LC_MESSAGES/libxine1.mo
|
||||
share/locale/eu/LC_MESSAGES/libxine1.mo
|
||||
|
Loading…
Reference in New Issue
Block a user