[SCM] KDE Network module packaging branch, master, updated. debian/4.7.4-3-9-gc5681fb

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c4b9c477897784b2b8f656dd262762c22a5f8c80
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 10 15:36:32 2012 +0200

    fix build failure with FORTIFY & GCC 4.7
    
    thanks to Fedora
---
 debian/changelog                                   |    4 ++++
 .../patches/kdenetwork-4.7.97-fix-for-g++47.patch  |   17 +++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a1987f..1784664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ kdenetwork (4:4.8.4-0r0) UNRELEASED; urgency=low
     - protocols_namespaces.diff
     - upstream_r1292762.diff
 
+  [ Pino Toscano ]
+  * Fix build failure with FORTIFY & GCC 4.7; patch
+    kdenetwork-4.7.97-fix-for-g++47.patch from Fedora.
+
  -- Eshat Cakar <info at eshat.de>  Sun, 13 May 2012 13:42:09 +0200
 
 kdenetwork (4:4.7.4-3) unstable; urgency=low
diff --git a/debian/patches/kdenetwork-4.7.97-fix-for-g++47.patch b/debian/patches/kdenetwork-4.7.97-fix-for-g++47.patch
new file mode 100644
index 0000000..4577867
--- /dev/null
+++ b/debian/patches/kdenetwork-4.7.97-fix-for-g++47.patch
@@ -0,0 +1,17 @@
+Author: Radek Novacek <rnovacek at redhat.com>
+Description: Fix build failure with g++ 4.7
+Bug: https://bugs.kde.org/show_bug.cgi?id=290691
+
+--- a/kopete/protocols/qq/evautil.cpp
++++ b/kopete/protocols/qq/evautil.cpp
+@@ -78,7 +78,9 @@ namespace Eva {
+ 		plain[0] = ( rand() & 0xf8 ) | pos;
+ 		memset( plain_pre, 0, 8 );
+ 		memset( crypted_pre, 0, 8 );
+-		memset( plain+1, rand()& 0xff, pos++ );
++		if( pos )
++			memset( plain+1, rand()& 0xff, pos );
++		pos++;
+ 
+ 		// pad 2 bytes
+ 		for( i = 0; i< 2; i++ )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b64f8fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kdenetwork-4.7.97-fix-for-g++47.patch

-- 
KDE Network module packaging