Fri Aug 14 15:39:37 2009 UTC ()
Pullup ticket #2862 - requested by kefren
mplayer: security patch

Revisions pulled up:
- multimedia/mplayer-share/distinfo		1.61-1.62
- multimedia/mplayer-share/patches/patch-ar	1.1-1.2
- multimedia/mplayer/Makefile			1.67
---
Module Name:	pkgsrc
Committed By:	kefren
Date:		Sun Aug  9 12:56:11 UTC 2009

Modified Files:
	pkgsrc/multimedia/mplayer: Makefile
	pkgsrc/multimedia/mplayer-share: distinfo
Added Files:
	pkgsrc/multimedia/mplayer-share/patches: patch-ar

Log Message:
add fix for SA26157. Bump PKGREVISION
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Aug  9 19:20:50 UTC 2009

Modified Files:
	pkgsrc/multimedia/mplayer-share: distinfo
	pkgsrc/multimedia/mplayer-share/patches: patch-ar

Log Message:
Add RCS Id and comment.


(tron)
diff -r1.66 -r1.66.4.1 pkgsrc/multimedia/mplayer/Makefile
diff -r1.60 -r1.60.4.1 pkgsrc/multimedia/mplayer-share/distinfo
diff -r0 -r1.2.2.2 pkgsrc/multimedia/mplayer-share/patches/patch-ar
cvs diff -r1.66 -r1.66.4.1 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2009/02/02 19:20:48 1.66
+++ pkgsrc/multimedia/mplayer/Makefile 2009/08/14 15:39:36 1.66.4.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.66 2009/02/02 19:20:48 drochner Exp $ 1# $NetBSD: Makefile,v 1.66.4.1 2009/08/14 15:39:36 tron Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_PKG_VERSION} 3PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
4PKGREVISION= 13 4PKGREVISION= 14
5 5
6COMMENT= Software-only MPEG-1/2/4 video decoder 6COMMENT= Software-only MPEG-1/2/4 video decoder
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../multimedia/mplayer-share/Makefile.common" 10.include "../../multimedia/mplayer-share/Makefile.common"
11 11
12USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
13 13
14CONFIGURE_ARGS+= --disable-mencoder 14CONFIGURE_ARGS+= --disable-mencoder
15CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 15CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
16 16
17# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not 17# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
cvs diff -r1.60 -r1.60.4.1 pkgsrc/multimedia/mplayer-share/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/distinfo 2009/03/06 01:33:12 1.60
+++ pkgsrc/multimedia/mplayer-share/distinfo 2009/08/14 15:39:36 1.60.4.1
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1$NetBSD: distinfo,v 1.60 2009/03/06 01:33:12 jmcneill Exp $ 1$NetBSD: distinfo,v 1.60.4.1 2009/08/14 15:39:36 tron Exp $
2 2
3SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d 3SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
4RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52 4RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
5Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes 5Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
6SHA1 (patch-aa) = ebcbff0b8d0914aaaf89d8388bc9e04229680658 6SHA1 (patch-aa) = ebcbff0b8d0914aaaf89d8388bc9e04229680658
7SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 7SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
8SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 8SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
9SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5 9SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
10SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9 10SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9
11SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5 11SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5
12SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00 12SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00
13SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b 13SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
14SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988 14SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988
15SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527 15SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527
16SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58 16SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58
17SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d 17SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d
18SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e 18SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e
19SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73 19SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73
20SHA1 (patch-ao) = ddd85a9bfda237ea923faf0c3677b5e14cff4e0d 20SHA1 (patch-ao) = ddd85a9bfda237ea923faf0c3677b5e14cff4e0d
21SHA1 (patch-ap) = 83777bac06190f71078435721ad2f7055689f64f 21SHA1 (patch-ap) = 83777bac06190f71078435721ad2f7055689f64f
22SHA1 (patch-aq) = 8d77f3fbe5796707f591e0890b54b9f34f649709 22SHA1 (patch-aq) = 8d77f3fbe5796707f591e0890b54b9f34f649709
 23SHA1 (patch-ar) = 1f1b661b3395453200bc313da4df5af8d9e09009
23SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e 24SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e
24SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057 25SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
25SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d 26SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
26SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3 27SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3
27SHA1 (patch-be) = d9b0573c9ea9767bed7d9b3f29cd07cc31c37519 28SHA1 (patch-be) = d9b0573c9ea9767bed7d9b3f29cd07cc31c37519
28SHA1 (patch-ca) = 68603a92b3dd8c7a33e6bc982f8ced1219fa419d 29SHA1 (patch-ca) = 68603a92b3dd8c7a33e6bc982f8ced1219fa419d
29SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038 30SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
30SHA1 (patch-va) = db69c373e78048924c536055c68c7de0feabc623 31SHA1 (patch-va) = db69c373e78048924c536055c68c7de0feabc623
31SHA1 (patch-vb) = 28b1dd82fb61a4fc0be4a4f4599f75823cae5f11 32SHA1 (patch-vb) = 28b1dd82fb61a4fc0be4a4f4599f75823cae5f11
File Added: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ar
$NetBSD$

Fix for SA26157.

--- stream/realrtsp/real.c.orig	2009-08-09 15:48:11.000000000 +0300
+++ stream/realrtsp/real.c	2009-08-09 15:51:10.000000000 +0300
@@ -376,7 +376,10 @@
           ts, size, flags1, unknown1, header[4], header[5]);
 #endif
   size+=2;
-  
+ 
+  if (size < 12)
+	return 0;
+
   ph.object_version=0;
   ph.length=size;
   ph.stream_number=(flags1>>1)&0x1f;