diff options
| author | mm <mm@FreeBSD.org> | 2013-06-24 21:53:29 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-06-24 21:53:29 +0800 |
| commit | 53dce76e26fd32e1615cb8bed6ab3bc076aa6fa4 (patch) | |
| tree | 7b9b9c883cafead5f4faffb37cdd91b741ee4b91 /net-im/jabberd | |
| parent | b1563c0fe84ea3c1df0f6d5ee17da3369a2493e1 (diff) | |
| download | freebsd-ports-gnome-53dce76e26fd32e1615cb8bed6ab3bc076aa6fa4.tar.gz freebsd-ports-gnome-53dce76e26fd32e1615cb8bed6ab3bc076aa6fa4.tar.zst freebsd-ports-gnome-53dce76e26fd32e1615cb8bed6ab3bc076aa6fa4.zip | |
Unbreak build with clang
PR: ports/179543
Submitted by: Guido Falsi <madpilot@FreeBSD.org>
Diffstat (limited to 'net-im/jabberd')
| -rw-r--r-- | net-im/jabberd/Makefile | 1 | ||||
| -rw-r--r-- | net-im/jabberd/files/patch-s2s-out.c | 11 | ||||
| -rw-r--r-- | net-im/jabberd/files/patch-sm-mod_roster.c | 11 |
3 files changed, 23 insertions, 0 deletions
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index ff142ac49736..ab84a5395da0 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -3,6 +3,7 @@ PORTNAME= jabberd PORTVERSION= 2.2.17 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://cloud.github.com/downloads/jabberd2/jabberd2/ diff --git a/net-im/jabberd/files/patch-s2s-out.c b/net-im/jabberd/files/patch-s2s-out.c new file mode 100644 index 000000000000..64340715b7d9 --- /dev/null +++ b/net-im/jabberd/files/patch-s2s-out.c @@ -0,0 +1,11 @@ +--- s2s/out.c.orig 2012-08-22 08:03:58.000000000 +0200 ++++ s2s/out.c 2013-06-13 23:25:13.528682146 +0200 +@@ -627,7 +627,7 @@ + nad_free(pkt->nad); + free(pkt); + +- return; ++ return 0; + } + + /* new route key */ diff --git a/net-im/jabberd/files/patch-sm-mod_roster.c b/net-im/jabberd/files/patch-sm-mod_roster.c new file mode 100644 index 000000000000..8ca489bbd8db --- /dev/null +++ b/net-im/jabberd/files/patch-sm-mod_roster.c @@ -0,0 +1,11 @@ +--- sm/mod_roster.c.orig 2012-02-12 22:36:18.000000000 +0100 ++++ sm/mod_roster.c 2013-06-13 23:42:35.669583304 +0200 +@@ -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 -stanza_err_RESOURCE_CONSTRAINT; ++ return; + + /* save changes */ + _roster_save_item(sess->user, item); |