rev 5742 - in people/ana/packages/amarok/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-03-12 08:58:12 +0000 (Mon, 12 Mar 2007)
New Revision: 5742

Added:
   people/ana/packages/amarok/debian/patches/magnatune_CVE-2006-6980.diff
Modified:
   people/ana/packages/amarok/debian/amarok.install
   people/ana/packages/amarok/debian/changelog
   people/ana/packages/amarok/debian/control
   people/ana/packages/amarok/debian/patches/series
Log:
yay, amarok with support for MTP and karma devices.



Modified: people/ana/packages/amarok/debian/amarok.install
===================================================================
--- people/ana/packages/amarok/debian/amarok.install	2007-03-12 08:55:50 UTC (rev 5741)
+++ people/ana/packages/amarok/debian/amarok.install	2007-03-12 08:58:12 UTC (rev 5742)
@@ -57,6 +57,14 @@
 debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.so
 debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop
 
+debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.la
+debian/tmp/usr/lib/kde3/libamarok_riokarma-mediadevice.so
+debian/tmp/usr/share/services/amarok_riokarma-mediadevice.desktop
+
+debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.la
+debian/tmp/usr/lib/kde3/libamarok_mtp-mediadevice.so
+debian/tmp/usr/share/services/amarok_mtp-mediadevice.desktop
+
 debian/tmp/usr/lib/ruby_lib/* 		/usr/lib/ruby_lib/
 debian/tmp/usr/lib/libamarok.*
 

Modified: people/ana/packages/amarok/debian/changelog
===================================================================
--- people/ana/packages/amarok/debian/changelog	2007-03-12 08:55:50 UTC (rev 5741)
+++ people/ana/packages/amarok/debian/changelog	2007-03-12 08:58:12 UTC (rev 5742)
@@ -1,3 +1,14 @@
+amarok (1.4.5-3) experimental; urgency=low
+
+  * Add support for devices using MTP, build-dep on libmtp-dev added. 
+    (Closes: #405399)
+  * Add support for karma devices, build-dep on libkarma-dev added.
+    (Closes: #400801)
+  * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell.
+    (Closes: #410850)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 12 Mar 2007 02:38:05 +0100
+
 amarok (1.4.5-2) experimental; urgency=low
 
   * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2).

Modified: people/ana/packages/amarok/debian/control
===================================================================
--- people/ana/packages/amarok/debian/control	2007-03-12 08:55:50 UTC (rev 5741)
+++ people/ana/packages/amarok/debian/control	2007-03-12 08:58:12 UTC (rev 5742)
@@ -9,7 +9,7 @@
  libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp3-dev,
  libmysqlclient15-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libgpod-dev (>=0.4.2), libnjb-dev,
+ libifp-dev, libusb-dev, libgpod-dev (>=0.4.2), libnjb-dev, libkarma-dev, libmtp-dev,
  ruby, ruby1.8-dev,
  dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2

Added: people/ana/packages/amarok/debian/patches/magnatune_CVE-2006-6980.diff
===================================================================
--- people/ana/packages/amarok/debian/patches/magnatune_CVE-2006-6980.diff	2007-03-12 08:55:50 UTC (rev 5741)
+++ people/ana/packages/amarok/debian/patches/magnatune_CVE-2006-6980.diff	2007-03-12 08:58:12 UTC (rev 5742)
@@ -0,0 +1,7 @@
+--- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
++++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
+92c92,93
+<     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 ) + " &";
+> 

Modified: people/ana/packages/amarok/debian/patches/series
===================================================================
--- people/ana/packages/amarok/debian/patches/series	2007-03-12 08:55:50 UTC (rev 5741)
+++ people/ana/packages/amarok/debian/patches/series	2007-03-12 08:58:12 UTC (rev 5742)
@@ -5,3 +5,4 @@
 disable-final.diff -p0
 queuemedia.patch -p0
 proxy_lyrics.diff -p0
+magnatune_CVE-2006-6980.diff -p0