head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.22 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.20 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.18 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.16 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.14 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.12 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.10 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.8 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.6 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.4 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.2 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.2.0.14 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.12 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2; locks; strict; comment @# @; 1.6 date 2007.11.22.20.20.24; author drochner; state dead; branches; next 1.5; 1.5 date 2007.06.18.21.16.12; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.08.06.10.36.50; author wiz; state dead; branches; next 1.3; 1.3 date 2006.07.04.16.42.38; author tron; state Exp; branches; next 1.2; 1.2 date 2005.01.06.17.04.42; author drochner; state dead; branches 1.2.2.1; next 1.1; 1.1 date 2004.12.21.18.56.44; author drochner; state Exp; branches; next ; 1.2.2.1 date 2005.01.06.17.04.42; author snj; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2005.02.28.21.11.50; author snj; state Exp; branches; next ; desc @@ 1.6 log @update to 1.1.8 This has improved DVB subtitles support, implements simple subtitle scaling and bold & italics for text subtitles, and allows control of XxMC bob deinterlacing. It also has fixes for an audio resampling problem (which manifested as regular clicking), a problem which would cause the goom plugin to stop working, and URL escape handling (use of %) in DVD and Video CD MRLs. Some memory leaks are also fixed, and there are some build fixes for Solaris users. @ text @$NetBSD: patch-bc,v 1.5 2007/06/18 21:16:12 joerg Exp $ --- src/libmusepack/Makefile.in.orig 2007-06-18 19:50:33.000000000 +0000 +++ src/libmusepack/Makefile.in @@@@ -569,8 +569,8 @@@@ EXTRA_DIST = diff_against_svn.patch @@EXTERNAL_MPCDEC_FALSE@@ mpc_reader.c requant.c streaminfo.c synth_filter.c @@EXTERNAL_MPCDEC_TRUE@@internal_sources = -@@EXTERNAL_MPCDEC_FALSE@@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) -@@EXTERNAL_MPCDEC_TRUE@@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) -lmpcdec +@@EXTERNAL_MPCDEC_FALSE@@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL) +@@EXTERNAL_MPCDEC_TRUE@@xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LIBINTL) -lmpcdec xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_musepack_decoder.c xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags) @ 1.5 log @Fix linkage with -lintl. In one plugin, disable the -Wl,-z,defs usage as it breaks on DragonFly. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 1.1.2, provided by Kimura Fuyuki in PR 34107. xine-lib (1.1.2) * Security fixes: - CVE-2005-4048: possible buffer overflow in libavcodec (crafted PNGs). - CVE-2006-2802: possible buffer overflow in the HTTP plugin. - possible buffer overflow via bad indexes in specially-crafted AVI files * Update gettext support to 0.14.5, disable internal gettext, fix locales handling, use the correct domain for strings. * Italian translation update * Czech translation update * Disable the XXMC plugin if Xv support isn't there * Also look for Xv support in /usr/lib for X.org's new location * Fix using xine-lib on systems with SELinux enabled * Build right with libiconv in /usr/local as default on FreeBSD * Fix a potential crash with fixed-size lacing in the Matroska demuxer * Patch from SuSE to fix alsa after hardware suspend * Fix the ./configure --enable-static-xv parameter * Really fix the speed changing race that was mentioned in 1.1.1 * Send events for tvtime filmmode changes * Add an image decoder based on gdk-pixbuf * Add browseable capability to smb input plugin * Enable AMD64 mmx/sse support in some plugins (tvtime, libmpeg2, goom...) * Fix xxmc subpictures (broken since 1.1.1) * FFmpeg update (version 51.1.0) * Fix detection of locale containing a modifier (like "@@euro") * New volume normalization post plugin * New image noise post plugin (useful for mitigating some compression artifacts) * Support for Vorbis-style comments in FLAC files * Coverity fixes * Add ATSC support to the DVB plugin * Make various structures and arrays constant. * Fix up health check to find libX11 and libXv shared objects even if devel packages aren't installed (where appropriate). (Ubuntu 47357) * Fix install problems in case configure was generated by autoconf >= 2.59c. * Fixed some win32 codec freezes when configured w32-path doesn't exist * Add support for RealPlayer 10 codecs (from SUSE) xine-lib (1.1.1) * Improve sound quality when using alsa 1.0.9 or above. When playing a 44.1khz stream on a 48khz only capable sound card. It bypasses alsa-lib resampler and uses xine's * Windows ports bug fixes and improvements * Set up the framebuffer palette (fb video out). * build fixes and improvements, added --with-pthread-prefix and --with-zlib-prefix options * new DirectFB video output plugin with many improvements (output to overlay or TV, deinterlacing, image controls, zoom, OSD, double/triple buffering, vsync, flicker filtering, field parity control) * overlay cropping fixes for small streams or when using cropping support * experimental frame allocation optimization reduces cpu usage of the deinterlacer plugin by up 25% * implement time seeking on DVD plugin * move CFLAGS optimizations to a separated file (added --disable-optimizations) * use the same codec path as MPlayer (/usr[/local]/lib/codecs) * FFmpeg sync (new QDM2 decoder) * imported Duck TrueMotion 2 decoder from FFmpeg * sync libfaad2 to latest GPL compatible version; fixes AAC decoding on x86_64 arch * support gapless playback while switching streams (requires UI cooperation) * fix speed changing race causing deadlock with v4l plugin * cddb improvements/fixes (DTITLE/DYEAR parsing, timeout increase and multiline entries support) [#1205274] xine-lib (1.1.0) * new quality deinterlacer from dscaler: GreedyH (Greedy High Motion) * new quality deinterlacer from dscaler: TomsMoComp (Tom's Motion Compensated) * added help for most deinterlace methods * ffmpeg update * use ImageMagick to convert and display different type of images (png, jpg...) * improve ASX playlist parsing * add an extended MRL reference event (MRL title, start time, play time): needed for the ASX parser; deprecates plain MRL reference events. * goom updated to 2k4-0 xine-lib (1.0.4) * tiny doc update * build fixes and cross build improvements * fixed an align problem in Win32 DirectX video output plugin * fixed linking of X11 plugins for some platforms @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.3 2006/07/04 16:42:38 tron Exp $ d3 13 a15 10 --- misc/fonts/Makefile.in.orig 2005-10-09 11:27:59.000000000 +0000 +++ misc/fonts/Makefile.in @@@@ -25,6 +25,7 @@@@ bindir = @@bindir@@ sbindir = @@sbindir@@ libexecdir = @@libexecdir@@ sysconfdir = @@sysconfdir@@ +datarootdir = @@datarootdir@@ sharedstatedir = @@sharedstatedir@@ localstatedir = @@localstatedir@@ libdir = @@libdir@@ @ 1.3 log @Fix build problem with version 2.60 of the "autoconf" package. Patch provided by Thomas 'wiz' Klausner in private e-mail. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 1.0 changes: -security issue regarding the AIFF demuxer (CAN-2004-1300) -Xv plugin dynamically linked again -some fixes @ text @d1 1 a1 1 $NetBSD: patch-bc,v 1.1 2004/12/21 18:56:44 drochner Exp $ d3 10 a12 17 --- aclocal.m4.orig 2004-12-18 01:22:24.000000000 +0100 +++ aclocal.m4 @@@@ -7886,14 +7886,6 @@@@ if test x"$external_ffmpeg" != "xno"; th CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}" LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}" - dnl drop the cache - for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \ - "ac_cv_lib_avcodec_pp_get_context" \ - "ac_cv_lib_postproc_pp_get_context" \ - "ac_cv_lib_avcodec_register_avcodec"; do - $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } - done - dnl look for headers AC_CHECK_HEADER(avcodec.h, , continue) AC_CHECK_HEADER(postprocess.h, , continue) @ 1.2.2.1 log @file patch-bc was added on branch pkgsrc-2004Q4 on 2005-01-06 17:04:42 +0000 @ text @d1 19 @ 1.2.2.2 log @Pullup ticket 317 - requested by Lubomir Sedlacik security fix for xine-lib Apply a manual patch that fixes the vulnerabilities noted in http://www.xinehq.de/index.php/security/XSA-2004-6 @ text @a0 102 $NetBSD: patch-bc,v 1.2.2.1 2005/02/28 21:11:50 snj Exp $ --- src/input/pnm.c 2003/12/12 22:53:15 1.20 +++ src/input/pnm.c 2004/12/15 12:53:36 1.21 @@@@ -205,16 +205,21 @@@@ char *data, int *need_response) { unsigned int chunk_size; - int n; + unsigned int n; char *ptr; - + + if( max < PREAMBLE_SIZE ) + return -1; + /* get first PREAMBLE_SIZE bytes and ignore checksum */ _x_io_tcp_read (p->stream, p->s, data, CHECKSUM_SIZE); if (data[0] == 0x72) _x_io_tcp_read (p->stream, p->s, data, PREAMBLE_SIZE); else _x_io_tcp_read (p->stream, p->s, data+CHECKSUM_SIZE, PREAMBLE_SIZE-CHECKSUM_SIZE); - + + max -= PREAMBLE_SIZE; + *chunk_type = be2me_32(*((uint32_t *)data)); chunk_size = be2me_32(*((uint32_t *)(data+4))); @@@@ -222,7 +227,11 @@@@ case PNA_TAG: *need_response=0; ptr=data+PREAMBLE_SIZE; + + if( max < 1 ) + return -1; _x_io_tcp_read (p->stream, p->s, ptr++, 1); + max -= 1; while(1) { /* The pna chunk is devided into subchunks. @@@@ -235,17 +244,29 @@@@ * if first byte is 'F', we got an error */ + if( max < 2 ) + return -1; _x_io_tcp_read (p->stream, p->s, ptr, 2); + max -= 2; + if (*ptr == 'X') /* checking for server message */ { xprintf(p->stream->xine, XINE_VERBOSITY_DEBUG, "input_pnm: got a message from server:\n"); + if( max < 1 ) + return -1; _x_io_tcp_read (p->stream, p->s, ptr+2, 1); + max -= 1; /* two bytes of message length*/ n=be2me_16(*(uint16_t*)(ptr+1)); /* message itself */ + if( max < n ) + return -1; _x_io_tcp_read (p->stream, p->s, ptr+3, n); + max -= n; + if( max < 1 ) + return -1; ptr[3+n]=0; xprintf(p->stream->xine, XINE_VERBOSITY_DEBUG, "%s\n", ptr+3); return -1; @@@@ -265,10 +286,15 @@@@ } if (*ptr != 0x4f) break; n=ptr[1]; - _x_io_tcp_read (p->stream, p->s, ptr+2, n); + if( max < n ) + return -1; + _x_io_tcp_read (p->stream, p->s, ptr+2, n); ptr+=(n+2); + max-=n; } /* the checksum of the next chunk is ignored here */ + if( max < 1 ) + return -1; _x_io_tcp_read (p->stream, p->s, ptr+2, 1); ptr+=3; chunk_size=ptr-data; @@@@ -278,11 +304,11 @@@@ case PROP_TAG: case MDPR_TAG: case CONT_TAG: - if (chunk_size > max) { + if (chunk_size > max || chunk_size < PREAMBLE_SIZE) { xprintf(p->stream->xine, XINE_VERBOSITY_DEBUG, "error: max chunk size exeeded (max was 0x%04x)\n", max); +#ifdef LOG /* reading some bytes for debugging */ n=_x_io_tcp_read (p->stream, p->s, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE); -#ifdef LOG xine_hexdump(data,n+PREAMBLE_SIZE); #endif return -1; @ 1.1 log @update to 1-rc8 fixes some security vulnerabilities, bugfixes @ text @d1 1 a1 1 $NetBSD$ @