Version bump, adding a patch to fix a possible security flaw in the magnatune store support (KDE BUG #138499). Also add unzip as runtime dependency as it is used for the magnatune shop.

(Portage version: 2.1.2-r9)

7 files changed, 29 insertions, 109 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 860d6ec421d0..4f7d4540d69e 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.205 2007/02/06 21:27:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.206 2007/02/14 20:34:34 flameeyes Exp $
+
+*amarok-1.4.5-r1 (14 Feb 2007)
+
+  14 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.3-playlist-encoding.patch,
+  +files/amarok-1.4.5-magnatune.patch, -amarok-1.4.4-r4.ebuild,
+  -amarok-1.4.5.ebuild, +amarok-1.4.5-r1.ebuild:
+  Version bump, adding a patch to fix a possible security flaw in the
+  magnatune store support (KDE BUG #138499). Also add unzip as runtime
+  dependency as it is used for the magnatune shop.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.5.ebuild:
   Fix dependency for amarok 1.4.5, libgpod 0.4.2 is needed at least.
diff --git a/media-sound/amarok/amarok-1.4.4-r4.ebuild b/media-sound/amarok/amarok-1.4.4-r4.ebuild
deleted file mode 100644
index 3c78cc553612..000000000000
--- a/media-sound/amarok/amarok-1.4.4-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r4.ebuild,v 1.3 2007/02/04 20:04:23 mabi Exp $
-
-LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it
-ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg
-th tr uk uz zh_CN zh_TW"
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde eutils flag-o-matic
-
-PKG_SUFFIX=""
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${P/_/-}"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="aac kde mysql noamazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( dev-db/libpq )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.3 )
-	aac? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	www-servers/mongrel"
-
-need-kde 3.3
-
-PATCHES="${WORKDIR}/${P}-gentoo/*.patch
-	${FILESDIR}/${P}+libgpod-0.4.0.patch"
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) --without-xmms
-				  $(use_with visualization libvisual)
-				  $(use_enable !noamazon amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with aac mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-}
diff --git a/media-sound/amarok/amarok-1.4.5.ebuild b/media-sound/amarok/amarok-1.4.5-r1.ebuild
index 061ab53d8b35..63d55fdeb76b 100644
--- a/media-sound/amarok/amarok-1.4.5.ebuild
+++ b/media-sound/amarok/amarok-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.5.ebuild,v 1.4 2007/02/06 21:27:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.5-r1.ebuild,v 1.1 2007/02/14 20:34:34 flameeyes Exp $
 
 LANGS="af ar az bg br ca cs cy da de el en_GB es et fa fi fr ga gl he
 hi hu is it ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw se sk
@@ -48,8 +48,11 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 DEPEND="${RDEPEND}"
 
 RDEPEND="${RDEPEND}
+	app-arch/unzip
 	daap? ( www-servers/mongrel )"
 
+PATCHES="${FILESDIR}/${P}-magnatune.patch"
+
 need-kde 3.3
 
 src_compile() {
diff --git a/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch b/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch
deleted file mode 100644
index 301aa8100aaf..000000000000
--- a/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: amarok/src/playlist.cpp
-===================================================================
---- amarok/src/playlist.cpp	(Revision 583705)
-+++ amarok/src/playlist.cpp	(Revision 583706)
-@@ -3188,6 +3188,7 @@
-     stream << "</playlist>\n";
- 
-     QTextStream fstream( &file );
-+    fstream.setEncoding( QTextStream::UnicodeUTF8 );
-     fstream << buffer;
- }
- 
diff --git a/media-sound/amarok/files/amarok-1.4.5-magnatune.patch b/media-sound/amarok/files/amarok-1.4.5-magnatune.patch
new file mode 100644
index 000000000000..a4890d0e32f5
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.5-magnatune.patch
@@ -0,0 +1,14 @@
+Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
+===================================================================
+--- src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633568)
++++ src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633677)
+@@ -89,8 +89,8 @@
+ 
+     //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;
+ 
+     system( unzipString.ascii() );
diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r4 b/media-sound/amarok/files/digest-amarok-1.4.4-r4
deleted file mode 100644
index 262445ff5727..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4.4-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1eb17420bc9036303958da5a2567e611 amarok-1.4.4-gentoo.tar.bz2 2830
-RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 amarok-1.4.4-gentoo.tar.bz2 2830
-SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33 amarok-1.4.4-gentoo.tar.bz2 2830
-MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707
-RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707
-SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707
diff --git a/media-sound/amarok/files/digest-amarok-1.4.5 b/media-sound/amarok/files/digest-amarok-1.4.5-r1
index d3825a8bef40..d3825a8bef40 100644
--- a/media-sound/amarok/files/digest-amarok-1.4.5
+++ b/media-sound/amarok/files/digest-amarok-1.4.5-r1