12:33 a.m.
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27231
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-r16802.patch ffmpeg-r16846.patch
Removed Files:
ffmpeg-cpu.patch
Log Message:
* Thu Jan 29 2009 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.53.20080908
- drop unnecessary patch
- change the lib split on x86, it doesn't work right for P3/AthlonXP
- enable bzlib and dirac support via external libs
- sort BR list alphabetically
- fix a couple of exploitable and potentially exploitable vulnerabilities, including
http://www.trapkit.de/advisories/TKADV2009-004.txt
ffmpeg-r16802.patch:
--- NEW FILE ffmpeg-r16802.patch ---
diff -up ffmpeg-20080908/libavcodec/indeo3.c.orig ffmpeg-20080908/libavcodec/indeo3.c
--- ffmpeg-20080908/libavcodec/indeo3.c.orig 2008-06-12 23:50:13.000000000 +0200
+++ ffmpeg-20080908/libavcodec/indeo3.c 2009-01-29 21:15:18.000000000 +0100
@@ -348,6 +348,10 @@ static void iv_Decode_Chunk(Indeo3Decode
if(cmd == 0) {
strip++;
+ if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
+ av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
+ break;
+ }
memcpy(strip, strip-1, sizeof(ustr_t));
strip->split_flag = 1;
strip->split_direction = 0;
@@ -355,6 +359,10 @@ static void iv_Decode_Chunk(Indeo3Decode
continue;
} else if(cmd == 1) {
strip++;
+ if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
+ av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
+ break;
+ }
memcpy(strip, strip-1, sizeof(ustr_t));
strip->split_flag = 1;
strip->split_direction = 1;
diff -up ffmpeg-20080908/libavutil/common.h.orig ffmpeg-20080908/libavutil/common.h
--- ffmpeg-20080908/libavutil/common.h.orig 2008-08-31 09:39:47.000000000 +0200
+++ ffmpeg-20080908/libavutil/common.h 2009-01-30 01:13:07.000000000 +0100
@@ -116,6 +116,7 @@
#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
/* misc math functions */
extern const uint8_t ff_log2_tab[256];
ffmpeg-r16846.patch:
--- NEW FILE ffmpeg-r16846.patch ---
diff -up ffmpeg-20080908/libavformat/4xm.c.orig ffmpeg-20080908/libavformat/4xm.c
--- ffmpeg-20080908/libavformat/4xm.c.orig 2008-06-03 18:20:54.000000000 +0200
+++ ffmpeg-20080908/libavformat/4xm.c 2009-01-29 21:19:17.000000000 +0100
@@ -163,10 +163,10 @@ static int fourxm_read_header(AVFormatCo
return AVERROR_INVALIDDATA;
}
current_track = AV_RL32(&header[i + 8]);
+ if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
+ return -1;
if (current_track + 1 > fourxm->track_count) {
fourxm->track_count = current_track + 1;
- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
- return -1;
fourxm->tracks = av_realloc(fourxm->tracks,
fourxm->track_count * sizeof(AudioTrack));
if (!fourxm->tracks) {
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg.spec 20 Nov 2008 18:40:26 -0000 1.7
+++ ffmpeg.spec 30 Jan 2009 00:33:13 -0000 1.8
@@ -6,31 +6,34 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.52.%{svn}%{?dist}
+Release: 0.53.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
-Patch0: %{name}-cpu.patch
Patch1: %{name}-cmov.patch
Patch4: %{name}-asmreg.patch
+Patch10: %{name}-r16802.patch
+Patch11: %{name}-r16846.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
-BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: faac-devel
+BuildRequires: faad2-devel >= %{faad2min}
+BuildRequires: gsm-devel
+BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
-BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
-BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: xvidcore-devel
+BuildRequires: libvorbis-devel
+BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
-BuildRequires: gsm-devel
-BuildRequires: imlib2-devel
BuildRequires: texi2html
-BuildRequires: faac-devel
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
+BuildRequires: xvidcore-devel
+BuildRequires: zlib-devel
#don't enable on x86_64 until PIC issues on are fixed (in
libavcodec/i386/fft_mmx.asm)
%ifarch %{ix86}
BuildRequires: yasm
@@ -78,11 +81,13 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\
+ --enable-bzlib \\\
--enable-libdc1394 \\\
--enable-libfaac \\\
--enable-libfaad \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
+ --enable-libschroedinger \\\
--enable-libtheora \\\
--enable-libvorbis \\\
--enable-libx264 \\\
@@ -103,9 +108,10 @@
%prep
%setup -q -n %{name}-%{svn}
-%patch0 -p1 -b .cpu
%patch1 -p1 -b .cmov
%patch4 -p1 -b .asmreg
+%patch10 -p1
+%patch11 -p1
%build
mkdir generic
@@ -114,9 +120,6 @@
--shlibdir=%{_libdir} \
%ifarch %{ix86}
--cpu=%{_target_cpu} \
- --disable-amd3dnow \
- --disable-mmx \
- --disable-sse \
%endif
%ifarch ppc ppc64
--disable-altivec \
@@ -124,31 +127,23 @@
%ifarch sparc sparc64
--disable-vis \
%endif
-%ifarch x86_64
- --disable-amd3dnow \
-%endif
make %{?_smp_mflags}
popd
+mkdir simd
+pushd simd
%ifarch %{ix86}
-mkdir sse2
-pushd sse2
%{ff_configure}\
- --shlibdir=%{_libdir}/sse2 \
+ --shlibdir=%{_libdir}/i686 \
--cpu=i686 \
- --disable-amd3dnow \
- --disable-ssse3 \
--disable-ffmpeg \
--disable-ffserver \
--disable-ffplay \
make %{?_smp_mflags}
-popd
%endif
%ifarch ppc
-mkdir altivec
-pushd altivec
%{ff_configure}\
--shlibdir=%{_libdir}/altivec \
--cpu=g4 \
@@ -157,11 +152,9 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
%ifarch ppc64
-mkdir altivec
-pushd altivec
%{ff_configure}\
--shlibdir=%{_libdir}/altivec \
--cpu=g5 \
@@ -170,11 +163,9 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
%ifarch sparc sparc64
-mkdir vis
-pushd vis
%{ff_configure}\
--shlibdir=%{_libdir}/v9 \
--cpu=v9 \
@@ -183,29 +174,26 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
+popd
%install
rm -rf $RPM_BUILD_ROOT __doc
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
popd
+pushd simd
%ifarch %{ix86}
-pushd sse2
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
%ifarch ppc ppc64
-pushd altivec
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
%ifarch sparc sparc64
-pushd vis
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
+popd
cp -a doc __doc
rm -f __doc/{Makefile,*.{1,pl,texi}}
@@ -234,8 +222,8 @@
%{_libdir}/lib*.so.*
%{_libdir}/vhook/
%ifarch %{ix86}
-%{_libdir}/sse2/lib*.so.*
-%{_libdir}/sse2/vhook/
+%{_libdir}/i686/lib*.so.*
+%{_libdir}/i686/vhook/
%endif
%ifarch ppc ppc64
%{_libdir}/altivec/lib*.so.*
@@ -252,7 +240,7 @@
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
%ifarch %{ix86}
-%{_libdir}/sse2/lib*.so
+%{_libdir}/i686/lib*.so
%endif
%ifarch ppc ppc64
%{_libdir}/altivec/lib*.so
@@ -263,6 +251,14 @@
%changelog
+* Thu Jan 29 2009 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.53.20080908
+- drop unnecessary patch
+- change the lib split on x86, it doesn't work right for P3/AthlonXP
+- enable bzlib and dirac support via external libs
+- sort BR list alphabetically
+- fix a couple of exploitable and potentially exploitable vulnerabilities, including
+ http://www.trapkit.de/advisories/TKADV2009-004.txt
+
* Thu Nov 20 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.52.20080908
- add obsoletes for -compat package (RPMFusion bug #173)
--- ffmpeg-cpu.patch DELETED ---