<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142468] trunk/dports/net/jabberd</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142468">142468</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-11-12 08:31:52 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>jabberd: update to 2.3.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetjabberdPortfile">trunk/dports/net/jabberd/Portfile</a></li>
<li><a href="#trunkdportsnetjabberdfilespatchconfigurediff">trunk/dports/net/jabberd/files/patch-configure.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetjabberdfilespatchsxpluginshdiff">trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetjabberdfilespatchs2soutcdiff">trunk/dports/net/jabberd/files/patch-s2s-out.c.diff</a></li>
<li><a href="#trunkdportsnetjabberdfilespatchsmmod_rostercdiff">trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetjabberdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/jabberd/Portfile (142467 => 142468)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup jabberd2 jabberd2 2.2.17 jabberd-
</del><ins>+github.setup jabberd2 jabberd2 2.3.4 jabberd-
</ins><span class="cx"> name jabberd
</span><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -18,11 +18,11 @@
</span><span class="cx">
</span><span class="cx"> homepage http://jabberd2.org/
</span><span class="cx"> distname ${name}-${version}
</span><del>-github.tarball_from downloads
</del><ins>+github.tarball_from releases
</ins><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2 \
- sha256 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647
</del><ins>+checksums rmd160 210d2b28b635797831a271a3dd5deddd9042cd4c \
+ sha256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671
</ins><span class="cx">
</span><span class="cx"> depends_build port:libudns
</span><span class="cx">
</span><span class="lines">@@ -30,12 +30,10 @@
</span><span class="cx"> port:expat \
</span><span class="cx"> port:libgsasl \
</span><span class="cx"> port:libidn \
</span><del>- port:gettext \
</del><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.diff \
</span><del>- patch-s2s-out.c.diff \
- patch-sm-mod_roster.c.diff
</del><ins>+ patch-sx-plugins.h.diff
</ins><span class="cx">
</span><span class="cx"> # gcc 4.1.1 miscompiles something at -Os. gcc 4.2.2 works. Don't know when it
</span><span class="cx"> # got fixed, therefore use -O2 on all gcc.
</span></span></pre></div>
<a id="trunkdportsnetjabberdfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/jabberd/files/patch-configure.diff (142467 => 142468)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/chat/jabberd2/patches/patch-configure
</span><span class="cx"> https://github.com/jabberd2/jabberd2/issues/34
</span><del>---- configure.orig 2011-05-31 22:11:47.000000000 +0000
-+++ configure
-@@ -11762,7 +11762,7 @@ fi
</del><ins>+--- configure.orig 2015-10-30 03:53:19.000000000 -0500
++++ configure 2015-11-08 22:27:21.000000000 -0600
+@@ -11830,7 +11830,7 @@
</ins><span class="cx"> # check for optimisation level
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
</span><span class="cx"> $as_echo_n "checking CFLAGS optimization level... " >&6; }
</span></span></pre></div>
<a id="trunkdportsnetjabberdfilespatchs2soutcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/jabberd/files/patch-s2s-out.c.diff (142467 => 142468)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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 */
</del></span></pre></div>
<a id="trunkdportsnetjabberdfilespatchsmmod_rostercdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff (142467 => 142468)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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);
</del></span></pre></div>
<a id="trunkdportsnetjabberdfilespatchsxpluginshdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/jabberd/files/patch-sx-plugins.h.diff (0 => 142468)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+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
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>