[paketler-commits] r51524 - in 2008/programming/libs/xine-lib: . files
paketler-commits at pardus.org.tr
paketler-commits at pardus.org.tr
16 Ağu 2008 Cmt 15:35:20 EEST
Author: eki
Date: Sat Aug 16 15:35:20 2008
New Revision: 51524
Removed:
2008/programming/libs/xine-lib/files/external-faad.patch
2008/programming/libs/xine-lib/files/fix-ts-demuxer.patch
Modified:
2008/programming/libs/xine-lib/files/new-ffmpeg-codecs.patch
2008/programming/libs/xine-lib/pspec.xml
Log:
merge : SECURITY FIX: Multiple integer overflows in src/demuxers/id3.c, multiple
boundary errors in src/demuxers/demux_real.c and a boundary error in
src/input/input_v4l.c and Bug#7494
Modified: 2008/programming/libs/xine-lib/files/new-ffmpeg-codecs.patch
=================================================================
--- 2008/programming/libs/xine-lib/files/new-ffmpeg-codecs.patch (original)
+++ 2008/programming/libs/xine-lib/files/new-ffmpeg-codecs.patch Sat Aug 16 15:35:20 2008
@@ -1,16 +1,16 @@
-diff -Nur xine-lib-1.1.13-old/configure.ac xine-lib-1.1.13/configure.ac
---- xine-lib-1.1.13-old/configure.ac 2008-06-24 15:27:01.000000000 +0300
-+++ xine-lib-1.1.13/configure.ac 2008-06-24 15:34:15.000000000 +0300
-@@ -388,7 +388,7 @@
+diff -Nur xine-lib-1.1.15/configure.ac xine-lib-1.1.15-new/configure.ac
+--- xine-lib-1.1.15/configure.ac 2008-08-13 19:26:38.000000000 +0300
++++ xine-lib-1.1.15-new/configure.ac 2008-08-16 03:34:07.000000000 +0300
+@@ -370,7 +370,7 @@
echo "/* Automatically generated */" > $ffmpeg_config_h
dnl uncommon ffmpeg codecs
-ffmpeg_uncommon_codecs="AASC ASV1 ASV2 AVS CSCD CYUV DVVIDEO EIGHTBPS FLIC FLV FOURXM FRAPS HUFFYUV IDCIN INTERPLAY_VIDEO KMVC LOCO MMVIDEO NUV QDRAW QPEG ROQ RPZA SMACKER SMC SNOW TRUEMOTION1 TRUEMOTION2 TSCC ULTI VCR1 VMDVIDEO WNV1 XAN_WC3 XL ZMBV ALAC AMR_NB AMR_WB LIBGSM MACE3 MACE6 SHORTEN SMACKAUD TRUESPEECH TTA VMDAUDIO PCM_ALAW PCM_MULAW PCM_S8 PCM_S16BE PCM_S16LE PCM_S24BE PCM_S24DAUD PCM_S24LE PCM_S32BE PCM_S32LE PCM_U8 PCM_U16BE PCM_U16LE PCM_U24BE PCM_U24LE PCM_U32BE PCM_U32LE INTERPLAY_DPCM ROQ_DPCM SOL_DPCM VQA XAN_DPCM ADPCM_4XM ADPCM_CT ADPCM_EA ADPCM_IMA_DK3 ADPCM_IMA_DK4 ADPCM_IMA_QT ADPCM_IMA_SMJPEG ADPCM_IMA_WAV ADPCM_IMA_WS ADPCM_MS ADPCM_SBPRO_2 ADPCM_SBPRO_3 ADPCM_SBPRO_4 ADPCM_XA ADPCM_YAMAHA"
-+ffmpeg_uncommon_codecs="AASC ASV1 ASV2 AVS CSCD CYUV DVVIDEO EIGHTBPS FLIC FLV FOURXM FRAPS HUFFYUV IDCIN INTERPLAY_VIDEO KMVC LOCO MMVIDEO NUV QDRAW QPEG ROQ RPZA SMACKER SMC SNOW DIRAC TRUEMOTION1 TRUEMOTION2 TSCC ULTI VCR1 VMDVIDEO WNV1 XAN_WC3 XL ZMBV ALAC AMR_NB AMR_WB LIBGSM MACE3 MACE6 SHORTEN SMACKAUD TRUESPEECH TTA VMDAUDIO PCM_ALAW PCM_MULAW PCM_S8 PCM_S16BE PCM_S16LE PCM_S24BE PCM_S24DAUD PCM_S24LE PCM_S32BE PCM_S32LE PCM_U8 PCM_U16BE PCM_U16LE PCM_U24BE PCM_U24LE PCM_U32BE PCM_U32LE INTERPLAY_DPCM ROQ_DPCM SOL_DPCM VQA XAN_DPCM ADPCM_4XM ADPCM_CT ADPCM_EA ADPCM_IMA_DK3 ADPCM_IMA_DK4 ADPCM_IMA_QT ADPCM_IMA_SMJPEG ADPCM_IMA_WAV ADPCM_IMA_WS ADPCM_MS ADPCM_SBPRO_2 ADPCM_SBPRO_3 ADPCM_SBPRO_4 ADPCM_XA ADPCM_YAMAHA AMR_NB AMR_WB"
++ffmpeg_uncommon_codecs="AASC ASV1 ASV2 AVS CSCD CYUV DVVIDEO EIGHTBPS FLIC FLV FOURXM FRAPS HUFFYUV IDCIN INTERPLAY_VIDEO KMVC LOCO MMVIDEO NUV QDRAW QPEG ROQ RPZA SMACKER SMC SNOW DIRAC TRUEMOTION1 TRUEMOTION2 TSCC ULTI VCR1 VMDVIDEO WNV1 XAN_WC3 XL ZMBV ALAC AMR_NB AMR_WB LIBGSM MACE3 MACE6 SHORTEN SMACKAUD TRUESPEECH TTA VMDAUDIO PCM_ALAW PCM_MULAW PCM_S8 PCM_S16BE PCM_S16LE PCM_S24BE PCM_S24DAUD PCM_S24LE PCM_S32BE PCM_S32LE PCM_U8 PCM_U16BE PCM_U16LE PCM_U24BE PCM_U24LE PCM_U32BE PCM_U32LE INTERPLAY_DPCM ROQ_DPCM SOL_DPCM VQA XAN_DPCM ADPCM_4XM ADPCM_CT ADPCM_EA ADPCM_IMA_DK3 ADPCM_IMA_DK4 ADPCM_IMA_QT ADPCM_IMA_SMJPEG ADPCM_IMA_WAV ADPCM_IMA_WS ADPCM_MS ADPCM_SBPRO_2 ADPCM_SBPRO_3 ADPCM_SBPRO_4 ADPCM_XA ADPCM_YAMAHA"
for ucname in $ffmpeg_uncommon_codecs; do
config_name="CONFIG_${ucname}_DECODER"
enabled_name="ENABLE_${ucname}_DECODER"
-@@ -402,7 +402,7 @@
+@@ -384,7 +384,7 @@
done
dnl popular ffmpeg codecs
@@ -19,92 +19,47 @@
for ucname in $ffmpeg_popular_codecs; do
config_name="CONFIG_${ucname}_DECODER"
-diff -Nur xine-lib-1.1.13-old/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.13/src/combined/ffmpeg/ff_audio_decoder.c
---- xine-lib-1.1.13-old/src/combined/ffmpeg/ff_audio_decoder.c 2008-06-24 15:27:01.000000000 +0300
-+++ xine-lib-1.1.13/src/combined/ffmpeg/ff_audio_decoder.c 2008-06-24 15:34:15.000000000 +0300
-@@ -108,6 +108,8 @@
- {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"},
- {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"},
- {BUF_AUDIO_WAVPACK, CODEC_ID_WAVPACK, "WavPack (ffmpeg)"},
-+ {BUF_AUDIO_AMR_NB, CODEC_ID_AMR_NB, "AMR-NB 3gp (ffmpeg)"},
-+ {BUF_AUDIO_AMR_WB, CODEC_ID_AMR_WB, "AMR-WB 3gp (ffmpeg)"},
- };
-
-
-@@ -598,6 +600,12 @@
- #ifdef CONFIG_WAVPACK_DECODER
- BUF_AUDIO_WAVPACK,
- #endif
-+ #ifdef CONFIG_AMR_NB_DECODER
-+ BUF_AUDIO_AMR_NB,
-+ #endif
-+ #ifdef CONFIG_AMR_WB_DECODER
-+ BUF_AUDIO_AMR_WB,
-+ #endif
-
- 0
- };
-diff -Nur xine-lib-1.1.13-old/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.13/src/combined/ffmpeg/ff_video_decoder.c
---- xine-lib-1.1.13-old/src/combined/ffmpeg/ff_video_decoder.c 2008-06-24 15:27:01.000000000 +0300
-+++ xine-lib-1.1.13/src/combined/ffmpeg/ff_video_decoder.c 2008-06-24 15:34:15.000000000 +0300
-@@ -273,6 +273,10 @@
- {BUF_VIDEO_VP5, CODEC_ID_VP5, "On2 VP5 (ffmpeg)"},
- {BUF_VIDEO_VP6, CODEC_ID_VP6, "On2 VP6 (ffmpeg)"},
- {BUF_VIDEO_VP6F, CODEC_ID_VP6F, "On2 VP6 (ffmpeg)"},
-+ {BUF_VIDEO_SNOW, CODEC_ID_SNOW, "Snow (ffmpeg)"},
+diff -Nur xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.15-new/src/combined/ffmpeg/ff_video_decoder.c
+--- xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-07-17 00:01:56.000000000 +0300
++++ xine-lib-1.1.15-new/src/combined/ffmpeg/ff_video_decoder.c 2008-08-16 03:37:11.000000000 +0300
+@@ -322,6 +322,9 @@
+ {BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"},
+ {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"},
+ {BUF_VIDEO_SNOW, CODEC_ID_SNOW, "Snow (ffmpeg)"},
+#ifdef CODEC_ID_DIRAC
-+ {BUF_VIDEO_DIRAC, CODEC_ID_DIRAC, "Dirac (ffmpeg)"},
++ {BUF_VIDEO_DIRAC, CODEC_ID_DIRAC, "Dirac (ffmpeg)"},
+#endif
- {BUF_VIDEO_4XM, CODEC_ID_4XM, "4X Video (ffmpeg)"},
- {BUF_VIDEO_CINEPAK, CODEC_ID_CINEPAK, "Cinepak (ffmpeg)"},
- {BUF_VIDEO_MSVC, CODEC_ID_MSVIDEO1, "Microsoft Video 1 (ffmpeg)"},
-@@ -1751,6 +1755,12 @@
- BUF_VIDEO_VP6,
- BUF_VIDEO_VP6F,
+ };
+
+ static const char *const skip_loop_filter_enum_names[] = {
+@@ -1896,6 +1899,9 @@
+ #ifdef CONFIG_SNOW_DECODER
+ BUF_VIDEO_SNOW,
#endif
-+ #ifdef CONFIG_SNOW_DECODER
-+ BUF_VIDEO_SNOW,
-+ #endif
+ #ifdef CONFIG_DIRAC_DECODER
+ BUF_VIDEO_DIRAC,
+ #endif
- #ifdef CONFIG_4XM_DECODER
- BUF_VIDEO_4XM,
- #endif
-diff -Nur xine-lib-1.1.13-old/src/xine-engine/buffer.h xine-lib-1.1.13/src/xine-engine/buffer.h
---- xine-lib-1.1.13-old/src/xine-engine/buffer.h 2008-06-24 15:27:01.000000000 +0300
-+++ xine-lib-1.1.13/src/xine-engine/buffer.h 2008-06-24 15:34:15.000000000 +0300
-@@ -191,6 +191,8 @@
- #define BUF_VIDEO_THEORA_RAW 0x02640000
+ BUF_VIDEO_THEORA_RAW,
+ 0
+ };
+diff -Nur xine-lib-1.1.15/src/xine-engine/buffer.h xine-lib-1.1.15-new/src/xine-engine/buffer.h
+--- xine-lib-1.1.15/src/xine-engine/buffer.h 2008-07-17 00:01:56.000000000 +0300
++++ xine-lib-1.1.15-new/src/xine-engine/buffer.h 2008-08-16 03:39:48.000000000 +0300
+@@ -193,6 +193,7 @@
#define BUF_VIDEO_VC1 0x02650000
#define BUF_VIDEO_VMNC 0x02660000
-+#define BUF_VIDEO_DIRAC 0x02670000
-+#define BUF_VIDEO_SNOW 0x02680000
+ #define BUF_VIDEO_SNOW 0x02670000
++#define BUF_VIDEO_DIRAC 0x02680000
/* audio buffer types: (please keep in sync with buffer_types.c) */
-@@ -259,6 +261,8 @@
- #define BUF_AUDIO_FLVADPCM 0x033C0000
- #define BUF_AUDIO_WAVPACK 0x033D0000
- #define BUF_AUDIO_MP3ADU 0x033E0000
-+#define BUF_AUDIO_AMR_NB 0x03F00000
-+#define BUF_AUDIO_AMR_WB 0x03F10000
-
- /* spu buffer types: */
-
-diff -Nur xine-lib-1.1.13-old/src/xine-engine/buffer_types.c xine-lib-1.1.13/src/xine-engine/buffer_types.c
---- xine-lib-1.1.13-old/src/xine-engine/buffer_types.c 2008-06-24 15:27:01.000000000 +0300
-+++ xine-lib-1.1.13/src/xine-engine/buffer_types.c 2008-06-24 15:34:15.000000000 +0300
-@@ -616,6 +616,22 @@
+diff -Nur xine-lib-1.1.15/src/xine-engine/buffer_types.c xine-lib-1.1.15-new/src/xine-engine/buffer_types.c
+--- xine-lib-1.1.15/src/xine-engine/buffer_types.c 2008-07-17 00:01:56.000000000 +0300
++++ xine-lib-1.1.15-new/src/xine-engine/buffer_types.c 2008-08-16 03:40:50.000000000 +0300
+@@ -787,6 +787,14 @@
+ BUF_VIDEO_SNOW,
+ "Snow"
},
- {
- {
-+ ME_FOURCC('S','N','O','W'),
-+ 0
-+ },
-+ BUF_VIDEO_SNOW,
-+ "Snow"
-+},
+{
+ {
+ ME_FOURCC('d','r','a','c'),
@@ -113,45 +68,6 @@
+ BUF_VIDEO_DIRAC,
+ "Dirac"
+},
-+{
-+ {
- ME_FOURCC('8','B', 'P','S'),
- 0
- },
-@@ -1140,10 +1156,35 @@
- },
- {
- {
-+ ME_FOURCC('W', 'V', 'P', 'K'),
- 0
- },
- BUF_AUDIO_WAVPACK,
-- "Wavpack"
-+ "WavPack lossless audio (ffmpeg)"
-+},
-+{
-+ {
-+ ME_FOURCC('T', 'T', 'A', '1'),
-+ 0
-+ },
-+ BUF_AUDIO_TTA,
-+ "TTA (The Lossless True Audio) (ffmpeg)"
-+},
-+{
-+ {
-+ ME_FOURCC('s', 'a', 'm', 'r'),
-+ 0
-+ },
-+ BUF_AUDIO_AMR_NB,
-+ "AMR-NB 3gp (ffmpeg)"
-+},
-+{
-+ {
-+ ME_FOURCC('s', 'a', 'w', 'b'),
-+ 0
-+ },
-+ BUF_AUDIO_AMR_WB,
-+ "AMR-WB 3gp (ffmpeg)"
- },
{ { 0 }, 0, "last entry" }
};
+
Modified: 2008/programming/libs/xine-lib/pspec.xml
=================================================================
--- 2008/programming/libs/xine-lib/pspec.xml (original)
+++ 2008/programming/libs/xine-lib/pspec.xml Sat Aug 16 15:35:20 2008
@@ -11,7 +11,7 @@
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>Core libraries for Xine movie player</Summary>
- <Archive sha1sum="d1f4cf0511067a554dbe243468311ebeb3bbdce4" type="tarbz2">mirrors://sourceforge/xine/xine-lib-1.1.13.tar.bz2</Archive>
+ <Archive sha1sum="bcb567ea2a11c5f26b2384d5400b8466ea9048c6" type="tarbz2">mirrors://sourceforge/xine/xine-lib-1.1.15.tar.bz2</Archive>
<BuildDependencies>
<Dependency releaseFrom="2">essential</Dependency>
<Dependency versionFrom="1.2.7">libdvdcss</Dependency>
@@ -32,7 +32,6 @@
</BuildDependencies>
<Patches>
<Patch level="1">external-a52.patch</Patch>
- <Patch level="1">external-faad.patch</Patch>
<Patch level="1">external-mad.patch</Patch>
<Patch level="1">external-vidix.patch</Patch>
<Patch level="1">glib.patch</Patch>
@@ -43,7 +42,6 @@
<Patch level="1">experimental_amr.patch</Patch>
-->
<Patch level="1">audio_buffersize.patch</Patch>
- <Patch level="1">fix-ts-demuxer.patch</Patch>
</Patches>
</Source>
@@ -82,6 +80,23 @@
</Package>
<History>
+ <Update release="49" type="security">
+ <Date>2008-08-15</Date>
+ <Version>1.1.15</Version>
+ <Comment>Version bump to fix: Multiple integer overflows in src/demuxers/id3.c,
+ multiple boundary errors in src/demuxers/demux_real.c,
+ and a boundary error in src/input/input_v4l.c and Bug#7494.
+ </Comment>
+ <Name>Pınar Yanardağ</Name>
+ <Email>pinar at pardus.org.tr</Email>
+ </Update>
+ <Update release="48">
+ <Date>2008-07-25</Date>
+ <Version>1.1.14</Version>
+ <Comment>Version bump</Comment>
+ <Name>S.Çağlar Onur</Name>
+ <Email>caglar at pardus.org.tr</Email>
+ </Update>
<Update release="47">
<Date>2008-06-23</Date>
<Version>1.1.13</Version>
Paketler-commits mesaj listesiyle ilgili
daha fazla bilgi