diff options
| author | wiz <wiz@pkgsrc.org> | 2007-02-18 00:55:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-02-18 00:55:06 +0000 |
| commit | 83a34869e4748f6a53298ae735dfd924b75ada4c (patch) | |
| tree | 14d1697c1ea6523653ee87a9a7f3332b58d33e69 /audio | |
| parent | 4fffe53d6a6196e46b6ae21f56740db9b3570113 (diff) | |
| download | pkgsrc-83a34869e4748f6a53298ae735dfd924b75ada4c.tar.gz | |
Add fix for CVE-2006-6979 from SVN.
Bump PKGREVISION.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/amarok/Makefile | 4 | ||||
| -rw-r--r-- | audio/amarok/distinfo | 3 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-aa | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 6cbfefad4f1..06f3d8be44b 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2007/02/09 20:32:38 drochner Exp $ +# $NetBSD: Makefile,v 1.56 2007/02/18 00:55:06 wiz Exp $ DISTNAME= amarok-1.4.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE:=amarok/1.4.5/src/} EXTRACT_SUFX= .tar.bz2 diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 93df12ab264..4de9cf34291 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.27 2007/02/15 08:30:15 xtraeme Exp $ +$NetBSD: distinfo,v 1.28 2007/02/18 00:55:06 wiz Exp $ SHA1 (amarok-1.4.5.tar.bz2) = 882dec8d30c10f609a1f5e21d2e91342e78304c5 RMD160 (amarok-1.4.5.tar.bz2) = c2bbfe06f3e613dfc7d3926d086024073390c712 Size (amarok-1.4.5.tar.bz2) = 18034110 bytes +SHA1 (patch-aa) = 0b63ca0e118581b820db1c6e5aaeecabe554495b SHA1 (patch-ab) = a36c9ca68810c71a95857249b63ff19d4b3f3fbb diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa new file mode 100644 index 00000000000..b8133a42c29 --- /dev/null +++ b/audio/amarok/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.10 2007/02/18 00:55:06 wiz Exp $ + +Fix for CVE-2006-6979 based on http://bugs.kde.org/show_bug.cgi?id=138499 +(without the whitespace changes). + +--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp.orig 2007-02-01 18:14:17.000000000 +0000 ++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp +@@ -89,7 +89,7 @@ void MagnatuneAlbumDownloader::albumDown + + //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection. + +- QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &"; ++ QString unzipString = "unzip " + KProcess::quote( m_tempDir.name() + m_currentAlbumFileName ) + " -d " + KProcess::quote( m_currentAlbumUnpackLocation ) + " &"; + + debug() << "unpacking: " << unzipString << endl; + |