[Pkg-xmpp-commits] [jabberd2] 01/01: Correct compiling with Clang. Closes 742748.

[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 528b93836cfb58bf475e6321259aaf0a8ee0f8ae
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri Mar 28 09:34:16 2014 +0100

    Correct compiling with Clang. Closes 742748.
---
 debian/changelog                             |  2 ++
 debian/patches/clang_FTBFS_Wreturn-type.diff | 53 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 56 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 972395a..58e9d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jabberd2 (2.2.17-2) UNRELEASED; urgency=low
 
   * debian/init: added init-functions to the script.
+  * Correct compiling with Clang. Added patch clang_FTBFS_Wreturn-type.diff. 
+    Thanks to Nicolas Sévelin-Radiguet (Closes: #742748).
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 26 Jul 2013 07:59:06 +0200
 
diff --git a/debian/patches/clang_FTBFS_Wreturn-type.diff b/debian/patches/clang_FTBFS_Wreturn-type.diff
new file mode 100644
index 0000000..2436f62
--- /dev/null
+++ b/debian/patches/clang_FTBFS_Wreturn-type.diff
@@ -0,0 +1,53 @@
+Description: fix FTBFS with clang instead of gcc
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Last-Update: 2014-03-26
+
+--- a/s2s/out.c
++++ b/s2s/out.c
+@@ -627,7 +627,7 @@
+             nad_free(pkt->nad);
+         free(pkt);
+ 
+-        return;
++        return 0;
+     }
+ 
+     /* new route key */
+--- a/sm/mod_roster.c
++++ b/sm/mod_roster.c
+@@ -307,7 +307,7 @@
+     pkt_sess(push, rw->sess);
+ }
+ 
+-static void _roster_set_item(pkt_t pkt, int elem, sess_t sess, mod_instance_t mi)
++static _roster_set_item(pkt_t pkt, int elem, sess_t sess, mod_instance_t mi)
+ {
+     mod_roster_t mroster = (mod_roster_t) mi->mod->private;
+     module_t mod = mi->mod;
+@@ -322,7 +322,7 @@
+     jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+     if(jid == NULL) {
+         log_debug(ZONE, "jid failed prep check, skipping");
+-        return;
++        return 0;
+     }
+ 
+     /* check for removals */
+@@ -378,7 +378,7 @@
+ 
+         jid_free(jid);
+ 
+-        return;
++        return 0;
+     }
+ 
+     /* find a pre-existing one */
+@@ -393,7 +393,7 @@
+ 
+             /* if the limit is reached, skip it */
+             if (ret == st_SUCCESS && items >= mroster->maxitems)
+-                return;
++                return 0;
+         }
+ 
+         /* make a new one */
diff --git a/debian/patches/series b/debian/patches/series
index 626ff49..8e8a540 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ etc_dbpath.diff
 etc_logpath.diff
 etc_pidpath.diff
 pkgname.diff
+clang_FTBFS_Wreturn-type.diff

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