[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1+l10n-2-3-g4432f64

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=4432f64

The following commit has been merged in the master branch:
commit 4432f64fc8dda356f719b98dbf9312f1cf640b67
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 9 12:47:32 2012 +0200

    fix building with FORTIFY & GCC 4.7
    
    backport upstream commit 645cefecafc3b40f4cb91675703335bfdc8f8b91
    (reduced to avoid whitespace-only changes)
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 ...g-c4_String-only-call-memset-if-the-numbe.patch |   31 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b86d087..2a721ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ kdepim (4:4.4.11.1+l10n-3) UNRELEASED; urgency=low
   * Backport upstream commit 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd to fix
     the Akregator shutdown with qDeleteAll() of Qt 4.8; patch
     upstream_Fix-crash-in-Folder-destructor.patch. (Closes: #675498)
+  * Backport upstream commit 645cefecafc3b40f4cb91675703335bfdc8f8b91 to fix
+    building with FORTIFY & GCC 4.7; patch
+    upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jun 2012 11:18:32 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index cf195cd..2a23e3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ debian_set_library_version.diff
 upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
 upstream_Build-with-clang.patch
 upstream_Fix-crash-in-Folder-destructor.patch
+upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
diff --git a/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch b/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
new file mode 100644
index 0000000..f3d9206
--- /dev/null
+++ b/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
@@ -0,0 +1,31 @@
+From 645cefecafc3b40f4cb91675703335bfdc8f8b91 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter at kde.org>
+Date: Sat, 7 Jan 2012 13:54:24 -0500
+Subject: [PATCH] in c4_String::c4_String(), only call memset() if the number
+ of bytes to set is greater than 0.
+
+BUG: 290688
+MERGE: 4.8
+(cherry picked from commit cd7e237dde2d0a81a49d6f5e73636870ff3f7fb1)
+---
+ .../plugins/mk4storage/metakit/src/string.cpp      |   26 +++++++++++---------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/akregator/plugins/mk4storage/metakit/src/string.cpp b/akregator/plugins/mk4storage/metakit/src/string.cpp
+index 81adb33..f727335 100644
+--- a/akregator/plugins/mk4storage/metakit/src/string.cpp
++++ b/akregator/plugins/mk4storage/metakit/src/string.cpp
+@@ -120,7 +120,9 @@ c4_String::c4_String(char ch, int n /* =1 */) {
+   _value = new unsigned char[n + 3];
+ 
+   _value[0] = 1; // see Init() member
+-  memset(_value + 2, ch, n);
++  if ( n > 0 ) {
++    memset(_value + 2, ch, n);
++  }
+   _value[1] = (unsigned char)(n <= 255 ? n : 255);
+   _value[n + 2] = 0;
+ }
+-- 
+1.7.10
+

-- 
KDE PIM module packaging