head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.8 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.6 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.4 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.2 pkgsrc-2011Q2-base:1.7 pkgsrc-2010Q4:1.6.0.14 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.12 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.10 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.8 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.6 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.4 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.2 pkgsrc-2008Q4:1.5.0.6 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.18 pkgsrc-2008Q1:1.4.0.16 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.14 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.12 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.10 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2011.01.17.16.51.05; author drochner; state dead; branches; next 1.6; 1.6 date 2009.09.25.11.10.21; author tron; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2008.09.07.23.39.38; author ahoka; state dead; branches; next 1.4; 1.4 date 2006.06.26.19.39.54; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.02.16.10.26.30; author abs; state Exp; branches; next 1.2; 1.2 date 2004.05.25.21.49.26; author wiz; state Exp; branches; next 1.1; 1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches 1.1.1.1; next ; 1.6.2.1 date 2009.09.25.11.10.21; author spz; state dead; branches; next 1.6.2.2; 1.6.2.2 date 2009.09.28.08.08.31; author spz; state Exp; branches; next ; 1.1.1.1 date 2004.05.10.13.41.10; author wiz; state Exp; branches; next ; desc @@ 1.7 log @update to 20101018.0.6.1, from Makoto Fujiwara per pkgsrc-wip, with two changes by me: -disabled symbol versioning - this didn't work correctly for me -changed PKGVERSION to start with the release date, so that it sorts correctly against the snapshots we had before vlc-1.0.6 does still build, but can be updated now @ text @$NetBSD: patch-ab,v 1.6 2009/09/25 11:10:21 tron Exp $ Patch for the vulnerability reported in SA36760, taken from here: http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=ebbccbaa5e925c2ddb212559f82c29ef526cc17e http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=7798d31bee361724e0a6ede4e2fd67228f24040b --- libavformat/sierravmd.c.orig 2009-02-16 14:45:05.000000000 +0000 +++ libavformat/sierravmd.c 2009-09-25 11:49:56.000000000 +0100 @@@@ -154,7 +154,7 @@@@ vmd->frame_table = NULL; sound_buffers = AV_RL16(&vmd->vmd_header[808]); raw_frame_table_size = vmd->frame_count * 6; - if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ + if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame) - sound_buffers){ av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); return -1; } @ 1.6 log @Add patch from ffmpeg GIT repository to fix the vulnerability reported in SA36760. @ text @d1 1 a1 1 $NetBSD$ @ 1.6.2.1 log @file patch-ab was added on branch pkgsrc-2009Q2 on 2009-09-28 08:08:31 +0000 @ text @d1 18 @ 1.6.2.2 log @Pullup ticket 2902 - requested by tron security patch Revisions pulled up: - pkgsrc/multimedia/ffmpeg/Makefile by patch - pkgsrc/multimedia/ffmpeg/distinfo by patch - pkgsrc/multimedia/ffmpeg/options.mk by patch - pkgsrc/multimedia/ffmpeg/patches/patch-bktr by patch - pkgsrc/multimedia/ffmpeg/patches/patch-configure by patch Files added: pkgsrc/multimedia/ffmpeg/patches/patch-aa 1.9 pkgsrc/multimedia/ffmpeg/patches/patch-ab 1.6 pkgsrc/multimedia/ffmpeg/patches/patch-powerpc 1.6 ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Fri Sep 25 11:10:21 UTC 2009 Modified Files: pkgsrc/multimedia/ffmpeg: Makefile distinfo Added Files: pkgsrc/multimedia/ffmpeg/patches: patch-ab Log Message: Add patch from ffmpeg GIT repository to fix the vulnerability reported in SA36760. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/ffmpeg/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg/distinfo cvs rdiff -u -r0 -r1.6 pkgsrc/multimedia/ffmpeg/patches/patch-ab @ text @a0 18 $NetBSD$ Patch for the vulnerability reported in SA36760, taken from here: http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=ebbccbaa5e925c2ddb212559f82c29ef526cc17e http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=7798d31bee361724e0a6ede4e2fd67228f24040b --- libavformat/sierravmd.c.orig 2009-02-16 14:45:05.000000000 +0000 +++ libavformat/sierravmd.c 2009-09-25 11:49:56.000000000 +0100 @@@@ -154,7 +154,7 @@@@ vmd->frame_table = NULL; sound_buffers = AV_RL16(&vmd->vmd_header[808]); raw_frame_table_size = vmd->frame_count * 6; - if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ + if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame) - sound_buffers){ av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); return -1; } @ 1.5 log @Track FreeBSD's SVN snapshots of ffmpeg as there are no more stable releases produced by the ffmpeg team. Add v4l2 support for NetBSD. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2006/06/26 19:39:54 wiz Exp $ d3 16 a18 20 --- ffserver.c.orig 2004-05-29 02:06:31.000000000 +0000 +++ ffserver.c @@@@ -4375,7 +4375,7 @@@@ static void show_help(void) "\n" "-L : print the LICENSE\n" "-h : this help\n" - "-f configfile : use configfile instead of /etc/ffserver.conf\n" + "-f configfile : use configfile instead of " FFSERVER_CONF "\n" ); } @@@@ -4433,7 +4433,7 @@@@ int main(int argc, char **argv) av_register_all(); - config_filename = "/etc/ffserver.conf"; + config_filename = FFSERVER_CONF; my_program_name = argv[0]; my_program_dir = getcwd(0, 0); @ 1.4 log @regen (offsets) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2006/02/16 10:26:30 abs Exp $ @ 1.3 log @Update ffmpeg to 0.4.9pre1, and add patch for libavcodec buffer overflow http://secunia.com/advisories/17892/ version 0.4.9-pre1: - DV encoder, DV muxer - Microsoft RLE video decoder - Microsoft Video-1 decoder - Apple Animation (RLE) decoder - Apple Graphics (SMC) decoder - Apple Video (RPZA) decoder - Cinepak decoder - Sega FILM (CPK) file demuxer - Westwood multimedia support (VQA & AUD files) - Id Quake II CIN playback support - 8BPS video decoder - FLIC playback support - RealVideo 2.0 (RV20) decoder - Duck TrueMotion v1 (DUCK) video decoder - Sierra VMD demuxer and video decoder - MSZH and ZLIB decoder support - SVQ1 video encoder - AMR-WB support - PPC optimisations - rate distortion optimal cbp support - rate distorted optimal ac prediction for mpeg4 - rate distorted optimal lambda->qp support - AAC encoding with libfaac - Sunplus JPEG codec (SP5X) support - use lagrange multipler instead of qp for ratecontrol - theora/VP3 decoding support - XA and ADX ADPCM codecs - export mpeg2 active display area / pan scan - Add support for configuring with IBM XLC - floating point AAN DCT - initial support for zygovideo (not complete) - rgb ffv1 support - new audio/video parser API - av_log() system - av_read_frame() and av_seek_frame() support - missing last frame fixes - seek by mouse in ffplay - noise reduction of dct coefficients - h263 OBMC & 4MV support - h263 alternative inter vlc support - h263 loop filter - h263 slice structured mode - interlaced DCT support for MPEG2 encoding - stuffing to stay above min_bitrate - mb type & qp vissualization - frame stepping for ffplay - interlaced motion estimation - alternate scantable support - SVCD scan offset support - closed gop support - SSE2 fdct - quantizer noise shaping - G.726 ADPCM audio codec - MS ADPCM encoding - multithreaded/SMP motion estimation - multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263 - multithreaded/SMP decoding for MPEG2 - FLAC decoder - Metrowerks CodeWarrior suppport - h263+ custom pcf support - nicer output for 'ffmpeg -formats' - matroska demuxer - SGI image format, encoding and decoding - h264 loop filter support - h264 CABAC support - nicer looking arrows for the motion vector vissualization - improved VCD support - audio timestamp drift compensation - mpeg2 YUV 422/444 support - polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample - better image scaling - h261 support - correctly interleave packets during encoding - VIS optimized motion compensation - intra_dc_precission>0 encoding support - support reuse of motion vectors/mb types/field select values of the source video - more accurate deblock filter - padding support - many optimizations and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $ d3 1 a3 1 --- ffserver.c.orig 2003-09-28 17:26:39.000000000 +0200 d5 1 a5 1 @@@@ -4488,7 +4488,7 @@@@ static void show_help(void) d14 1 a14 1 @@@@ -4546,7 +4546,7 @@@@ int main(int argc, char **argv) @ 1.2 log @Update to 0.4.8, and install the header files that are customarily installed. Changes: version 0.4.8: - MPEG2 video encoding (Michael) - Id RoQ playback subsystem (Mike Melanson and Tim Ferguson) - Wing Commander III Movie (.mve) file playback subsystem (Mike Melanson and Mario Brito) - Xan DPCM audio decoder (Mario Brito) - Interplay MVE playback subsystem (Mike Melanson) - Duck DK3 and DK4 ADPCM audio decoders (Mike Melanson) version 0.4.7: - RealAudio 1.0 (14_4) and 2.0 (28_8) native decoders. Author unknown, code from a mplayerhq (originally from public domain player for Amiga at http://www.honeypot.net/audio) - Current version now also compiles with older GCC (Fabrice) - 4X multimedia playback system including 4xm file demuxer (Mike Melanson), and 4X video and audio codecs (Michael) - Creative YUV (CYUV) decoder (Mike Melanson) - FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv) (Michael) - ASV1 (Asus), H.264, Intel indeo3 codecs has been added (Various) - Tiny PNG encoder and decoder, tiny GIF decoder, PAM decoder (PPM with alpha support), JPEG YUV colorspace support. (Fabrice Bellard) - ffplay has been replaced with a newer version which uses SDL (optionally) for multi platform support (fabrice) - Sorenson Version 3 codec (SVQ3) support has been added (decoding only) - donated by anonymous - AMR format has been added (Johannes Carlsson) - 3gp support has been added (Johannes Carlsson) - VP3 codec has been added (Mike Melanson) - more MPEG-1/2 fixes - Better Multi platform support, MS Visual Studio fixes (various) - Altivec optimizations (Magnus Damn and others) - SH4 processor support has been added (BERO) - New public interfaces (avcodec_get_pix_fmt) (Roman Shaposhnick) - VOB Streaming support (Brian Foley) - Better MP3 Autodetection (Andriy Rysin) - qpel encoding (Michael) - 4mv+b frames encoding finally fixed (Michael) - chroma ME (Michael) - 5 comparission functions for ME (Michael) - b frame encoding speedup (Michael) - wmv2 codec (unfinished - Michael) - user specified diamond size for EPZS (Michael) - Playstation STR playback subsystem, still experimental (Mike and Michael) - ASV2 codec (Michael) - CLJR decoder (Alex) .. And lots more new enhances and fixes. version 0.4.6: - completely new integer only mpeg audio layer 1/2/3 decoder rewritten from scratch. - recoded dct and motion vector search with gcc (no longer depends on nasm). - fix quantization bug in AC3 encoder. - added PCM codecs and format. Corrected wav/avi/asf pcm issues. - added prototype ffplay program. - added GOB header parsing on H.263/H.263+ decoder. (Juanjo) - bug fix on MCBPC tables of H.263. (Juanjo) - bug fix on DC coefficients of H.263. (Juanjo) - added Advanced Prediction Mode on H.263/H.263+ decoder. (Juanjo) - now we can decode H.263 streams found on QuickTime files. (Juanjo) - now we can decode H.263 streams found on VIVO v1 files.(Juanjo) - preliminary RTP "friendly" mode for H.263/H.263+ coding. (Juanjo) - added GOB header for H.263/H.263+ coding on RTP mode. (Juanjo) - now H.263 picture size is returned on the first decoded frame. (Juanjo) - added first regression tests - added MPEG2 TS demux - new demux API for libav - more accurate and faster IDCT (Michael) - faster and entropy controlled motion search (Michael) - two pass video encoding (Michael) - new video rate control (Michael) - added MSMPEG4V1, MSMPEGV2 and WMV1 support (Michael) - great performance improvement of video encoders and decoders (Michael) - new and faster bit readers and vlc parsers (Michael) - high quality encoding mode : tries all macroblock/VLC types (Michael) - added DV video decoder - preliminary RTP/RTSP support in ffserver and libavformat - H.263+ AIC decoding/encoding support. (Juanjo) - VCD MPEG-PS mode. (Juanjo) - PSNR stuff. (Juanjo) - Simple stats output. (Juanjo) - 16-bit and 15-bit rgb/bgr/gbr support (Bisqwit) @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2003/12/27 18:59:30 fredb Exp $ d3 1 a3 1 --- ffserver.c.orig 2001-08-14 17:38:17.000000000 -0500 d5 1 a5 20 @@@@ -20,6 +20,7 @@@@ #include #include #include +#include #include #include #include @@@@ -28,8 +29,9 @@@@ #include #include #include +#ifndef __FreeBSD__ #include -#include +#endif #include #include #include @@@@ -1491,7 +1493,7 @@@@ void help(void) d7 1 a7 1 "-L : print the LICENCE\n" d14 1 a14 1 @@@@ -1523,10 +1525,10 @@@@ int main(int argc, char **argv) d16 1 a16 1 register_all(); d21 2 a22 6 for(;;) { - c = getopt_long_only(argc, argv, "Lh?f:", NULL, NULL); + c = getopt(argc, argv, "Lh?f:"); if (c == -1) break; switch(c) { @ 1.1.1.1 log @Reimport graphics/ffmpeg as multimedia/ffmpeg. @ text @@