diff options
| author | drochner <drochner@pkgsrc.org> | 2011-01-31 16:47:56 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-01-31 16:47:56 +0000 |
| commit | 5823b88a8dd1ae640bb32ccee52f448f4ed4f944 (patch) | |
| tree | fe4d691c9d8975f96cc4d2e5b2ff7f768f6fffb0 /multimedia | |
| parent | 0f1df53aea1514e7df92091105e04bbdf2d95425 (diff) | |
| download | pkgsrc-5823b88a8dd1ae640bb32ccee52f448f4ed4f944.tar.gz | |
add patch from upstream to fix an MKV input validation bug possibly
leading to execution of arbitrary code
bump PKGREV
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-au | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index bcee66eb5fc..e51a4ffda77 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.105 2011/01/26 19:34:48 abs Exp $ +# $NetBSD: Makefile,v 1.106 2011/01/31 16:47:56 drochner Exp $ # DISTNAME= vlc-${VLC_VERSION} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index ee6a3cfed48..15796220ef1 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2011/01/24 18:54:04 drochner Exp $ +$NetBSD: distinfo,v 1.40 2011/01/31 16:47:56 drochner Exp $ SHA1 (vlc-1.1.6.tar.bz2) = 4cb4014d116493cc7d1b09622d0458121c14ce73 RMD160 (vlc-1.1.6.tar.bz2) = 537b264745ee8b9f803a6b62ea5d49b66e11d8b5 @@ -9,4 +9,5 @@ SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868 SHA1 (patch-ar) = 25d22167cef8b8fa2a07ef633de196726eb354d2 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930 +SHA1 (patch-au) = fd291a0c24dc93ccfc29bfa49197dada76cb781b SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52 diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au new file mode 100644 index 00000000000..76662b770a1 --- /dev/null +++ b/multimedia/vlc/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1 2011/01/31 16:47:56 drochner Exp $ + +--- modules/demux/mkv/mkv.hpp.orig 2010-05-21 08:48:24.000000000 +0000 ++++ modules/demux/mkv/mkv.hpp +@@ -119,7 +119,7 @@ extern "C" { + + #define MKVD_TIMECODESCALE 1000000 + +-#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) ++#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) ) + + + using namespace LIBMATROSKA_NAMESPACE; |