pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/chat/ejabberd

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Tue Jan  3 18:52:33 UTC 2017

Modified Files:
        pkgsrc/chat/ejabberd: Makefile PLIST distinfo
        pkgsrc/chat/ejabberd/patches: patch-rebar.config

Log Message:
Update chat/ejabberd to 16.12.

API / integration
- New API permissions framework

Commands
- Add configurable weight for ejabberd commands
- add_rosteritem: Support several groups separated by ;
- create_rooms_file: Fix reading room jids from file
- delete_old_messages: Fix command for SQL backends
- send_message: Don't duplicate the message
- Remove obsolete remove_node command (use leave_cluster)
- Fix reload_config
- Cleanup mod_admin_extra, add few functions
- Expose unregister API command

Core XMPP
- New BOSH module
- Use fxml_gen XML generator
- Use our new stand-alone XMPP library instead of jlib.erl
- Don't let MAM messages go into offline storage
- Add xdata generator for XMPP data form
- Get rid of excessive (io)list_to_binary/1 calls

HTTP
- Add authentication support to mod_http_fileserver
- ejabberd_http: Handle missing POST data gracefully
- Use inets instead of lhttpc in http_p1
- Add http_p1.erl, rest.erl, and oauth2 ReST backend for OAuth2 tokens

MUC
- Create room on configuration request as per XEP-0045, 10.1.3
- Ensure that presence_broadcast room option is stored
- Fix conference disco#items when running multiple virtual hosts
- Fix Result Set Management (RSM) for conference disco#items
- Introduce muc_invite hook
- Make the constant MAX_ROOMS_DISCOITEMS configurable
- mod_carboncopy: Don't copy MUC private messages

MUC/Sub
- Store the flag "Allow Subscription" room option in database
- When getting list of subscribed rooms, also check temporary ones
- Add password support in muc_subscribe
- When unsubscribes, check if room should get closed

Pubsub
- Enforce pubsub node removal
- Relational databases support
- Append ; to privacy_list_data exporting lines
- Improve relational database import

Build
- Make build system compatible with rebar3
- Produce ejabberd.service and fix for systemd usage
- Cleanup ext_mod and fix compilation path
- Fix compilation of external module with new xmpp lib


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/chat/ejabberd/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/ejabberd/patches/patch-rebar.config

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.68 pkgsrc/chat/ejabberd/Makefile:1.69
--- pkgsrc/chat/ejabberd/Makefile:1.68  Sun Oct  2 12:17:40 2016
+++ pkgsrc/chat/ejabberd/Makefile       Tue Jan  3 18:52:33 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2016/10/02 12:17:40 fhajny Exp $
+# $NetBSD: Makefile,v 1.69 2017/01/03 18:52:33 fhajny Exp $
 
-DISTNAME=      ejabberd-16.09
+DISTNAME=      ejabberd-16.12
 CATEGORIES=    chat
 MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tgz
@@ -10,23 +10,24 @@ 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.4:../../devel/erlang-cache_tab
-DEPENDS+=      erlang-esip>=1.0.8:../../net/erlang-esip
+DEPENDS+=      erlang-cache_tab>=1.0.5:../../devel/erlang-cache_tab
+DEPENDS+=      erlang-esip>=1.0.10:../../net/erlang-esip
 DEPENDS+=      erlang-ezlib>=1.0.1:../../devel/erlang-ezlib
-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-fast_tls>=1.0.9:../../security/erlang-fast_tls
+DEPENDS+=      erlang-fast_xml>=1.1.18:../../textproc/erlang-fast_xml
+DEPENDS+=      erlang-fast_yaml>=1.0.7:../../textproc/erlang-fast_yaml
+DEPENDS+=      erlang-iconv>=1.0.3:../../converters/erlang-iconv
+DEPENDS+=      erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
 DEPENDS+=      erlang-lager>=3.2.1:../../sysutils/erlang-lager
 DEPENDS+=      erlang-luerl>=0.2:../../lang/erlang-luerl
-DEPENDS+=      erlang-p1_mysql>=1.0.1:../../databases/erlang-p1_mysql
+DEPENDS+=      erlang-p1_mysql>=1.0.2:../../databases/erlang-p1_mysql
 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-stringprep>=1.0.6:../../textproc/erlang-stringprep
-DEPENDS+=      erlang-stun>=1.0.7:../../net/erlang-stun
+DEPENDS+=      erlang-p1_pgsql>=1.1.1:../../databases/erlang-p1_pgsql
+DEPENDS+=      erlang-p1_utils>=1.0.6:../../misc/erlang-p1_utils
+DEPENDS+=      erlang-stringprep>=1.0.7:../../textproc/erlang-stringprep
+DEPENDS+=      erlang-stun>=1.0.9:../../net/erlang-stun
+DEPENDS+=      erlang-xmpp>=1.1.4:../../net/erlang-xmpp
 CONFLICTS+=    jabberd-[0-9]*
 
 GNU_CONFIGURE=         yes
@@ -67,8 +68,8 @@ FILES_SUBST+=         EJABBERD_USER=${EJABBERD_
 FILES_SUBST+=          EJABBERD_GROUP=${EJABBERD_GROUP}
 FILES_SUBST+=          EJABBERD_DB=${EJABBERD_DB}
 
-PKG_GROUPS+=           ${EJABBERD_GROUP}
-PKG_USERS+=            ${EJABBERD_USER}:${EJABBERD_GROUP}
+PKG_GROUPS+=                   ${EJABBERD_GROUP}
+PKG_USERS+=                    ${EJABBERD_USER}:${EJABBERD_GROUP}
 PKG_GECOS.${EJABBERD_USER}=    ejabberd user
 PKG_HOME.${EJABBERD_USER}=     ${EJABBERD_DB}
 PKG_SHELL.${EJABBERD_USER}=    ${SH}
@@ -92,9 +93,9 @@ SUBST_CLASSES+=               paths
 SUBST_MESSAGE.paths=   Localizing paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     Makefile.in ejabberd.yml.example ejabberdctl.template
-SUBST_FILES.paths+=    tools/ejabberdctl.bc
+SUBST_FILES.paths+=    tools/ejabberdctl.bc rebar.config
 SUBST_VARS.paths=      DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
-SUBST_VARS.paths+=     PKG_SYSCONFDIR PREFIX
+SUBST_VARS.paths+=     PKG_SYSCONFDIR PREFIX LOCALBASE
 
 post-extract:
        cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.42 pkgsrc/chat/ejabberd/PLIST:1.43
--- pkgsrc/chat/ejabberd/PLIST:1.42     Sun Oct  2 12:17:40 2016
+++ pkgsrc/chat/ejabberd/PLIST  Tue Jan  3 18:52:33 2017
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.42 2016/10/02 12:17:40 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.43 2017/01/03 18:52:33 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
-lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
@@ -11,6 +10,7 @@ lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_p
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
@@ -21,6 +21,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_bosh.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
@@ -38,9 +39,11 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
@@ -86,7 +89,6 @@ lib/erlang/lib/${PKGNAME}/ebin/gen_mod.b
 lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
 lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
-lib/erlang/lib/${PKGNAME}/ebin/jid.beam
 lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam
@@ -98,6 +100,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_block
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_riak.beam
@@ -106,7 +109,6 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_carbo
 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
@@ -216,6 +218,7 @@ lib/erlang/lib/${PKGNAME}/ebin/pubsub_mi
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
+lib/erlang/lib/${PKGNAME}/ebin/rest.beam
 lib/erlang/lib/${PKGNAME}/ebin/scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
 lib/erlang/lib/${PKGNAME}/ebin/sql_queries.beam
@@ -225,13 +228,13 @@ lib/erlang/lib/${PKGNAME}/ebin/win32_dns
 lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
 lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
 lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
+lib/erlang/lib/${PKGNAME}/include/bosh.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
 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
@@ -255,7 +258,6 @@ lib/erlang/lib/${PKGNAME}/include/mod_ro
 lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
-lib/erlang/lib/${PKGNAME}/include/ns.hrl
 lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
 lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
@@ -294,3 +296,4 @@ share/doc/ejabberd/COPYING
 share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
+@pkgdir bin

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.45 pkgsrc/chat/ejabberd/distinfo:1.46
--- pkgsrc/chat/ejabberd/distinfo:1.45  Sun Oct  2 12:17:40 2016
+++ pkgsrc/chat/ejabberd/distinfo       Tue Jan  3 18:52:33 2017
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.45 2016/10/02 12:17:40 fhajny Exp $
+$NetBSD: distinfo,v 1.46 2017/01/03 18:52:33 fhajny Exp $
 
-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 (ejabberd-16.12.tgz) = f2b407fa86d41ee7a4cfe2886529c77e413088e7
+RMD160 (ejabberd-16.12.tgz) = 74bb9f86d60336d26c1605ab376eb2030988b559
+SHA512 (ejabberd-16.12.tgz) = 1b08301497655479bb1cf442b0da889058c82af5c9fc074d8249cc5e9e4f74c68093d7e36491b4f9db9ff940721ad9f82faa3bf466b119f933197eb97edaf5a7
+Size (ejabberd-16.12.tgz) = 1646370 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
 SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = b7cc78a8bb8a53dad511e47f0c87cb94144a0e4d
+SHA1 (patch-rebar.config) = 15170e7e5de66cc88d0e3975dc5fc5d9c8bae55d
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569

Index: pkgsrc/chat/ejabberd/patches/patch-rebar.config
diff -u pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.5 pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.6
--- pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.5 Sun Oct  2 12:17:40 2016
+++ pkgsrc/chat/ejabberd/patches/patch-rebar.config     Tue Jan  3 18:52:33 2017
@@ -1,29 +1,30 @@
-$NetBSD: patch-rebar.config,v 1.5 2016/10/02 12:17:40 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.6 2017/01/03 18:52:33 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.orig  2016-09-13 12:31:39.000000000 +0000
+--- rebar.config.orig  2016-12-22 19:41:01.000000000 +0000
 +++ rebar.config
-@@ -7,50 +7,6 @@
+@@ -7,46 +7,6 @@
  %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov%process-one.net@localhost>
  %%%-------------------------------------------------------------------
  
 -{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.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_utils, ".*", {git, "https://github.com/processone/p1_utils";, {tag, "1.0.6"}}},
+-        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab";, {tag, "1.0.5"}}},
+-        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls";, {tag, "1.0.9"}}},
+-        {stringprep, ".*", {git, "https://github.com/processone/stringprep";, {tag, "1.0.7"}}},
+-        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml";, {tag, "1.1.18"}}},
+-        {xmpp, ".*", {git, "https://github.com/processone/xmpp";, {tag, "1.1.4"}}},
+-        {stun, ".*", {git, "https://github.com/processone/stun";, {tag, "1.0.9"}}},
+-        {esip, ".*", {git, "https://github.com/processone/esip";, {tag, "1.0.10"}}},
+-        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml";, {tag, "1.0.7"}}},
+-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy";, {tag, "0.14.8"}}},
 -        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2";, {tag, "0.6.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"}}}},
+-                                               {tag, "1.0.2"}}}},
 -        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql";,
--                                               {tag, "1.1.0"}}}},
+-                                               {tag, "1.1.1"}}}},
 -        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3";,
 -                                               {tag, "1.1.5"}}}},
 -        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam";,
@@ -31,12 +32,7 @@ Deps are handled by pkgsrc.
 -        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib";,
 -                                           {tag, "1.0.1"}}}},
 -        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client";,
--                                           "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
--        %% Forces correct dependency for riakc and allow using newer meck version)
--        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang";,
--                                              "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
+-                                           {tag, "2.4.1"}}}},
 -        %% Elixir support, needed to run tests
 -        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir";,
 -                                              {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}},
@@ -44,7 +40,7 @@ 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.2"}}}},
+-                                            {tag, "1.0.3"}}}},
 -        {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";,
@@ -55,3 +51,14 @@ Deps are handled by pkgsrc.
  {if_var_true, latest_deps,
   {floating_deps, [cache_tab,
                    fast_tls,
+@@ -68,8 +28,8 @@
+ 
+ {erl_opts, [nowarn_deprecated_function,
+             {i, "include"},
+-          {i, "deps/fast_xml/include"},
+-          {i, "deps/xmpp/include"},
++          {i, "@LOCALBASE@/lib/erlang/lib/fast_xml/include"},
++          {i, "@LOCALBASE@/lib/erlang/lib/xmpp/include"},
+             {if_var_false, debug, no_debug_info},
+             {if_var_true, debug, debug_info},
+             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
Home | Main Index | Thread Index | Old Index