rpms/amarok/devel amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.74, 1.75
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Thu Feb 15 06:22:01 UTC 2007
- Previous message: rpms/amarok/FC-6 amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.72, 1.73
- Next message: rpms/libtomoe-gtk/devel .cvsignore, 1.2, 1.3 libtomoe-gtk.spec, 1.10, 1.11 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: abompard
Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/devel
Modified Files:
amarok-1.4.5-CVE-2006-6979.patch amarok.spec
Log Message:
fix patch (provided by upstream)
amarok-1.4.5-CVE-2006-6979.patch:
Index: amarok-1.4.5-CVE-2006-6979.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4.5-CVE-2006-6979.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4.5-CVE-2006-6979.patch 14 Feb 2007 19:13:24 -0000 1.1
+++ amarok-1.4.5-CVE-2006-6979.patch 15 Feb 2007 06:21:29 -0000 1.2
@@ -1,13 +1,28 @@
-Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
+Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
===================================================================
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633106)
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (working copy)
-@@ -89,7 +89,7 @@
+--- 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 = KProcess::quote( "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() );
+
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- amarok.spec 14 Feb 2007 19:13:24 -0000 1.74
+++ amarok.spec 15 Feb 2007 06:21:29 -0000 1.75
@@ -4,7 +4,7 @@
Name: amarok
Summary: Media player for KDE
Version: 1.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPL
@@ -235,6 +235,9 @@
%changelog
+* Thu Feb 15 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-3
+- fix patch (provided by upstream)
+
* Wed Feb 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-2
- add patch to fix CVE-2006-6979 (bug 228138)
- Previous message: rpms/amarok/FC-6 amarok-1.4.5-CVE-2006-6979.patch, 1.1, 1.2 amarok.spec, 1.72, 1.73
- Next message: rpms/libtomoe-gtk/devel .cvsignore, 1.2, 1.3 libtomoe-gtk.spec, 1.10, 1.11 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list