Date: Mon, 24 Jun 2013 13:53:30 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321681 - in head/net-im/jabberd: . files Message-ID: <201306241353.r5ODrUC2000292@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Mon Jun 24 13:53:29 2013 New Revision: 321681 URL: http://svnweb.freebsd.org/changeset/ports/321681 Log: Unbreak build with clang PR: ports/179543 Submitted by: Guido Falsi <madpilot@FreeBSD.org> Added: head/net-im/jabberd/files/patch-s2s-out.c (contents, props changed) head/net-im/jabberd/files/patch-sm-mod_roster.c (contents, props changed) Modified: head/net-im/jabberd/Makefile Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Mon Jun 24 13:12:10 2013 (r321680) +++ head/net-im/jabberd/Makefile Mon Jun 24 13:53:29 2013 (r321681) @@ -3,6 +3,7 @@ PORTNAME= jabberd PORTVERSION= 2.2.17 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://cloud.github.com/downloads/jabberd2/jabberd2/ Added: head/net-im/jabberd/files/patch-s2s-out.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-s2s-out.c Mon Jun 24 13:53:29 2013 (r321681) @@ -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 */ Added: head/net-im/jabberd/files/patch-sm-mod_roster.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-sm-mod_roster.c Mon Jun 24 13:53:29 2013 (r321681) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306241353.r5ODrUC2000292>