[Pkg-xmpp-commits] [jabberd2] 01/01: Additional clang compile fix.

[Willem van den Akker]

This is an automated email from the git hooks/post-receive script.

wvdakker-guest pushed a commit to branch master
in repository jabberd2.

commit 8fa08c678780018fb7574b29af2b0733c7b72a7d
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Mon Apr 27 23:42:40 2015 +0200

    Additional clang compile fix.
---
 debian/changelog                             |  4 ++++
 debian/patches/clang_FTBFS_Wreturn-type.diff | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0caf704..3ffbcd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ jabberd2 (2.3.3-2) unstable; urgency=low
   * Build-depend on check to get self-tests.
   * Fix watch file.
 
+  [ Willem van den Akker ]
+  * debian/patches/clang_FTBFS_Wreturn-type.diff: additional fix for clang 
+    build (Thanks to Nicolas Sévelin-Radiguet).
+
  -- Simon Josefsson <simon at josefsson.org>  Mon, 27 Apr 2015 16:00:15 +0200
 
 jabberd2 (2.3.3-1) unstable; urgency=low
diff --git a/debian/patches/clang_FTBFS_Wreturn-type.diff b/debian/patches/clang_FTBFS_Wreturn-type.diff
index 7101bb0..de0831b 100644
--- a/debian/patches/clang_FTBFS_Wreturn-type.diff
+++ b/debian/patches/clang_FTBFS_Wreturn-type.diff
@@ -1,6 +1,6 @@
 Description: fix FTBFS with clang instead of gcc
 Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
-Last-Update: 2014-03-26
+Last-Update: 2015-04-27
 
 --- a/sm/mod_roster.c
 +++ b/sm/mod_roster.c
@@ -40,3 +40,12 @@ Last-Update: 2014-03-26
          }
  
          /* make a new one */
+@@ -460,7 +460,7 @@
+     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
+ 
+     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
+-        return;
++        return 0;
+ 
+     /* save changes */
+     _roster_save_item(sess->user, item);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git