From dc9cc4bb88c6726bc1bfea378b4234e792091752 Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 2 Oct 2016 12:17:40 +0000 Subject: Update chat/ejabberd to 16.09. New XMPP Extension support - Support for XEP-0355 - Namespace Delegation - Support for XEP-0356 - Privileged Entity Elixir support - Support for Elixir-based configuration files MUC/Sub - Add a new request to list MUC room subscribers - Link MUC subscription to bare JID - New commands unsubscribe_room and unsubscribe_room for MUC subscriptions management through API - Fix nick-to-jid mapping for MUC subscribers - Fix subscribed rooms list retrieval - Fix message routing from subscribers - Do not update muc_online_users table on MUC/Sub operations MUC - Support multiple JIDs in room invitations - Create room on configuration request as per XEP-0045, 10.1.3 PubSub - Add SQL support for microblogging node plugin - Fix publish with subscriber publish model and SQL backend - node_mb: Call node_pep instead of node_hometree Stream Management - New Stream Management option: ack_timeout - Fix Stream Management feature for the websocket connections - Cancel timer when waiting for resumption MAM and Offline - Don't store messages of type "headline" - Simplify "assume_mam_usage" option - Honor hint for any non-"error" message - Store announcements for offline users Database - Session backend: fix clean Redis table - mod_shared_roster: Support SQL backend ejabberdctcl admin tool - ejabberdctl: do not force access rules check on register command - ejabberdctl: do not force command line to pass a credential - New commands unsubscribe_room and unsubscribe_room for MUC subscriptions management - New command create_room_with_opts to create room with custom config ejabberd API - New commands unsubscribe_room and unsubscribe_room for MUC subscriptions management - New command create_room_with_opts to create room with custom config - Add X-Admin and basic auth header to CORS allowed headers in http_api - Properly process OPTIONS header in http_api for all paths - Expand parsing of JSON input to be able to handle update_roster command - Provide proper args_desc in oauth_issue_token command Developer features: ejabberd Hooks - Add hooks c2s_session_pending, c2s_session_resumed, store_offline_message, store_mam_message - Add CSI user's JID argument to csi_filter_stanza and csi_flush_queue hooks - Add functions to get/set some c2s #state elements from external modules - mod_client_state: Let other modules filter stanzas - rework c2s API to simplify push modules integration --- chat/ejabberd/Makefile | 21 ++++++++++----------- chat/ejabberd/PLIST | 6 +++++- chat/ejabberd/distinfo | 12 ++++++------ chat/ejabberd/patches/patch-rebar.config | 25 ++++++++++++------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index 7d8d2f75a97..34320c6a24d 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2016/08/12 10:27:27 fhajny Exp $ +# $NetBSD: Makefile,v 1.68 2016/10/02 12:17:40 fhajny Exp $ -DISTNAME= ejabberd-16.08 +DISTNAME= ejabberd-16.09 CATEGORIES= chat MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz @@ -10,13 +10,13 @@ HOMEPAGE= http://www.ejabberd.im/ COMMENT= Free and Open Source distributed fault-tolerant Jabber server LICENSE= gnu-gpl-v2 -DEPENDS+= erlang-cache_tab>=1.0.3:../../devel/erlang-cache_tab -DEPENDS+= erlang-esip>=1.0.7:../../net/erlang-esip +DEPENDS+= erlang-cache_tab>=1.0.4:../../devel/erlang-cache_tab +DEPENDS+= erlang-esip>=1.0.8:../../net/erlang-esip DEPENDS+= erlang-ezlib>=1.0.1:../../devel/erlang-ezlib -DEPENDS+= erlang-fast_tls>=1.0.6:../../security/erlang-fast_tls -DEPENDS+= erlang-fast_xml>=1.1.14:../../textproc/erlang-fast_xml -DEPENDS+= erlang-fast_yaml>=1.0.5:../../textproc/erlang-fast_yaml -DEPENDS+= erlang-iconv>=1.0.1:../../converters/erlang-iconv +DEPENDS+= erlang-fast_tls>=1.0.7:../../security/erlang-fast_tls +DEPENDS+= erlang-fast_xml>=1.1.15:../../textproc/erlang-fast_xml +DEPENDS+= erlang-fast_yaml>=1.0.6:../../textproc/erlang-fast_yaml +DEPENDS+= erlang-iconv>=1.0.2:../../converters/erlang-iconv DEPENDS+= erlang-jiffy>=0.14.7:../../textproc/erlang-jiffy DEPENDS+= erlang-lager>=3.2.1:../../sysutils/erlang-lager DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl @@ -25,9 +25,8 @@ DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2 DEPENDS+= erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam DEPENDS+= erlang-p1_pgsql>=1.1.0:../../databases/erlang-p1_pgsql DEPENDS+= erlang-p1_utils>=1.0.5:../../misc/erlang-p1_utils -DEPENDS+= erlang-p1_xmlrpc>=1.15.1:../../textproc/erlang-p1_xmlrpc -DEPENDS+= erlang-stringprep>=1.0.5:../../textproc/erlang-stringprep -DEPENDS+= erlang-stun>=1.0.6:../../net/erlang-stun +DEPENDS+= erlang-stringprep>=1.0.6:../../textproc/erlang-stringprep +DEPENDS+= erlang-stun>=1.0.7:../../net/erlang-stun CONFLICTS+= jabberd-[0-9]* GNU_CONFIGURE= yes diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index 21b8a2c1321..1b60f5a9529 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.41 2016/08/12 10:27:27 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.42 2016/10/02 12:17:40 fhajny Exp $ lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam lib/erlang/lib/${PKGNAME}/ebin/acl.beam @@ -107,6 +107,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_delegation.beam lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam @@ -152,6 +153,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam lib/erlang/lib/${PKGNAME}/ebin/mod_private_mnesia.beam lib/erlang/lib/${PKGNAME}/ebin/mod_private_riak.beam lib/erlang/lib/${PKGNAME}/ebin/mod_private_sql.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_privilege.beam lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam @@ -195,6 +197,7 @@ lib/erlang/lib/${PKGNAME}/ebin/node_flat_sql.beam lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam lib/erlang/lib/${PKGNAME}/ebin/node_hometree_sql.beam lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam +lib/erlang/lib/${PKGNAME}/ebin/node_mb_sql.beam lib/erlang/lib/${PKGNAME}/ebin/node_mix.beam lib/erlang/lib/${PKGNAME}/ebin/node_mix_sql.beam lib/erlang/lib/${PKGNAME}/ebin/node_online.beam @@ -228,6 +231,7 @@ lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_oauth.hrl +lib/erlang/lib/${PKGNAME}/include/ejabberd_service.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_sm.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_sql_pt.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index 1082afb1bca..41cb148ec4d 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.44 2016/08/12 10:27:27 fhajny Exp $ +$NetBSD: distinfo,v 1.45 2016/10/02 12:17:40 fhajny Exp $ -SHA1 (ejabberd-16.08.tgz) = 9044c6b04c11b2e17232c4e44aa39c82da239e84 -RMD160 (ejabberd-16.08.tgz) = 2fa25907fbf2acb9e316c1d8886df3b28c9f2c7f -SHA512 (ejabberd-16.08.tgz) = 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 -Size (ejabberd-16.08.tgz) = 1739542 bytes +SHA1 (ejabberd-16.09.tgz) = cc8d7b21dab64cb1a4dd35641b619016b3d98e3a +RMD160 (ejabberd-16.09.tgz) = 6e9fa3ad81e94fc0d5145f636212b0ebb84511c9 +SHA512 (ejabberd-16.09.tgz) = 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f +Size (ejabberd-16.09.tgz) = 1687485 bytes SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8 SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe -SHA1 (patch-rebar.config) = 19ad1ce0d2a31221019d3f52d8e64d2679fbdf01 +SHA1 (patch-rebar.config) = b7cc78a8bb8a53dad511e47f0c87cb94144a0e4d SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config index 2fceb237343..0a01724d900 100644 --- a/chat/ejabberd/patches/patch-rebar.config +++ b/chat/ejabberd/patches/patch-rebar.config @@ -1,25 +1,24 @@ -$NetBSD: patch-rebar.config,v 1.4 2016/08/12 10:27:27 fhajny Exp $ +$NetBSD: patch-rebar.config,v 1.5 2016/10/02 12:17:40 fhajny Exp $ Deps are handled by pkgsrc. ---- rebar.config.orig 2016-08-04 07:49:23.000000000 +0000 +--- rebar.config.orig 2016-09-13 12:31:39.000000000 +0000 +++ rebar.config -@@ -7,51 +7,6 @@ +@@ -7,50 +7,6 @@ %%% Created : 1 May 2013 by Evgeniy Khramtsov %%%------------------------------------------------------------------- -{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}}, - {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.5"}}}, -- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.3"}}}, -- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.6"}}}, -- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.5"}}}, -- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.14"}}}, -- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.6"}}}, -- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.7"}}}, -- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.5"}}}, +- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.4"}}}, +- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.7"}}}, +- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.6"}}}, +- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.15"}}}, +- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.7"}}}, +- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.8"}}}, +- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.6"}}}, - {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}}, - {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}}, -- {p1_xmlrpc, ".*", {git, "https://github.com/processone/p1_xmlrpc", {tag, "1.15.1"}}}, - {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}}, - {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", - {tag, "1.0.1"}}}}, @@ -45,11 +44,11 @@ Deps are handled by pkgsrc. - {if_var_true, elixir, {rebar_elixir_plugin, ".*", - {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, - {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", -- {tag, "1.0.1"}}}}, +- {tag, "1.0.2"}}}}, - {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", - {tag, "0.8.4"}}}}, - {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git", -- {tag, "1.0.5b"}}}}, +- {tag, "1.0.5c"}}}}, - {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", - {tag, "v1.0.8"}}}}]}. - -- cgit v1.2.3