Author: neoclust
Date: Fri Feb 16 07:44:48 2007
New Revision: 121593
Added:
packages/cooker/amarok/current/SOURCES/amarok-1.4.5-CVE-2006-6979.patch
Removed:
packages/cooker/amarok/current/SOURCES/amarok-1.4.3-remove-debug.patch
packages/cooker/amarok/current/SOURCES/amarok-1.4.4-fix-build-against-new-libgpod.patch
packages/cooker/amarok/current/SOURCES/amarok-1.4.4-fix-build-against-new-libmtp.patch
packages/cooker/amarok/current/SOURCES/amarok-1.4.4-invoke-browser.patch
packages/cooker/amarok/current/SOURCES/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
packages/cooker/amarok/current/SOURCES/amarok-1.4.4-sparc-asm.patch
packages/cooker/amarok/current/SOURCES/magnatune2.diff
Modified:
packages/cooker/amarok/current/SPECS/amarok.spec
Log:
SILENT: Use a more visible name for patch 5
Added: packages/cooker/amarok/current/SOURCES/amarok-1.4.5-CVE-2006-6979.patch
==============================================================================
--- (empty file)
+++ packages/cooker/amarok/current/SOURCES/amarok-1.4.5-CVE-2006-6979.patch
Fri Feb 16 07:44:48 2007
@@ -0,0 +1,28 @@
+Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
+===================================================================
+--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision
633659)
++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision
633677)
+@@ -89,19 +89,19 @@
+
+ //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() );
+
+-
+
++
+ if (m_currentAlbumId != -1 ) {
+
+- //now I really want to add the album cover to the same folder where I
just unzipped the album... The
++ //now I really want to add the album cover to the same folder where I
just unzipped the album... The
+ //only way of getting the actual location where the album was
unpacked is using the artist and album names
+-
++
+ MagnatuneAlbum album =
MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId );
+ MagnatuneArtist artist =
MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() );
+
Modified: packages/cooker/amarok/current/SPECS/amarok.spec
==============================================================================
--- packages/cooker/amarok/current/SPECS/amarok.spec (original)
+++ packages/cooker/amarok/current/SPECS/amarok.spec Fri Feb 16 07:44:48 2007
@@ -38,7 +38,7 @@
#(nl): Disable for the moment as it had been reported that this patch is
broken.
Patch4: amarok-1.4.0-use-mandriva-directory.patch
Patch6: amarok-add-radios.patch
-Patch7: magnatune2.diff
+Patch7: amarok-1.4.5-CVE-2006-6979.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: libtaglib-devel >= 1.4
BuildRequires: kdemultimedia-devel
@@ -276,7 +276,7 @@
%patch3 -p1 -b .fix_add_multimedia_shortcut
#%patch4 -p0 -b .use_mandriva_music_directory
%patch6 -p0 -b .add_some_radios
-%patch7 -p0 -b .fix_magnatune
+%patch7 -p0 -b .CVE-2006-6979
%build
export QTDIR=%_prefix/lib/qt3
