[142468] trunk/dports/net/jabberd
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 12 05:53:10 PST 2015
Revision: 142468
https://trac.macports.org/changeset/142468
Author: ryandesign at macports.org
Date: 2015-11-12 08:31:52 -0800 (Thu, 12 Nov 2015)
Log Message:
-----------
jabberd: update to 2.3.4
Modified Paths:
--------------
trunk/dports/net/jabberd/Portfile
trunk/dports/net/jabberd/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff
Removed Paths:
-------------
trunk/dports/net/jabberd/files/patch-s2s-out.c.diff
trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff
Modified: trunk/dports/net/jabberd/Portfile
===================================================================
--- trunk/dports/net/jabberd/Portfile 2015-11-12 16:14:12 UTC (rev 142467)
+++ trunk/dports/net/jabberd/Portfile 2015-11-12 16:31:52 UTC (rev 142468)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup github 1.0
-github.setup jabberd2 jabberd2 2.2.17 jabberd-
+github.setup jabberd2 jabberd2 2.3.4 jabberd-
name jabberd
categories net
platforms darwin
@@ -18,11 +18,11 @@
homepage http://jabberd2.org/
distname ${name}-${version}
-github.tarball_from downloads
+github.tarball_from releases
use_xz yes
-checksums rmd160 4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2 \
- sha256 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647
+checksums rmd160 210d2b28b635797831a271a3dd5deddd9042cd4c \
+ sha256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671
depends_build port:libudns
@@ -30,12 +30,10 @@
port:expat \
port:libgsasl \
port:libidn \
- port:gettext \
port:zlib
patchfiles patch-configure.diff \
- patch-s2s-out.c.diff \
- patch-sm-mod_roster.c.diff
+ patch-sx-plugins.h.diff
# gcc 4.1.1 miscompiles something at -Os. gcc 4.2.2 works. Don't know when it
# got fixed, therefore use -O2 on all gcc.
Modified: trunk/dports/net/jabberd/files/patch-configure.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-configure.diff 2015-11-12 16:14:12 UTC (rev 142467)
+++ trunk/dports/net/jabberd/files/patch-configure.diff 2015-11-12 16:31:52 UTC (rev 142468)
@@ -1,8 +1,8 @@
http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/chat/jabberd2/patches/patch-configure
https://github.com/jabberd2/jabberd2/issues/34
---- configure.orig 2011-05-31 22:11:47.000000000 +0000
-+++ configure
-@@ -11762,7 +11762,7 @@ fi
+--- configure.orig 2015-10-30 03:53:19.000000000 -0500
++++ configure 2015-11-08 22:27:21.000000000 -0600
+@@ -11830,7 +11830,7 @@
# check for optimisation level
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
$as_echo_n "checking CFLAGS optimization level... " >&6; }
Deleted: trunk/dports/net/jabberd/files/patch-s2s-out.c.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-s2s-out.c.diff 2015-11-12 16:14:12 UTC (rev 142467)
+++ trunk/dports/net/jabberd/files/patch-s2s-out.c.diff 2015-11-12 16:31:52 UTC (rev 142468)
@@ -1,13 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=179543
-https://github.com/jabberd2/jabberd2/commit/ef675c9b2d9991899b267d5dbd01f14aa1e6abf8
---- 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 */
Deleted: trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff 2015-11-12 16:14:12 UTC (rev 142467)
+++ trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff 2015-11-12 16:31:52 UTC (rev 142468)
@@ -1,13 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=179543
-https://github.com/jabberd2/jabberd2/commit/85c720c04929a7562ac8edc81475a0d68bb552fb
---- 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);
Added: trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff (rev 0)
+++ trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff 2015-11-12 16:31:52 UTC (rev 142468)
@@ -0,0 +1,21 @@
+https://github.com/jabberd2/jabberd2/commit/b861b9c72adc732cbdfbac4eb8a4205126227f6b
+--- sx/plugins.h.orig
++++ sx/plugins.h
+@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
+ JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+
+ /* websocket wrapper plugin */
+-//#ifdef USE_WEBSOCKET
++#ifdef USE_WEBSOCKET
+ #include <http_parser.h>
+ #include <util/util.h>
+
+@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
+ xht headers;
+ void *frame;
+ } *_sx_websocket_conn_t;
+-//#endif
++#endif
+
+ #ifdef __cplusplus
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/1857032f/attachment.html>
More information about the macports-changes
mailing list