pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/ejabberd Update chat/ejabberd to 17.03.
details: https://anonhg.NetBSD.org/pkgsrc/rev/53285c457472
branches: trunk
changeset: 360470:53285c457472
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Thu Mar 30 14:50:05 2017 +0000
description:
Update chat/ejabberd to 17.03.
Major improvements
- New modular code allows to develop modules for a wide scope of
functionalities without patching the core code such as C2S, S2S and
router
- Now 'From' and 'To' arguments must be omitted in functions and
structures related to routing
- Ejabberd used to store all in-memory shared data such as ACLs,
proxy65, sessions, routes, clustering, etc in internal Mnesia
database and this used to be hardcoded. With new API it's now possible
to store such data in any database. However, currently only Mnesia
backend is supported.
- Dynamic configuration reload allows to reload modules, database
connections, listeners, ACLs and global options without restarting
ejabberd
- Spam protection allows to block packets from non-subscribers
- S2S dialback is now an optional module
Developer
- tools/hook_deps.sh: checks hook dependencies
- tools/find-outdated-deps.pl: checks which dependences need update
- Mark as deprecated add/get_local/global_option config functions
- Change routing API
Core
- Fix some corner cases while re-reading RFC6120
- Attach IP metadata to every stanza received from stream
- Apply SASLprep before storing/converting passwords
- Send compressed in correct order
- Reset XML stream before sending SASL success
- Speedup features list when a lot of virtual hosts configured
- Fix s2s_dns_timeout issues
- Better handling of IPv6 domains
- Rename mod_sm -> mod_stream_mgmt
- Don't count resent stanzas
- Improve startup procedure, and log startup time
- Add more processes to supervision
- sm_sql: Avoid PID collisions
Admin
- Add 'supervisor' listening option
- Accept "add_commands: admin" in commands section
- Make sure that api_permissions always have "console commands"
section
- Change name of pam dep from p1_pam to epam
- Improve compilation with rebar3
- Add TLS support for external components
- Specify "ExecReload" command in systemd unit
- Don't attempt to resolve _jabber._tcp SRV record
- Improve error reporting for forbidden servers
- mod_block_strangers: New module to block packets from
non-subscribers
- mod_register: Report password change in the log
- Remove relict mod_service_log
- Remove unused mod_ip_blacklist
- Remove ejabberd_frontend_socket
- WebAdmin: improve formatting when showing erlang terms
- Import from Prosody: Fix import of SCRAM passwords, offline
API & Commands
- get_last now always returns tuple with UTC XEP-0082 and status
- Protect users from delete_old_users command using a fixed access
rule
- Separate list of strings with \n for srg_get_info in mod_http_api
- Support non-JID lines in command create_rooms_file
- stop_all_connections now stops all s2s connections via supervisor
calls
- Support scrammed passwords in ejabberdctl import_prosody
Configuration
- Provide example mod_http_api configuration with couple commands
- Clarify new modules usage in the example config
- Don't crash on malformed IP addresses
- Fix parsing of acl/access rules inside oauth sections of
api_permissions
Config reload improvements
- Start/stop auth modules when host is added/deleted
- Improve modules start/stop procedures
- Check result of gen_mod:start/2 callback
- Improve reload_config admin command
- Invalidate access permissions on configuration reload
- Start/stop virtual hosts when reloading configuration file
- Reload modules when reloading configuration file
- Restart listeners on configuration reload
- Make sure all hooks are called with proper host
Databases
- Add missing NOT NULL restrictions in schemas
- Move archive tables into lite.sql for better comparison with other
schemas
- Implement database backend interface for mod_proxy65
- Implement database backend interface for MUC, BOSH and auth_anonyous
- Implement database backend interface for ejabberd_router
- Propagate the TRANSACTION_TIMEOUT to pgsql driver
New XMPP stream behavior
- Reflect cyrsasl API changes in remaining code
- Improve return values in cyrsasl API
- More refactoring on session management
- Add xmpp_stream_out behavior and rewrite s2s/SM code
- Rewrite ejabberd_service to use new XMPP stream API
MAM & offline storage
- Make a message is not bounced if it's archived
- Archive message before delivering it to offline storage
- Include stanza ID with archived offline messages
- Add stanza-id to every archived message
PubSub
- Avoid orphan_item leak on affiliation/subscription removal
- Fix pubsub SQL schemas, add NOT NULL restrictions
- Fix last item cache for multiple hosts
Server to server
- Several improvements of S2S errors logging
- Resolve all addresses from SRV lookup
- Add s2s work-around for gmail.com
diffstat:
chat/ejabberd/Makefile | 28 +++++----
chat/ejabberd/PLIST | 18 ++++-
chat/ejabberd/distinfo | 13 ++--
chat/ejabberd/patches/patch-rebar.config | 73 +++++++-----------------
chat/ejabberd/patches/patch-rebar.config.script | 15 +++++
5 files changed, 73 insertions(+), 74 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r ec26d413f5d9 -r 53285c457472 chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile Thu Mar 30 14:35:30 2017 +0000
+++ b/chat/ejabberd/Makefile Thu Mar 30 14:50:05 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2017/01/21 20:20:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.71 2017/03/30 14:50:05 fhajny Exp $
-DISTNAME= ejabberd-17.01
+DISTNAME= ejabberd-17.03
CATEGORIES= chat
-MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
+MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tgz
MAINTAINER= filip%joyent.com@localhost
@@ -10,24 +10,24 @@
COMMENT= Free and Open Source distributed fault-tolerant Jabber server
LICENSE= gnu-gpl-v2
-DEPENDS+= erlang-cache_tab>=1.0.6:../../devel/erlang-cache_tab
-DEPENDS+= erlang-esip>=1.0.10:../../net/erlang-esip
+DEPENDS+= erlang-cache_tab>=1.0.7:../../devel/erlang-cache_tab
+DEPENDS+= erlang-epam>=1.0.0:../../security/erlang-epam
+DEPENDS+= erlang-esip>=1.0.11:../../net/erlang-esip
DEPENDS+= erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
-DEPENDS+= erlang-fast_tls>=1.0.10:../../security/erlang-fast_tls
-DEPENDS+= erlang-fast_xml>=1.1.19:../../textproc/erlang-fast_xml
-DEPENDS+= erlang-fast_yaml>=1.0.8:../../textproc/erlang-fast_yaml
+DEPENDS+= erlang-fast_tls>=1.0.11:../../security/erlang-fast_tls
+DEPENDS+= erlang-fast_xml>=1.1.21:../../textproc/erlang-fast_xml
+DEPENDS+= erlang-fast_yaml>=1.0.9:../../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.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.2:../../databases/erlang-p1_pgsql
-DEPENDS+= erlang-p1_utils>=1.0.6:../../misc/erlang-p1_utils
+DEPENDS+= erlang-p1_utils>=1.0.7:../../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.5:../../net/erlang-xmpp
+DEPENDS+= erlang-stun>=1.0.10:../../net/erlang-stun
+DEPENDS+= erlang-xmpp>=1.1.9:../../net/erlang-xmpp
CONFLICTS+= jabberd-[0-9]*
GNU_CONFIGURE= yes
@@ -44,6 +44,8 @@
CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
+MAKE_ENV+= USE_GLOBAL_DEPS=true
+
RCD_SCRIPTS= ejabberd
BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
@@ -104,7 +106,7 @@
${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \
${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd
cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \
- ${DESTDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/sql
+ ${DESTDIR}${PREFIX}/lib/erlang/lib/${PKGNAME_NOREV}/priv/sql
.include "../../lang/erlang/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ec26d413f5d9 -r 53285c457472 chat/ejabberd/PLIST
--- a/chat/ejabberd/PLIST Thu Mar 30 14:35:30 2017 +0000
+++ b/chat/ejabberd/PLIST Thu Mar 30 14:50:05 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2017/01/21 20:20:33 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.45 2017/03/30 14:50:05 fhajny Exp $
lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -21,6 +21,7 @@
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_backend_sup.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
@@ -30,7 +31,6 @@
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
@@ -39,7 +39,6 @@
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
@@ -52,6 +51,7 @@
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
@@ -95,11 +95,13 @@
lib/erlang/lib/${PKGNAME}/ebin/mod_announce_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_block_strangers.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
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_bosh_mnesia.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
@@ -116,7 +118,6 @@
lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_irc_mnesia.beam
@@ -126,6 +127,7 @@
lib/erlang/lib/${PKGNAME}/ebin/mod_last_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_last_riak.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_last_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_legacy_auth.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_mam.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_mam_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_mam_sql.beam
@@ -156,8 +158,8 @@
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_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
@@ -166,6 +168,7 @@
lib/erlang/lib/${PKGNAME}/ebin/mod_roster_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_roster_riak.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_roster_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_s2s_dialback.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam
@@ -177,6 +180,7 @@
lib/erlang/lib/${PKGNAME}/ebin/mod_sip_proxy.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_sip_registrar.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_stream_mgmt.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
@@ -223,6 +227,9 @@
lib/erlang/lib/${PKGNAME}/ebin/str.beam
lib/erlang/lib/${PKGNAME}/ebin/translate.beam
lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmpp_stream_in.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmpp_stream_out.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmpp_stream_pkix.beam
lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
@@ -233,6 +240,7 @@
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_router.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 -r ec26d413f5d9 -r 53285c457472 chat/ejabberd/distinfo
--- a/chat/ejabberd/distinfo Thu Mar 30 14:35:30 2017 +0000
+++ b/chat/ejabberd/distinfo Thu Mar 30 14:50:05 2017 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.47 2017/01/21 20:20:33 fhajny Exp $
+$NetBSD: distinfo,v 1.48 2017/03/30 14:50:05 fhajny Exp $
-SHA1 (ejabberd-17.01.tgz) = dab6666079dae76d6ccbeb81d76d728bc3a5f210
-RMD160 (ejabberd-17.01.tgz) = 79758741046409cb6eb3219abc10cc3055dc27e7
-SHA512 (ejabberd-17.01.tgz) = d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
-Size (ejabberd-17.01.tgz) = 1638418 bytes
+SHA1 (ejabberd-17.03.tgz) = 0d84b1f99d1619428207ce5380ec8844a021f4ae
+RMD160 (ejabberd-17.03.tgz) = 72d57e7a26058496836255f0114e29ad929cc11d
+SHA512 (ejabberd-17.03.tgz) = d155102a40d810fb26786c5c38c540e931b45236751d4bc217a2b254cd87dfa44d970b4ffc3112b23ca403b3a62f56e442fa9c8aff7e349ba6ced46441c695d4
+Size (ejabberd-17.03.tgz) = 1680682 bytes
SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = b76de303d6c901305c4bdd5003f779f268a3d8d6
+SHA1 (patch-rebar.config) = 011b0dc0d511613e4056362b04fa230823316ad1
+SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff -r ec26d413f5d9 -r 53285c457472 chat/ejabberd/patches/patch-rebar.config
--- a/chat/ejabberd/patches/patch-rebar.config Thu Mar 30 14:35:30 2017 +0000
+++ b/chat/ejabberd/patches/patch-rebar.config Thu Mar 30 14:50:05 2017 +0000
@@ -1,57 +1,10 @@
-$NetBSD: patch-rebar.config,v 1.7 2017/01/21 20:20:33 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.8 2017/03/30 14:50:05 fhajny Exp $
Deps are handled by pkgsrc.
---- rebar.config.orig 2017-01-20 11:19:55.000000000 +0000
+--- rebar.config.orig 2017-03-24 08:03:23.000000000 +0000
+++ rebar.config
-@@ -18,46 +18,6 @@
- %%%
- %%%----------------------------------------------------------------------
-
--{deps, [{lager, ".*", {git, "https://github.com/basho/lager";, {tag, "3.2.1"}}},
-- {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.6"}}},
-- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls";, {tag, "1.0.10"}}},
-- {stringprep, ".*", {git, "https://github.com/processone/stringprep";, {tag, "1.0.7"}}},
-- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml";, {tag, "1.1.19"}}},
-- {xmpp, ".*", {git, "https://github.com/processone/xmpp";, {tag, "1.1.6"}}},
-- {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.8"}}},
-- {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.2"}}}},
-- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql";,
-- {tag, "1.1.2"}}}},
-- {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";,
-- {tag, "1.0.0"}}}},
-- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib";,
-- {tag, "1.0.2"}}}},
-- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client";,
-- {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"}}}}},
-- %% 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.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";,
-- {tag, "1.0.5c"}}}},
-- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis";,
-- {tag, "v1.0.8"}}}}]}.
--
- {if_var_true, latest_deps,
- {floating_deps, [cache_tab,
- fast_tls,
-@@ -79,8 +39,8 @@
+@@ -79,8 +79,8 @@
{erl_opts, [nowarn_deprecated_function,
{i, "include"},
@@ -62,3 +15,23 @@
{if_var_false, debug, no_debug_info},
{if_var_true, debug, debug_info},
{if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
+@@ -104,7 +104,7 @@
+ ]}}.
+
+ {if_var_true, elixir,
+- {lib_dirs, ["deps/elixir/lib"]}}.
++ {lib_dirs, ["@LOCALBASE@/lib/erlang/lib/elixir/lib"]}}.
+ {if_var_true, elixir,
+ {src_dirs, ["include"]}}.
+
+@@ -134,8 +134,8 @@
+
+ {eunit_compile_opts, [{i, "tools"},
+ {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_version_above, "17", {cover_enabled, true}}.
+ {cover_export_enabled, true}.
diff -r ec26d413f5d9 -r 53285c457472 chat/ejabberd/patches/patch-rebar.config.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ejabberd/patches/patch-rebar.config.script Thu Mar 30 14:50:05 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-rebar.config.script,v 1.3 2017/03/30 14:50:05 fhajny Exp $
+
+Deps are handled by pkgsrc.
Home |
Main Index |
Thread Index |
Old Index