Attachment 1356 Details for Bug 4001 – diff for the SPEC file

[patch] diff for the SPEC file

mplayer.diff (text/plain), 1.93 KB, created by David Walser on 2012-01-09 18:01:24 CET

(hide)

Description:

Filename:

MIME Type:

Creator: David Walser

Created: 2012-01-09 18:01:24 CET

Size: 1.93 KB

patch

obsolete

>--- SPECS/mplayer.spec~	2011-10-07 18:34:56.000000000 -0400
>+++ SPECS/mplayer.spec	2012-01-09 11:54:31.194181861 -0500
>@@ -20,7 +20,7 @@
> %define rel 1.%prerel.5
> %endif
> %define release		%mkrel %rel
>-%define subrel		1
>+%define subrel		2
> 
> %define build_plf 0
> %define build_optimization 0
>@@ -215,6 +215,16 @@
> # original ubuntu patch needed to be rediffed
> Patch41:	mplayer-1.4.0-mga-fix-CVE-2011-0480.patch
> Patch42:	fix-CVE-2011-0723.patch
>+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/42_aac_zero_bands.patch?revision=25254&view=markup&pathrev=26428
>+Patch43:	ffmpeg-CVE-2009-4636.patch
>+# rediffed from http://git.videolan.org/?p=ffmpeg.git;a=commit;h=44511b17cbbb524602c91a198e7314fa57a7062a
>+Patch44:	ffmpeg-CVE-2011-0722.patch
>+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/35_mov_bad_timings.patch?revision=25101&view=markup&pathrev=28635
>+Patch45:	ffmpeg-mov_bad_timings.patch
>+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/31_mp3_outlen.patch?revision=25031&view=markup&pathrev=28635
>+Patch46:	ffmpeg-mp3_outlen.patch
>+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/41_vorbis_zero_samplerate.patch?revision=25230&view=markup&pathrev=28635
>+Patch47:	ffmpeg-vorbis_zero_samplerate.patch
> 
> URL:		http://www.mplayerhq.hu
> License:	GPLv2
>@@ -470,6 +480,11 @@
> %patch40 -p1 -b .CVE-2011-2161
> %patch41 -p1 -b .mga-fix-CVE-2011-0480
> %patch42 -p1 -b .fix-CVE-2011-0723
>+%patch43 -p1 -b .CVE-2009-4636
>+%patch44 -p1 -b .CVE-2011-0722
>+%patch45 -p1 -b .mov_bad_timings
>+%patch46 -p1 -b .mp3_outlen
>+%patch47 -p1 -b .vorbis_zero_samplerate
> cd ..
> 
> perl -pi -e 's^r\$svn_revision^%release^' version.sh
>@@ -577,7 +592,6 @@
> %endif
> %if ! %build_dvb
>        --disable-dvb \
>-       --disable-dvbhead \
> %endif
> %if ! %build_ggi
> 	--disable-ggi \

--- SPECS/mplayer.spec~	2011-10-07 18:34:56.000000000 -0400
+++ SPECS/mplayer.spec	2012-01-09 11:54:31.194181861 -0500
@@ -20,7 +20,7 @@
 %define rel 1.%prerel.5
 %endif
 %define release		%mkrel %rel
-%define subrel		1
+%define subrel		2
 
 %define build_plf 0
 %define build_optimization 0
@@ -215,6 +215,16 @@
 # original ubuntu patch needed to be rediffed
 Patch41:	mplayer-1.4.0-mga-fix-CVE-2011-0480.patch
 Patch42:	fix-CVE-2011-0723.patch
+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/42_aac_zero_bands.patch?revision=25254&view=markup&pathrev=26428
+Patch43:	ffmpeg-CVE-2009-4636.patch
+# rediffed from http://git.videolan.org/?p=ffmpeg.git;a=commit;h=44511b17cbbb524602c91a198e7314fa57a7062a
+Patch44:	ffmpeg-CVE-2011-0722.patch
+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/35_mov_bad_timings.patch?revision=25101&view=markup&pathrev=28635
+Patch45:	ffmpeg-mov_bad_timings.patch
+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/31_mp3_outlen.patch?revision=25031&view=markup&pathrev=28635
+Patch46:	ffmpeg-mp3_outlen.patch
+# rediffed from http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/patches/to_upstream/41_vorbis_zero_samplerate.patch?revision=25230&view=markup&pathrev=28635
+Patch47:	ffmpeg-vorbis_zero_samplerate.patch
 
 URL:		http://www.mplayerhq.hu
 License:	GPLv2
@@ -470,6 +480,11 @@
 %patch40 -p1 -b .CVE-2011-2161
 %patch41 -p1 -b .mga-fix-CVE-2011-0480
 %patch42 -p1 -b .fix-CVE-2011-0723
+%patch43 -p1 -b .CVE-2009-4636
+%patch44 -p1 -b .CVE-2011-0722
+%patch45 -p1 -b .mov_bad_timings
+%patch46 -p1 -b .mp3_outlen
+%patch47 -p1 -b .vorbis_zero_samplerate
 cd ..
 
 perl -pi -e 's^r\$svn_revision^%release^' version.sh
@@ -577,7 +592,6 @@
 %endif
 %if ! %build_dvb
        --disable-dvb \
-       --disable-dvbhead \
 %endif
 %if ! %build_ggi
 	--disable-ggi \

Actions: View | Diff

Attachments on bug 4001: 1350 | 1351 | 1352 | 1353 | 1354 | 1355 | 1356