From c6adaf1d303091ec58b792eedcb890931fcb124d Mon Sep 17 00:00:00 2001 From: fhajny Date: Fri, 12 Aug 2016 10:27:27 +0000 Subject: Update chat/ejabberd to 16.08. ejabberd 16.08 MUC - New MUC/Sub support - Add 'allow_subscription' room configuration option for MUC/Sub OAuth and ReST API - Add OAUTH SQL backend - New special scope: ejabberd:admin and ejabberd:user, to more easily grant group of privileges - Add DB backend support for ejabberd_oauth - Added ejabberdctl commands to manage OAuth tokens: oauth_issue_token, oauth_list_tokens, oauth_list_scopes, oauth_revoke_token - Simplified OAuth form: username and password merged into JID field - User configurable validity duration for tokens on OAuth token generation form - Add support for sending back missing scope error to API ReST command calls - Oauth: several minor fixes - Support oauth password grant type, to generate token programmatically Elixir support - Update supported Elixir version to 1.2 and 1.3. - Support installation of Elixir contributions with external module command line tool. PubSub - Fix use of like parameter in sql pubsub's requests - Fix node configuration change with sql backends - Fix send_last_items duplication with multi-plugin setup MAM - Always limit result set page size - Use hooks instead of direct calls API - Add support for checking access rules conformance for commands - Add support for rich error reporting for API - Add support for sending back missing scope error to API ReST command calls - Fix handling of complex values as arguments in http_api - Improve error handling Other improvements - External Component Connection Hooks - Fix compilation issues on R19 - Support for OpenSSL 1.1 - Make access rules in ejabberd_web_admin configurable - Make modules loading in a dependent order (#1191) - Make s2s stats commands more robust - Preserve PID for offline sessions - Several quoting fixes for PostgreSQL - Switch supervised workers from temporary to transient ejabberd 16.06 Config - New ACL infrastructure - Add shorter version of some common access rules definitions - Allow @ inside acl rules user, user_glob or user_regexp to pass both user and server in single string - Add acl rule access_rules_validator and shaper_rules_validator for use in mod_opt_type and opt_type callback functions. - Allow using shapers defined by name like in s2s_shaper: fast - Allow mod_opt_type and opt_type to transform values passed to it, and support better error reporting - Do not call transform_terms multiple times in configuration processing when merging them - Don't halt program when include_config_file is missing/can't be read - Allow again multiple fqdn values in configuration Commands - Allow passing username and ip to ejabberd_commands, and use it in mod_http_api - Fix path to epmd in ejabberdctl - push_roster: must convert read strings to binaries - set_presence: Fix command API - Fix for modules_update_specs command - Add ejabberdctl commands to manage oauth tokens. Core - Bounce messages sent to server JID - Fix C2S session leak in rare cases - Fix handling of queued stanzas on session timeout - Give more time to stop and kill epmd - When stopping ejabberd, stop modules after broadcasting c2s shutdown - XEP-0198: Use different error message for bounces - XEP-0198: Add 'h' attribute to element - XEP-0198: Also count stanzas when socket is closed Databases - Fix pgsql compatibility on delete_old_messages command - Handle Redis connection in a separate module - Report in SQL when scram is enabled but the stored password isn't - Update SQL escaping - Use MEDIUMTEXT type for muc_room.opts in MySQL schema MAM - Send unique stanza id and archived tag also in the message carbons - Fix "assume_mam_usage: if_enabled" - Fix typo in mod_mam:select() - Updated support of XEP-0313 from version 0.4 to 0.5.1 - Mnesia: Avoid cleanup on bag when disc_only, switch in memory - Mnesia: Don't exceed table size limit - Mnesia: Use transactions when writing Client State Indication - Fix handling of chat states - Simplify check for carbon-copied chat states - Simplify handling of PEP stanzas - Pass chat states of other resources - Unwrap carbon copies when checking for chat states - Add queue_pep option - Queue chat state notifications - Move CSI queue handling code from ejabberd_c2s - When stopping, delete only the configured hooks Other modules - ext_mod: Set HTTP/1.0 so Github accepts the request - gen_mod: Compile early to remove undefined behaviour warning - mod_http_upload: Let client retry HTTP upload on file size mismatch - mod_last: Produce mod_last entry on account creation - mod_muc_room: Notify on affiliation changes - mod_register: Check password with jid:resourceprep when registering account - mod_roster: respect roster item changes introduced with roster_process_item hooks upon pushing - PubSub: Fix PubSub RSM on get_items - PubSub: Add support for PubSub publishing options - PEP: Fix sender in case of explicit pep subscriptions - ejabberd_xmlrpc: Report error when conversion of argument type fails --- chat/ejabberd/patches/patch-rebar.config | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'chat/ejabberd/patches') diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config index 1529f71c3c3..2fceb237343 100644 --- a/chat/ejabberd/patches/patch-rebar.config +++ b/chat/ejabberd/patches/patch-rebar.config @@ -1,22 +1,22 @@ -$NetBSD: patch-rebar.config,v 1.3 2016/04/29 19:05:22 fhajny Exp $ +$NetBSD: patch-rebar.config,v 1.4 2016/08/12 10:27:27 fhajny Exp $ Deps are handled by pkgsrc. ---- rebar.config.orig 2016-04-28 13:57:55.000000000 +0000 +--- rebar.config.orig 2016-08-04 07:49:23.000000000 +0000 +++ rebar.config @@ -7,51 +7,6 @@ %%% Created : 1 May 2013 by Evgeniy Khramtsov %%%------------------------------------------------------------------- --{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}, -- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.4"}}}, -- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.2"}}}, -- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.3"}}}, -- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.3"}}}, -- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.3"}}}, -- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.3"}}}, -- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.4"}}}, -- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.3"}}}, +-{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"}}}, - {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"}}}, @@ -35,17 +35,17 @@ Deps are handled by pkgsrc. - "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, - %% Forces correct dependency for riakc and allow using newer meck version) - {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", -- "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 +- "13f9bfb9b27d216e8e033b0e0a9a29097ed923dd"}}}, % for riak_pb-2.1.0.7 - {if_var_true, riak, {protobuffs, ".*", {git, "https://github.com/basho/erlang_protobuffs", - "6e7fc924506e2dc166a6170e580ce1d95ebbd5bd"}}}, % for riak_pb-2.1.0.7 with correct meck dependency - %% Elixir support, needed to run tests - {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", -- {tag, "v1.1.1"}}}}, +- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}}, - %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin - {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.0"}}}}, +- {tag, "1.0.1"}}}}, - {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", -- cgit v1.2.3