Pullup ticket 451 - requested by Matthias Drochner

security fix for mplayer

Revisions pulled up:
- pkgsrc/multimedia/gmplayer/Makefile			1.30, 1.32
- pkgsrc/multimedia/gmplayer/distinfo			1.24-1.25
- pkgsrc/multimedia/mencoder/Makefile			1.18
- pkgsrc/multimedia/mplayer/Makefile			1.16
- pkgsrc/multimedia/mplayer-share/distinfo		1.18
- pkgsrc/multimedia/mplayer-share/patches/patch-ba	1.3
- pkgsrc/multimedia/mplayer-share/patches/patch-bb	1.3

   Module Name:		pkgsrc
   Committed By:	abs
   Date:		Sat Apr  9 11:19:32 UTC 2005

   Modified Files:
   	pkgsrc/multimedia/gmplayer: Makefile distinfo

   Log Message:
   Update gmplayer to 1.0rc6nb2:
       Change DIST_SUBDIR - skins have been updated on master site again
---
   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Sat Apr 16 17:43:09 UTC 2005

   Modified Files:
   	pkgsrc/multimedia/gmplayer: Makefile distinfo
   	pkgsrc/multimedia/mencoder: Makefile
   	pkgsrc/multimedia/mplayer: Makefile
   	pkgsrc/multimedia/mplayer-share: distinfo
   Added Files:
   	pkgsrc/multimedia/mplayer-share/patches: patch-ba patch-bb

   Log Message:
   two security patches: Real RTSP heap overflow, MMST heap overflow
   (both patches published on the mplayer website)
   bump PKGREVISION of affected pkgs

2 files changed, 69 insertions, 66 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index a9594260107..2b3eeacbe46 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/03/02 06:19:28 minskim Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2005/04/21 15:20:40 salo Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,6 +9,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION=	3
 
 SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 		ftp://ftp.mplayerhq.hu/MPlayer/Skin/		\
@@ -50,7 +51,7 @@ SITES_${skin}= ${SKIN_SITES}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
 DISTINFO_FILE=	${.CURDIR}/distinfo
-DIST_SUBDIR=	${PKGNAME_NOREV}-20050302
+DIST_SUBDIR=	${PKGNAME_NOREV}-20050409
 
 USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 6dcd11cb9f9..32a69e3aea1 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,70 +1,72 @@
-$NetBSD: distinfo,v 1.23 2005/03/02 06:19:28 minskim Exp $
+$NetBSD: distinfo,v 1.23.2.1 2005/04/21 15:20:40 salo Exp $
 
-SHA1 (gmplayer-1.0rc6-20050302/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
-RMD160 (gmplayer-1.0rc6-20050302/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
-Size (gmplayer-1.0rc6-20050302/MPlayer-1.0pre6a.tar.bz2) = 6380482 bytes
-SHA1 (gmplayer-1.0rc6-20050302/AlienMind-1.2.tar.bz2) = f082caed6c8742af5b4b0c8cac78674212e60ff7
-RMD160 (gmplayer-1.0rc6-20050302/AlienMind-1.2.tar.bz2) = c031780f4abb72308f78438166029cc70df0f86b
-Size (gmplayer-1.0rc6-20050302/AlienMind-1.2.tar.bz2) = 131295 bytes
-SHA1 (gmplayer-1.0rc6-20050302/Blue-1.4.tar.bz2) = 0527436ca803a77b0ac275609781f7b50abfc707
-RMD160 (gmplayer-1.0rc6-20050302/Blue-1.4.tar.bz2) = 5f1c409a73c7c0a9bc5d0b4a42c23216a8e05d3d
-Size (gmplayer-1.0rc6-20050302/Blue-1.4.tar.bz2) = 221733 bytes
-SHA1 (gmplayer-1.0rc6-20050302/BlueHeart-1.5.tar.bz2) = 3f08a30c88616c086224c77d8cd7fca16c3fdc9d
-RMD160 (gmplayer-1.0rc6-20050302/BlueHeart-1.5.tar.bz2) = fc7c5e6974017135d9434c0a6457dcf9edaf3bb3
-Size (gmplayer-1.0rc6-20050302/BlueHeart-1.5.tar.bz2) = 281101 bytes
-SHA1 (gmplayer-1.0rc6-20050302/CornerMP-1.2.tar.bz2) = a28b247111eac0098d3a316478c3c939a2519375
-RMD160 (gmplayer-1.0rc6-20050302/CornerMP-1.2.tar.bz2) = 69c16b714e7207c9cfecc27037572d4462ab0df2
-Size (gmplayer-1.0rc6-20050302/CornerMP-1.2.tar.bz2) = 232681 bytes
-SHA1 (gmplayer-1.0rc6-20050302/CornerMP-aqua-1.4.tar.bz2) = 4902570930ee37c1a86e001aa5e9cb4f2e499d13
-RMD160 (gmplayer-1.0rc6-20050302/CornerMP-aqua-1.4.tar.bz2) = 4f52fed98d10d263b1391370f3a87326013d2ac6
-Size (gmplayer-1.0rc6-20050302/CornerMP-aqua-1.4.tar.bz2) = 243255 bytes
-SHA1 (gmplayer-1.0rc6-20050302/Cyrus-1.2.tar.bz2) = 29771b06fec0dca96f767d8aac41d14cf085dd82
-RMD160 (gmplayer-1.0rc6-20050302/Cyrus-1.2.tar.bz2) = 84e672524e86baa1f8cdd0b66883682ff0c3f257
-Size (gmplayer-1.0rc6-20050302/Cyrus-1.2.tar.bz2) = 228516 bytes
-SHA1 (gmplayer-1.0rc6-20050302/MidnightLove-1.6.tar.bz2) = 1a335e68359730f8f706727cefb773fc17373bf8
-RMD160 (gmplayer-1.0rc6-20050302/MidnightLove-1.6.tar.bz2) = 272b9776107e22ffa6ea05438c36d21ab196b366
-Size (gmplayer-1.0rc6-20050302/MidnightLove-1.6.tar.bz2) = 539603 bytes
-SHA1 (gmplayer-1.0rc6-20050302/WMP6-2.2.tar.bz2) = e1b05883086c7438aaf31f22958f1660b003c8e9
-RMD160 (gmplayer-1.0rc6-20050302/WMP6-2.2.tar.bz2) = b549e28e3e4dc71ec390f0b5064987cc5f64d840
-Size (gmplayer-1.0rc6-20050302/WMP6-2.2.tar.bz2) = 39330 bytes
-SHA1 (gmplayer-1.0rc6-20050302/avifile-1.6.tar.bz2) = ba63af461add76e445e51dccc30cfd8052c373a8
-RMD160 (gmplayer-1.0rc6-20050302/avifile-1.6.tar.bz2) = 43bd0813a493549914207aeccc7027b9e6726aef
-Size (gmplayer-1.0rc6-20050302/avifile-1.6.tar.bz2) = 42452 bytes
-SHA1 (gmplayer-1.0rc6-20050302/gnome-1.1.tar.bz2) = 49faf3c29fc699457b858f54e3b9a9a988c7ec0e
-RMD160 (gmplayer-1.0rc6-20050302/gnome-1.1.tar.bz2) = d909920f7d7537e15b0243d2c87a67f0f1e8717d
-Size (gmplayer-1.0rc6-20050302/gnome-1.1.tar.bz2) = 368717 bytes
-SHA1 (gmplayer-1.0rc6-20050302/hayraphon-1.0.tar.bz2) = 55ada2a682672ffdc163ea1afb6cbc4b833fee85
-RMD160 (gmplayer-1.0rc6-20050302/hayraphon-1.0.tar.bz2) = 327a532d818ce6f1507cf1cb2e99de482c471a69
-Size (gmplayer-1.0rc6-20050302/hayraphon-1.0.tar.bz2) = 77659 bytes
-SHA1 (gmplayer-1.0rc6-20050302/hwswskin-1.1.tar.bz2) = d3346b61fa0fb169eeae235c46217d421084706e
-RMD160 (gmplayer-1.0rc6-20050302/hwswskin-1.1.tar.bz2) = 62da5eee8c8c82a5fc7dd039c23d94bd6073d018
-Size (gmplayer-1.0rc6-20050302/hwswskin-1.1.tar.bz2) = 20384 bytes
-SHA1 (gmplayer-1.0rc6-20050302/mentalic-1.2.tar.bz2) = 615324be1ac6e8a4cf5666582372391f8c0228dd
-RMD160 (gmplayer-1.0rc6-20050302/mentalic-1.2.tar.bz2) = 90f9e54bee3522fa33a74477bdd21dc0931b5c0a
-Size (gmplayer-1.0rc6-20050302/mentalic-1.2.tar.bz2) = 166628 bytes
-SHA1 (gmplayer-1.0rc6-20050302/neutron-1.5.tar.bz2) = 23901025e793f14654d9ed15f7370a5b3793b6d3
-RMD160 (gmplayer-1.0rc6-20050302/neutron-1.5.tar.bz2) = 60a8515891fb61859f5672df57746946ea5c8378
-Size (gmplayer-1.0rc6-20050302/neutron-1.5.tar.bz2) = 369345 bytes
-SHA1 (gmplayer-1.0rc6-20050302/phony-1.1.tar.bz2) = d06354808aa21c212232364c86ffee0d3b9c64ed
-RMD160 (gmplayer-1.0rc6-20050302/phony-1.1.tar.bz2) = a5996929a2e4690a7882fd1227c861bcaa94be8e
-Size (gmplayer-1.0rc6-20050302/phony-1.1.tar.bz2) = 386444 bytes
-SHA1 (gmplayer-1.0rc6-20050302/plastic-1.2.tar.bz2) = e1689dd999521d0ef43af692e2a5ba511b9c95c0
-RMD160 (gmplayer-1.0rc6-20050302/plastic-1.2.tar.bz2) = 2701aa6eeca58d99b39f43e16757b7eb601fbf81
-Size (gmplayer-1.0rc6-20050302/plastic-1.2.tar.bz2) = 454178 bytes
-SHA1 (gmplayer-1.0rc6-20050302/proton-1.2.tar.bz2) = 7004a56b37df6060cb406514bb693e52ba345388
-RMD160 (gmplayer-1.0rc6-20050302/proton-1.2.tar.bz2) = 13a534e33a429bf055f58ed99ac7c299d5dcc363
-Size (gmplayer-1.0rc6-20050302/proton-1.2.tar.bz2) = 322672 bytes
-SHA1 (gmplayer-1.0rc6-20050302/slim-1.2.tar.bz2) = 8442363902d0ea4d927c58f1fc7e08faf7abfb55
-RMD160 (gmplayer-1.0rc6-20050302/slim-1.2.tar.bz2) = ed9563e44860601c26cab017faa83b088a9cd205
-Size (gmplayer-1.0rc6-20050302/slim-1.2.tar.bz2) = 398984 bytes
-SHA1 (gmplayer-1.0rc6-20050302/xanim-1.6.tar.bz2) = 3dc148eeed4e7012f8f7e7406e0c74dd0076cb1e
-RMD160 (gmplayer-1.0rc6-20050302/xanim-1.6.tar.bz2) = 9bb96545f492aedef85abdb86dd9da74a04d324b
-Size (gmplayer-1.0rc6-20050302/xanim-1.6.tar.bz2) = 94564 bytes
-SHA1 (gmplayer-1.0rc6-20050302/xine-lcd-1.2.tar.bz2) = 0cb96798e0e1783ad5c9028be5194c621a8e50d2
-RMD160 (gmplayer-1.0rc6-20050302/xine-lcd-1.2.tar.bz2) = 1b2b72ebfde311f4af6ce8d5de35f76f7965da2f
-Size (gmplayer-1.0rc6-20050302/xine-lcd-1.2.tar.bz2) = 172356 bytes
+SHA1 (gmplayer-1.0rc6-20050409/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
+RMD160 (gmplayer-1.0rc6-20050409/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
+Size (gmplayer-1.0rc6-20050409/MPlayer-1.0pre6a.tar.bz2) = 6380482 bytes
+SHA1 (gmplayer-1.0rc6-20050409/AlienMind-1.2.tar.bz2) = 5e2cab3f22150e401db08e959581cd2093e803c6
+RMD160 (gmplayer-1.0rc6-20050409/AlienMind-1.2.tar.bz2) = 8c526153ba2894c0e6c9baab3e214bab67aaa3e7
+Size (gmplayer-1.0rc6-20050409/AlienMind-1.2.tar.bz2) = 131339 bytes
+SHA1 (gmplayer-1.0rc6-20050409/Blue-1.4.tar.bz2) = 35a4f687d5f70565d066c9b9cadf5cb60273a0ed
+RMD160 (gmplayer-1.0rc6-20050409/Blue-1.4.tar.bz2) = 83c7d62f8d3e96d59876cc1a2e544005e5d6f159
+Size (gmplayer-1.0rc6-20050409/Blue-1.4.tar.bz2) = 221764 bytes
+SHA1 (gmplayer-1.0rc6-20050409/BlueHeart-1.5.tar.bz2) = 2438d2af2102caeccefbf66af871a348c9575a85
+RMD160 (gmplayer-1.0rc6-20050409/BlueHeart-1.5.tar.bz2) = 8a53660718ae00cc841042824e984e14ea2b747b
+Size (gmplayer-1.0rc6-20050409/BlueHeart-1.5.tar.bz2) = 281119 bytes
+SHA1 (gmplayer-1.0rc6-20050409/CornerMP-1.2.tar.bz2) = c448fae0d02ffac9aa4c212af8defc858990864f
+RMD160 (gmplayer-1.0rc6-20050409/CornerMP-1.2.tar.bz2) = 040910749ca16b7b775f6b8aee1057826c02362a
+Size (gmplayer-1.0rc6-20050409/CornerMP-1.2.tar.bz2) = 232716 bytes
+SHA1 (gmplayer-1.0rc6-20050409/CornerMP-aqua-1.4.tar.bz2) = 1a307da65b56c0755cdfd6752383a6fdfdd2d72a
+RMD160 (gmplayer-1.0rc6-20050409/CornerMP-aqua-1.4.tar.bz2) = 13a237f796376a14babe50ac349e68885a6f93f3
+Size (gmplayer-1.0rc6-20050409/CornerMP-aqua-1.4.tar.bz2) = 243178 bytes
+SHA1 (gmplayer-1.0rc6-20050409/Cyrus-1.2.tar.bz2) = 80a7b341529f6baa228c34b38911d2691208b6bd
+RMD160 (gmplayer-1.0rc6-20050409/Cyrus-1.2.tar.bz2) = 1e07b9490a55bd26cc7e9de324b014e743fe1c97
+Size (gmplayer-1.0rc6-20050409/Cyrus-1.2.tar.bz2) = 228506 bytes
+SHA1 (gmplayer-1.0rc6-20050409/MidnightLove-1.6.tar.bz2) = 1612eb15d1fd68e2cb47a2690b0c13515c7a145f
+RMD160 (gmplayer-1.0rc6-20050409/MidnightLove-1.6.tar.bz2) = 3e1b40fb62bf2b1e2700836dcf9513ec26d24192
+Size (gmplayer-1.0rc6-20050409/MidnightLove-1.6.tar.bz2) = 539590 bytes
+SHA1 (gmplayer-1.0rc6-20050409/WMP6-2.2.tar.bz2) = f9dcd52ba1f8420d1249f4151079b47c8aa41eef
+RMD160 (gmplayer-1.0rc6-20050409/WMP6-2.2.tar.bz2) = b07b14b8079550b930fc2cdc488c77e58ef32a00
+Size (gmplayer-1.0rc6-20050409/WMP6-2.2.tar.bz2) = 39344 bytes
+SHA1 (gmplayer-1.0rc6-20050409/avifile-1.6.tar.bz2) = c839506a840b3ff10cd00a787a344504e78a5006
+RMD160 (gmplayer-1.0rc6-20050409/avifile-1.6.tar.bz2) = e02d945059d1cebebdcf0dd74da6b6bc8396e3d8
+Size (gmplayer-1.0rc6-20050409/avifile-1.6.tar.bz2) = 42452 bytes
+SHA1 (gmplayer-1.0rc6-20050409/gnome-1.1.tar.bz2) = 4763acd5a90ba29ac0d6d2b8331ce184c30b6a88
+RMD160 (gmplayer-1.0rc6-20050409/gnome-1.1.tar.bz2) = 5c3f9eaca9945f8743e342615e1ed9d439eb191b
+Size (gmplayer-1.0rc6-20050409/gnome-1.1.tar.bz2) = 368743 bytes
+SHA1 (gmplayer-1.0rc6-20050409/hayraphon-1.0.tar.bz2) = f854f4046ec069ec73219decfa2b92a4e1fb7346
+RMD160 (gmplayer-1.0rc6-20050409/hayraphon-1.0.tar.bz2) = b2c0eee0e714c22a3910eaf7e70c59f6e08e4a8a
+Size (gmplayer-1.0rc6-20050409/hayraphon-1.0.tar.bz2) = 77636 bytes
+SHA1 (gmplayer-1.0rc6-20050409/hwswskin-1.1.tar.bz2) = f1e9a037cbaaa0cf34bccd53c22e10a96b4d80bc
+RMD160 (gmplayer-1.0rc6-20050409/hwswskin-1.1.tar.bz2) = 0e4da149a0ee6128da232ce77f4f156329d0839a
+Size (gmplayer-1.0rc6-20050409/hwswskin-1.1.tar.bz2) = 20396 bytes
+SHA1 (gmplayer-1.0rc6-20050409/mentalic-1.2.tar.bz2) = 04215f8aac705c0da435868320efcfcd6b2162b4
+RMD160 (gmplayer-1.0rc6-20050409/mentalic-1.2.tar.bz2) = 2191983bf3a1da841485c66842609137f79cdaea
+Size (gmplayer-1.0rc6-20050409/mentalic-1.2.tar.bz2) = 166602 bytes
+SHA1 (gmplayer-1.0rc6-20050409/neutron-1.5.tar.bz2) = 10b3e7173d9eefb3bbd68b87bdf4c2d5ed186609
+RMD160 (gmplayer-1.0rc6-20050409/neutron-1.5.tar.bz2) = 8c4ad1ebbdb2b43a791de179aa79394f48dfd11b
+Size (gmplayer-1.0rc6-20050409/neutron-1.5.tar.bz2) = 369346 bytes
+SHA1 (gmplayer-1.0rc6-20050409/phony-1.1.tar.bz2) = 84eb32235084930e3f794ee4e494b80a3010c108
+RMD160 (gmplayer-1.0rc6-20050409/phony-1.1.tar.bz2) = 4e7bf56a8f5d686c4a37311cddb67efdd4dae2d8
+Size (gmplayer-1.0rc6-20050409/phony-1.1.tar.bz2) = 386470 bytes
+SHA1 (gmplayer-1.0rc6-20050409/plastic-1.2.tar.bz2) = 59f88489040f32cd8ca8012e0a8f92364fcc5820
+RMD160 (gmplayer-1.0rc6-20050409/plastic-1.2.tar.bz2) = 22e672269a9e270fa422af08f255769b2f14d081
+Size (gmplayer-1.0rc6-20050409/plastic-1.2.tar.bz2) = 454163 bytes
+SHA1 (gmplayer-1.0rc6-20050409/proton-1.2.tar.bz2) = d62b50421e26e1f257e3efabe062700079bc9efd
+RMD160 (gmplayer-1.0rc6-20050409/proton-1.2.tar.bz2) = c1c1aa99dedcc41328133094bfc239d2dbf24b7c
+Size (gmplayer-1.0rc6-20050409/proton-1.2.tar.bz2) = 322593 bytes
+SHA1 (gmplayer-1.0rc6-20050409/slim-1.2.tar.bz2) = 5880c2055b733648a7980dc0d60a5243b8fbda1b
+RMD160 (gmplayer-1.0rc6-20050409/slim-1.2.tar.bz2) = 4e27f4a1d1694a59260e3acaa604fc7edd43c8fd
+Size (gmplayer-1.0rc6-20050409/slim-1.2.tar.bz2) = 399004 bytes
+SHA1 (gmplayer-1.0rc6-20050409/xanim-1.6.tar.bz2) = f5bb045d9ac18808aae63114379a6d80e32f6850
+RMD160 (gmplayer-1.0rc6-20050409/xanim-1.6.tar.bz2) = 0470d3af5b8d7eae36075f0b866bf668f905dd52
+Size (gmplayer-1.0rc6-20050409/xanim-1.6.tar.bz2) = 94541 bytes
+SHA1 (gmplayer-1.0rc6-20050409/xine-lcd-1.2.tar.bz2) = 44524a37835dcd8ed2984166777159ec9b7a8755
+RMD160 (gmplayer-1.0rc6-20050409/xine-lcd-1.2.tar.bz2) = 743397c118ce7bd05c295aab4edca41c3eeed71e
+Size (gmplayer-1.0rc6-20050409/xine-lcd-1.2.tar.bz2) = 172359 bytes
 SHA1 (patch-aa) = 7f0a858c226fb0e1e0382bff4e31817d510ffca1
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = e3b1a98d86f377b84a4f92673f878d287ae5aa6d
+SHA1 (patch-ba) = be78ddba2d58230cf12f186b746d46b01c2836bc
+SHA1 (patch-bb) = 90e635cf521d8ba0f3f4e9dafc1e298abf8e315f