[SCM] Amarok packaging branch, master, updated. debian/2.5.0-3

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=fc94e6a

The following commit has been merged in the master branch:
commit fc94e6a06c5a1da283afdfc7e30c495b1386b3c4
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 13:15:02 2012 +0300

    Fix unsafe argument assignment in the debian_mysqle_force_defaults_file patch.
    
    Thanks to Pino Toscano for heads up.
---
 debian/changelog                                   |    2 ++
 .../patches/debian_mysqle_force_defaults_file.diff |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8867ff1..ded6cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ amarok (2.5.0-3~pre1) UNRELEASED; urgency=low
   * Compress all deb packages with xz, not just amarok-dbg.
   * Split off Amarok Handbook into amarok-doc package.
   * Update debian/copyright.
+  * Fix unsafe argument assignment in the debian_mysqle_force_defaults_file
+    patch. Thanks to Pino Toscano for heads up.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 26 May 2012 00:42:14 +0300
 
diff --git a/debian/patches/debian_mysqle_force_defaults_file.diff b/debian/patches/debian_mysqle_force_defaults_file.diff
index 9ca0620..e3964be 100644
--- a/debian/patches/debian_mysqle_force_defaults_file.diff
+++ b/debian/patches/debian_mysqle_force_defaults_file.diff
@@ -13,15 +13,16 @@ looking for /etc/mysql/conf.d/ or reading system errmsg.sys.
 
 --- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
 +++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-@@ -92,8 +92,11 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
+@@ -92,8 +92,12 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
  
      setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
      setenv( "DEFAULT_HOME_ENV", storagePath.toAscii().data(), 1 );
 -    char *args[] = { (char*) "amarok" };
 -    if( mysql_library_init( 1 , args, 0 ) != 0 )
++    QByteArray defaultsFileArg = QByteArray("--defaults-file=") + QFile::encodeName(defaultsFile);
 +    char *args[] = {
 +        (char*) "amarok",
-+        QString(QLatin1String("--defaults-file=")+defaultsFile).toAscii().data()
++        defaultsFileArg.data()
 +    };
 +    if( mysql_library_init( 2 , args, 0 ) != 0 )
      {

-- 
Amarok packaging