[Pkg-xmpp-commits] [jabberd2] 01/01: Drop patch.

[Simon Josefsson]

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

jas pushed a commit to branch master
in repository jabberd2.

commit 23aab1dacfade59072d4d8915abf98d44ad13942
Author: Simon Josefsson <simon at josefsson.org>
Date:   Tue Apr 28 12:24:48 2015 +0200

    Drop patch.
---
 debian/changelog                             |  4 +--
 debian/patches/clang_FTBFS_Wreturn-type.diff | 51 ----------------------------
 debian/patches/series                        |  1 -
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ffbcd6..cbf186d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,8 @@ jabberd2 (2.3.3-2) unstable; urgency=low
   * 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).
+  * debian/patches/clang_FTBFS_Wreturn-type.diff: Drop patch (Thanks
+    to Nicolas Sévelin-Radiguet).
 
  -- Simon Josefsson <simon at josefsson.org>  Mon, 27 Apr 2015 16:00:15 +0200
 
diff --git a/debian/patches/clang_FTBFS_Wreturn-type.diff b/debian/patches/clang_FTBFS_Wreturn-type.diff
deleted file mode 100644
index de0831b..0000000
--- a/debian/patches/clang_FTBFS_Wreturn-type.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: fix FTBFS with clang instead of gcc
-Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
-Last-Update: 2015-04-27
-
---- 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 */
-@@ -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);
diff --git a/debian/patches/series b/debian/patches/series
index 0b047fe..fbe3771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ etc_dbpath.diff
 etc_logpath.diff
 etc_pidpath.diff
 pkgname.diff
-clang_FTBFS_Wreturn-type.diff
 systemd-alias.diff

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