added 2 security related patches to the _pre6 ebuilds. see #89277. also updated metadata.xml, chriswhite is retired.

Package-Manager: portage-2.0.51.19

8 files changed, 104 insertions, 39 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 953d6a058d0e..9d6c93390402 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.292 2005/04/16 10:05:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.293 2005/04/16 13:44:48 luckyduck Exp $
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  +files/mmst_fix_20050415.diff, +files/rtsp_fix_20050415.diff,
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild,
+  mplayer-1.0_pre6-r3.ebuild:
+  added 2 security related patches to the _pre6 ebuilds. see #89277. also
+  updated metadata.xml, chriswhite is retired.
 
   16 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
   -files/mplayer-1.0_pre4-alsa-gcc34.patch,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 81b14dba14e3..e2967709c84b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,41 +1,53 @@
-MD5 9d847a848bc97d8173f31be130323ed9 mplayer-1.0_pre6-r2.ebuild 18338
-MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
-MD5 6f345ef85f53fd6eaea9a92c04173d80 mplayer-1.0_pre6-r1.ebuild 18263
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 660be924a3fa32a4719a8756be030ac5 mplayer-1.0_pre6-r2.ebuild 18461
 MD5 6f0ce28848bdde9794f1f713957b8e63 mplayer-1.0_pre5-r5.ebuild 18497
-MD5 7f317ed2dd565bbc2b79caf232186f39 ChangeLog 54261
-MD5 ab9bcee5202a26199f573993fc915c43 mplayer-1.0_pre6-r3.ebuild 18293
-MD5 443b9526abb33e4e9f8786f764253b53 files/mplayer-1.0_pre5-gcc_detection.patch 445
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r3 429
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 5dc7bef01e88c859df6b132df58617c4 mplayer-1.0_pre6-r1.ebuild 18387
+MD5 1e308403b430c0c4ab646b4bab3a80da mplayer-1.0_pre6-r3.ebuild 18416
+MD5 7e1774c6cb20d72b0fc2aa3421587987 ChangeLog 54603
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
+MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
 MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
-MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
-MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
-MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
-MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
-MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
-MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r1 429
-MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
-MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
+MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
 MD5 a8ffa5151727e9dd008d95a6553948bb files/mplayer-gcc_detection.patch 780
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r2 429
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593
 MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
+MD5 443b9526abb33e4e9f8786f764253b53 files/mplayer-1.0_pre5-gcc_detection.patch 445
+MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
+MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
+MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r1 429
+MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r2 429
+MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r3 429
+MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593
+MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCYRbh06ebR+OMO78RAv//AKCILM9uU07yyzADeWZcTT4tHFGgFQCdE/UH
+Lh5ggy4gd/M3tY0Nr/nMwkY=
+=EOCE
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/mmst_fix_20050415.diff b/media-video/mplayer/files/mmst_fix_20050415.diff
new file mode 100644
index 000000000000..43f4c5c1919a
--- /dev/null
+++ b/media-video/mplayer/files/mmst_fix_20050415.diff
@@ -0,0 +1,16 @@
+diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c
+--- MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c	2004-12-15 22:18:31.000000000 +0100
++++ MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c	2005-04-16 09:43:16.000000000 +0200
+@@ -334,8 +334,12 @@
+ 
+       printf ("stream object, stream id: %d\n", stream_id);
+ 
++      if (num_stream_ids < 20) {
+       stream_ids[num_stream_ids] = stream_id;
+       num_stream_ids++;
++      } else {
++        printf ("too many id, stream skipped");
++      }
+       
+     } else {
+       printf ("unknown object\n");
diff --git a/media-video/mplayer/files/rtsp_fix_20050415.diff b/media-video/mplayer/files/rtsp_fix_20050415.diff
new file mode 100644
index 000000000000..229157818284
--- /dev/null
+++ b/media-video/mplayer/files/rtsp_fix_20050415.diff
@@ -0,0 +1,20 @@
+diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c
+--- MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c	2004-06-26 12:38:26.000000000 +0200
++++ MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c	2005-04-16 09:41:22.000000000 +0200
+@@ -397,6 +397,7 @@
+   unsigned int answer_seq;
+   char **answer_ptr=s->answers;
+   int code;
++  int ans_count = 0;
+   
+   answer=rtsp_get(s);
+   if (!answer)
+@@ -448,7 +449,7 @@
+     }
+     *answer_ptr=answer;
+     answer_ptr++;
+-  } while (strlen(answer)!=0);
++  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
+   
+   s->cseq++;
+   
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 574336c37a69..d9df1878d8e2 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
index cbd4415ce882..a053a3d996df 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.8 2005/04/16 10:05:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.9 2005/04/16 13:44:48 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -194,6 +194,11 @@ src_unpack() {
 	# the end anymore ) and add 3gp (nokia) video codec support
 	# per bug #85642
 	epatch ${FILESDIR}/${P}-codecs.patch
+
+	# two security fixes, see #89277
+	epatch ${FILESDIR}/rtsp_fix_20050415.diff
+	epatch ${FILESDIR}/mmst_fix_20050415.diff
+
 }
 
 linguas_warn() {
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
index 8e4791730c1d..7af1a6f2cc54 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.8 2005/04/16 10:05:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.9 2005/04/16 13:44:48 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -194,6 +194,10 @@ src_unpack() {
 	# the end anymore ) and add 3gp (nokia) video codec support
 	# per bug #85642
 	epatch ${FILESDIR}/${P}-codecs.patch
+
+	# two security fixes, see #89277
+	epatch ${FILESDIR}/rtsp_fix_20050415.diff
+	epatch ${FILESDIR}/mmst_fix_20050415.diff
 }
 
 linguas_warn() {
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
index ffa97cdc334c..aec8eac43ae3 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild,v 1.2 2005/04/16 10:05:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild,v 1.3 2005/04/16 13:44:48 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -194,6 +194,10 @@ src_unpack() {
 	# the end anymore ) and add 3gp (nokia) video codec support
 	# per bug #85642
 	epatch ${FILESDIR}/${P}-codecs.patch
+
+	# two security fixes, see #89277
+	epatch ${FILESDIR}/rtsp_fix_20050415.diff
+	epatch ${FILESDIR}/mmst_fix_20050415.diff
 }
 
 linguas_warn() {