[110112] trunk/dports/net/jabberd

ryandesign at macports.org ryandesign at macports.org
Mon Aug 26 05:11:28 PDT 2013 

Revision: 110112
          https://trac.macports.org/changeset/110112
Author:   ryandesign at macports.org
Date:     2013-08-26 05:11:28 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
jabberd: update to 2.2.17; use github portgroup; update homepage and master_sites; license GPL-2+; add modeline

Modified Paths:
--------------
    trunk/dports/net/jabberd/Portfile

Added Paths:
-----------
    trunk/dports/net/jabberd/files/
    trunk/dports/net/jabberd/files/patch-configure.diff
    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	2013-08-26 11:47:59 UTC (rev 110111)
+++ trunk/dports/net/jabberd/Portfile	2013-08-26 12:11:28 UTC (rev 110112)
@@ -1,23 +1,29 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
+PortGroup       github 1.0
 
+github.setup    jabberd2 jabberd2 2.2.17 jabberd-
 name            jabberd
-version         2.2.9
-revision        4
 categories      net
 platforms       darwin
 maintainers     nomaintainer
+license         GPL-2+
+
 description     Jabber messaging (XMPP) server
 long_description \
     The Jabber server (jabberd) is a daemon for Jabber clients to connect and \
     communicate with using the XMPP protocol.
-homepage        http://codex.xiaoka.com/wiki/jabberd2:start
-master_sites    http://codex.xiaoka.com/pub/jabberd2/releases/
-checksums       md5     f32d580526374e3eaeb49c88bc90b767 \
-                sha1    55977c88fe156b1891a0a22c975233226b3d4319 \
-                rmd160  bf2722eef539d120b8d6e8a71bf47558eab7a00f
 
+homepage        http://jabberd2.org/
+distname        ${name}-${version}
+github.tarball_from downloads
+use_xz          yes
+
+checksums       rmd160  4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2 \
+                sha256  0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647
+
 depends_lib     port:openssl \
                 port:expat \
                 port:libgcrypt \
@@ -30,8 +36,18 @@
                 port:libudns \
                 port:zlib
 
-configure.args  --mandir=${prefix}/share/man \
-                --enable-mio=select \
+patchfiles      patch-configure.diff \
+                patch-s2s-out.c.diff \
+                patch-sm-mod_roster.c.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.
+# https://github.com/jabberd2/jabberd2/issues/34
+if {[string match *gcc* ${configure.compiler}]} {
+    configure.optflags -O2
+}
+
+configure.args  --enable-mio=select \
                 --enable-ssl \
                 --disable-mysql \
                 --disable-pgsql \
@@ -46,16 +62,16 @@
 
 destroot.keepdirs ${destroot}${prefix}/var/jabberd/pid
 
+set conf_files {c2s.xml jabberd.cfg router-filter.xml router-users.xml router.xml s2s.xml sm.xml templates/roster.xml}
+
 post-destroot {
-    foreach f {c2s.xml jabberd.cfg router-filter.xml router-users.xml \
-               router.xml s2s.xml sm.xml templates/roster.xml} {
+    foreach f ${conf_files} {
         file delete ${destroot}${prefix}/etc/$f
     }
 }
 
 post-activate {
-    foreach f {c2s.xml jabberd.cfg router-filter.xml router-users.xml \
-               router.xml s2s.xml sm.xml templates/roster.xml} {
+    foreach f ${conf_files} {
         if {![file exists ${prefix}/etc/$f]} {
             copy ${prefix}/etc/$f.dist ${prefix}/etc/$f
         }

Added: trunk/dports/net/jabberd/files/patch-configure.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/net/jabberd/files/patch-configure.diff	2013-08-26 12:11:28 UTC (rev 110112)
@@ -0,0 +1,13 @@
+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
+ # check for optimisation level
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
+ $as_echo_n "checking CFLAGS optimization level... " >&6; }
+-if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then
++if echo $CFLAGS | grep '.*-O[3].*' >/dev/null 2>&1; then
+     as_fn_error $? "maximum allowed optimization level is -O2" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5

Added: trunk/dports/net/jabberd/files/patch-s2s-out.c.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-s2s-out.c.diff	                        (rev 0)
+++ trunk/dports/net/jabberd/files/patch-s2s-out.c.diff	2013-08-26 12:11:28 UTC (rev 110112)
@@ -0,0 +1,13 @@
+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 */

Added: trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff
===================================================================
--- trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff	                        (rev 0)
+++ trunk/dports/net/jabberd/files/patch-sm-mod_roster.c.diff	2013-08-26 12:11:28 UTC (rev 110112)
@@ -0,0 +1,13 @@
+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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/d358a551/attachment.html>

More information about the macports-changes mailing list