Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-18 17:24:31 +01:00
Code Releases Activity
9,674 Commits 7 Branches 109 Tags 67 MiB
eb6f242d99
Commit Graph

322 Commits

Author SHA1 Message Date
Badlop
f61f5beb5b Copy include/ files for ejabberd, deps and otp, as "mix release" lacks that 2022-04-21 16:01:47 +02:00
Paweł Chmielowski
5744d44e68 Fix compatibility with older mix versions 2022-04-08 18:26:07 +02:00
Holger Weiss
871e26a01e mix.exs: Don't allow admins to override boot flags 
Add the -boot and -boot_var options via ERLANG_OPTS rather than
ERL_OPTIONS.  The difference is that administrators might override the
latter in the ejabberdctl.cfg file, which isn't desired as the boot
flags must be specified exactly that way in a Mix-generated release
(otherwise, ejabberd would fail to start up).
 2022-03-10 16:29:32 +01:00
Badlop
ce8c2ca0fd Add fine-grained Elixir version requirement 
1.4 is accepted in general
1.10 is required to build OTP releases
1.11 is required to run 'make relive'
lower than 1.11.4 requires Erlang lower than 24 to build releases
 2022-03-10 13:09:35 +01:00
Badlop
1e1b72572f Add -boot and -boot_var in ejabberdctl instead of adding vm.args 2022-03-10 13:09:33 +01:00
Badlop
2f92dc40df Let's assume ex_doc is no longer needed 
It was added in e6f72333
 2022-03-10 13:09:28 +01:00
Badlop
a846260d6e Update ejabberd to not use Distillery (#3788) 2022-03-10 13:09:24 +01:00
Badlop
f721374321 Determine compile definitions based on Erlang version 
This gives a clear definition of what erlang versions require each
workaround, instead of depending on the actual workaround details.
The lib module was removed in OTP 21.0,
and the formatting options were moved to erl_error.
The uri_string module was introduced in OTP 21.0.
 2022-02-24 21:39:20 +01:00
Badlop
7381b9db85 Fix bug introduced in 8d8a3177 (#3782) 2022-02-24 21:39:14 +01:00
Badlop
265e0610a3 Update to jiffy 1.1.1 and p1_acme 1.0.18 to support Erlang/OTP 25.0-rc1 2022-02-24 01:02:53 +01:00
Badlop
22b469f55d The lager dependency is used only with old Erlang versions 2022-02-24 01:02:41 +01:00
Holger Weiss
aad04bba91 mix.exs: Don't forget to include epam/luerl 
If --enable-lua and/or --enable-pam was specified, include the
corresponding applications with Mix releases.
 2022-02-21 00:34:02 +01:00
Holger Weiss
da516d64d4 mix.exs: Be more careful while editing the version 
Make sure only leading zeroes are removed while turning the ejabberd
version into SemVer format for Mix.  For example, remove the zero in
"21.04", but keep the zero in "21.12.102".
 2022-02-21 00:02:31 +01:00
Paweł Chmielowski
2dc153751d Put esip in mix included_applications only when it's enabled 2022-02-18 21:48:26 +01:00
Badlop
f7c7d784c4 Detect debug option, and maybe disable debug_info 
As explained in https://hexdocs.pm/mix/1.13.2/Mix.Tasks.Compile.Erlang.html
> The option :debug_info is always added to the end of it. You can disable that using:
> erlc_options: [debug_info: false]
 2022-02-11 09:39:16 +01:00
Badlop
0b9263bc15 Add forgotten option NO_CUSTOMIZE_HOSTNAME_CHECK to mix.exs 2022-02-11 09:39:15 +01:00
Badlop
e63e8a6d38 Fix typo introduced in 99fdba0, present since 16.01 2022-02-11 09:39:09 +01:00
Badlop
37d2bdd90d Some dependencies are optional, check them in mix.exs 2022-02-11 09:39:07 +01:00
Badlop
61dc89a068 Update Luerl to 1.0.0, now available in Hex.pm (rvirding/luerl#142) 2022-01-04 21:32:23 +01:00
Badlop
7c9b47fb78 Fix "make rel" when using mix, broken after 94a733c66 2022-01-04 17:31:30 +01:00
Badlop
0f9a0156c6 Handle mix version when running docker-ejabberd/ecs/build.sh latest 2021-12-08 16:31:36 +01:00
Badlop
68ea5834c8 Relax strictness in mix dependency versions 2021-12-08 16:31:34 +01:00
Paweł Chmielowski
8d8a3177e1 Eliminate xref warning from last commit 2021-12-06 15:46:52 +01:00
Paweł Chmielowski
ad3c91b86e Update mix deps 2021-11-29 15:36:57 +01:00
Badlop
689749a563 Update Jose to 1.11.1 (the last in hex.pm correctly versioned) 2021-11-17 13:22:34 +01:00
Alexey Shchepin
5d48329a3f Update 'xmpp' dependency 2021-10-29 05:48:03 +03:00
Holger Weiss
6b0fa44386 Update 'xmpp' dependency 
Fixes #3529.
 2021-10-09 10:56:30 +02:00
Holger Weiss
8f8de0403b PubSub: Support 'max_items=max' node configuration 
Let clients request the maximum limit for the node configuration option
'max_items' by specifying the special value 'max' instead of an integer.
This was added to XEP-0060, revision 1.17.0 (and clarified in revision
1.20.0).

Thanks to Ammonit Measurement GmbH for sponsoring this work.
 2021-08-20 20:30:11 +02:00
Badlop
8e553decb0 When vsn is an exact tag, append .0 to satisfy SemVer 2021-07-26 16:36:21 +02:00
Paweł Chmielowski
e3875482ba Remove stringprep override from mix.exs 2021-07-26 16:06:43 +02:00
Badlop
cf72c5ee18 Remove leading zeros in ejabberd version number to satisfy Elixir SemVer 2021-07-21 21:29:04 +02:00
Badlop
e31919914b Add support to build release with back to old Elixir 1.10.3 
However, to build a release with OTP 24 requires Elixir 1.11.4 or higher
 2021-07-16 13:36:27 +02:00
Badlop
f35d304582 Minor mix.exs definitions copied from the template file 2021-07-16 13:36:20 +02:00
Badlop
8ca12d4d23 Add support to build release with mix 2021-07-16 13:36:19 +02:00
Badlop
72e069d9ec Get ejabberd version from vars.config 2021-07-16 13:36:17 +02:00
Badlop
df8b0cb1a5 Add sql to package files (#3251) 2021-07-16 13:36:15 +02:00
Badlop
a00a11e38a Add vars.config to package files: version and cond_deps use it 2021-07-16 13:36:13 +02:00
Badlop
94949c9617 Sort package files 2021-07-16 13:36:10 +02:00
Badlop
e2aaca7cdd Update mix applications list to fix error "p1_utils is listed as both..." 2021-07-16 13:36:04 +02:00
Paweł Chmielowski
2458f55837 Update stringprep in mix 2021-06-18 11:45:18 +02:00
Badlop
9a93562b94 Revert luerl from v0.4 which has a compilation warning; v0.3 is enough 
Revert "Update luerl dependency from v0.3 to v0.4"

This reverts commit 64f3f3287a.
 2021-06-08 19:00:46 +02:00
Badlop
2c20414453 Update eredis dependency from v1.0.8 to v1.2.0 2021-05-28 16:54:58 +02:00
Badlop
64f3f3287a Update luerl dependency from v0.3 to v0.4 2021-05-28 16:53:09 +02:00
Badlop
1befa8d8b7 Update lager dependency from 3.6.10 to 3.9.1 to make Dialyzer happy 2021-05-28 16:51:59 +02:00
Badlop
b860a25c82 When using OTP 24.0, use the new 'application' record definition (#3568) 
This fixes "ejabberdctl update_list", "update", and the equivalent feature
on ejabberd's WebAdmin that got broken when using Erlang/OTP 24
 2021-04-14 17:12:08 +02:00
Jérôme Sautret
4468c87115 Set version to 21.04 2021-04-07 17:23:30 +02:00
Badlop
815030a4f0 I think no need to be so strict in mix dependencies versions 2021-03-24 23:03:53 +01:00
Badlop
33fc320f1d Update jiffy and epam to fix compilation (#3413) 2021-03-12 20:50:46 +01:00
Badlop
9fbea40721 Sort dependencies alphabetically, it makes manual checking easier 2021-03-12 20:50:44 +01:00
Badlop
1b155ed6e7 Add --enable-lua, and use that for luerl instead of --enable-tools (#3508) 
--enable-tools is for development tools, but prosody2ejabberd is used at
runtime, so better move luerl to --enable-lua
 2021-03-08 16:33:06 +01:00
Badlop
c45b526ec3 Update sql_query record to handle the Erlang/OTP 24 compiler reports 
As mentioned in the Erlang/OTP 24 announcement:
"Compiler warnings and errors now include column numbers
in addition to line numbers."
 2021-03-04 16:41:24 +01:00
Jerome Sautret
fca41796c0 Fix version number 2021-01-29 16:00:35 +01:00
Jerome Sautret
b1fec7dc29 Bump version in mix.exs 2021-01-29 10:01:29 +01:00
Paweł Chmielowski
ee3ecc6cc0 Update mix deps 2021-01-28 11:04:53 +01:00
Holger Weiss
b6f86187f3 Update 'stun' dependency 
The 'stun' application now rejects Teredo and 6to4 TURN peers
unconditionally.  Therefore, remove those networks from the default
'turn_blacklist'.
 2021-01-22 16:12:48 +01:00
Paweł Chmielowski
778c84dac9 Update xmpp dep in mix 2020-12-15 17:07:06 +01:00
Paweł Chmielowski
8dfe7e977a Bump version in mix.exs 2020-12-15 15:27:16 +01:00
Paweł Chmielowski
34e615d854 Update deps in mix 2020-12-15 15:24:57 +01:00
Paweł Chmielowski
ee76581b49 Add rebar.config* files when publishing to hex from mix 
This should help with issue #3354
 2020-08-11 10:09:23 +02:00
Badlop
8aa0f7073f Copy Erlang compilation definitions from rebar.config to Docker (#3350) 2020-08-10 12:29:40 +02:00
Mickael Remond
b109c5927e
Update mix.exs ejabberd version 2020-07-30 18:32:31 +02:00
Paweł Chmielowski
23beaa9fad Update mix dependencies 2020-07-30 17:57:52 +02:00
Holger Weiss
cff7c4c100 Update 'stun' dependency to tagged version 2020-07-11 17:53:33 +02:00
Holger Weiss
3bf7fbc117 ejabberd_stun: Filter info/debug messages 
Update 'stun' dependency, and drop the info/debug messages now logged by
the 'stun' application if OTP's new logging API is used.
 2020-07-01 21:53:22 +02:00
Holger Weiss
c6bbdafe92 Update 'yconf' dependency to fix Erlang/OTP 19.x 2020-06-05 20:24:17 +02:00
Holger Weiss
266691f929 Update 'yconf' dependency 
Fixes #3295.
 2020-06-05 17:02:06 +02:00
Holger Weiss
7a37483307 Rename 'turn_v4_ip' and 'turn_v6_ip' options 
The 'turn_ipv4_address' and 'turn_ipv6_address' option names are
probably more intuitive.
 2020-05-29 18:40:19 +02:00
Holger Weiss
56d00e427d ejabberd_stun: Add 'turn_blacklist' option 
The new 'turn_blacklist' listener option allows for specifying one or
more IP addresses and/or subnet addresses/masks.  The TURN server will
refuse to relay traffic from/to blacklisted IP addresses.  By default,
Teredo and 6to4 addresses are blacklisted, as mandated by RFC 6156
(section 9.1).
 2020-05-21 21:46:02 +02:00
Holger Weiss
83fa637569 ejabberd_stun: Support IPv6 for TURN 
The stun application now supports RFC 6156: TURN Extension for IPv6, and
therefore needs separate IPv4 and IPv6 relay addresses.
 2020-05-19 21:42:41 +02:00
Holger Weiss
858bfb4b80 Let ejabberd_stun listen on IPv6 sockets 
The stun application now allows IPv6 clients to perform STUN requests
and to allocate TURN relays.
 2020-05-19 20:22:58 +02:00
Jerome Sautret
724d09a510 Set ejabberd version to 20.04 2020-04-29 16:29:59 +02:00
Paweł Chmielowski
b56663ef07 Update dependences in mix 2020-04-28 17:23:36 +02:00
Christoph Scholz
d7c696f97c mix.exs: Update 'xmpp' and 'stun' 2020-04-23 20:05:40 +02:00
Licaon_Kter
d9131c854d
Bump jiffy so it compiles on older GCC (#3218) 
* Update jiffy

* And here
 2020-04-23 13:29:33 +02:00
Jerome Sautret
633b362577 Increase version to 20.3.0 2020-03-25 11:35:38 +01:00
Paweł Chmielowski
151b818af4 Use compilation flags used during build to compile modules in ext_mod 
This fixes issue #3178
 2020-03-03 11:25:17 +01:00
Mickaël Rémond
d0e93f9219
Merge pull request #3125 from area-42/enable_odbc_in_mix 
enable odbc in mix build
 2020-02-26 14:45:01 +01:00
Jerome Sautret
065e96d24b Bump version in mix.exs 2020-02-25 14:46:44 +01:00
Paweł Chmielowski
fb797fe071 Bump version in mix.exs 2020-01-17 11:42:11 +01:00
Paweł Chmielowski
0ad2d2120c Update xmpp in mix 2020-01-16 15:26:20 +01:00
Holger Weiss
453f6b0189 Update xmpp dependency in mix.exs and mix.lock 
Closes #3146.
 2020-01-15 14:49:37 +01:00
Christoph Scholz
8eccbade56 enable odbc in mix build 2019-12-25 00:38:48 +01:00
Mickael Remond
00c77dadd3
Update description for Hex.pm 2019-09-30 10:10:44 +02:00
Paweł Chmielowski
8918bfb55b Update deps in mix.exs/lock 2019-09-25 14:55:32 +02:00
Jerome Sautret
ce8bd343de Bump version in mix.exs 2019-09-25 14:54:12 +02:00
Mickael Remond
28feb90175
Remove fast_yaml override 2019-08-06 15:47:58 +02:00
Paweł Chmielowski
c2d97854e3 Bump version in mix.exs 2019-08-05 10:15:06 +02:00
Paweł Chmielowski
1d2fba856e Update mix deps 2019-08-05 10:14:30 +02:00
Evgeny Khramtsov
3f7d9e3ad6 Remove Riak support 
Reasons:
- Riak DB development is almost halted after Basho
- riak-erlang-client is abandoned and doesn't work
  correctly with OTP22
- Riak is slow in comparison to other databases
- Missing key ordering makes it impossible to implement range
  queries efficiently (e.g. MAM queries)
 2019-07-18 19:31:12 +03:00
Evgeny Khramtsov
794e19aaf1 Set yconf version in mix.exs explicitly 2019-06-17 19:50:44 +03:00
Evgeny Khramtsov
91d9d076f9 Synchronize macros from rebar.config with mix.exs 2019-06-17 19:30:25 +03:00
Evgeny Khramtsov
b6f037ced6 Add yconf application to mix.exs 2019-06-17 19:19:27 +03:00
Christophe Romain
44e1af25e5 Prepare 19.05 2019-05-23 13:42:50 +02:00
Paweł Dorofiejczyk
7ab7390b9c Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency 2019-04-25 13:31:08 +02:00
Christophe Romain
946baa972d Fix cond_options with new options 2019-03-11 16:58:26 +01:00
Christophe Romain
9bfe5bb618 Add mqtree in included_applications 2019-02-27 14:35:07 +01:00
Christophe Romain
683ca31375 Prepare 19.02 2019-02-26 14:40:21 +01:00
Paweł Chmielowski
ab2197c455 Update mqtree 2019-02-26 12:16:48 +01:00
Paweł Chmielowski
a8b1a58cc8 Add os_mon to included_application, but start it in ej_system_monitor 2019-01-16 15:40:10 +01:00
Paweł Chmielowski
a30bfefb98 Move some apps back to included_applications 2019-01-16 15:01:32 +01:00
Paweł Chmielowski
3f2265d457 Update xmpp in mix 2019-01-16 09:58:24 +01:00
Paweł Chmielowski
893f656df2 Reintroduce change removed in last commit by mistake 2019-01-15 16:22:58 +01:00
Paweł Chmielowski
9bd38eff1e Use tag for xmpp dependency 2019-01-15 16:18:10 +01:00
Paweł Chmielowski
604856eeb9 Update list of applications in mix.exs 
We now use normal application for starting dependencies, so we no longer
should put them in included_applications
 2019-01-15 16:17:45 +01:00
Paweł Chmielowski
768d37a29c Remove no longer used deps 2019-01-02 13:02:20 +01:00
Christophe Romain
126e4d70f7 Update distillery 2019-01-02 10:30:29 +01:00
Mickael Remond
b8d4da9792
Update ejabberd version for mix 2018-12-26 16:49:01 +01:00
Paweł Chmielowski
c88a2d0569 Add code for handling deprecations of get_stacktrace() 2018-12-13 11:46:53 +01:00
Paweł Chmielowski
ea47790807 Update mix packaging 2018-12-06 10:21:51 +01:00
Christophe Romain
932d995a1d Revert "Upgrade Elixir to 1.6.6 (#2653)" 
This reverts commit d3a9fbf62f.
rebar2 (which is still used) is not able to cope with this change
it should check lib/elixir/src/elixir.app.src instead of src/elixir.app.src
as src/elixir.app.src moved away, currently check fails and this breaks
jenkins tests.

options: use rebar3, or drop rebar completely to rely only on mix.
 2018-11-27 11:01:52 +01:00
Christophe Romain
d3a9fbf62f Upgrade Elixir to 1.6.6 (#2653) 2018-11-27 09:57:59 +01:00
Christophe Romain
8ebf31d949 Bump lager version in mix as well 2018-11-23 13:00:19 +01:00
Christophe Romain
d1e072821e Fix version in mix.exs 2018-10-09 12:23:27 +02:00
Paweł Chmielowski
989da356c4 Add pkix to included_applications 2018-10-09 11:33:39 +02:00
Paweł Chmielowski
c1521d3f13 Add pkix to mix.exs 2018-10-09 10:15:10 +02:00
Paweł Chmielowski
35136f47ed Bump version in mix.exs 2018-06-28 10:57:09 +02:00
Paweł Chmielowski
8f2233eff7 Update deps 2018-06-28 10:56:59 +02:00
Evgeniy Khramtsov
3a5d2dbed8 Move mod_irc to ejabberd-contrib 2018-06-20 12:27:44 +03:00
Christophe Romain
4f293751f0 Update mix deps 2018-06-11 14:21:35 +02:00
Rogério da Silva Yokomizo
2e529f5826 Missing #block_item{} record building with mix 
Ref: #638f2d2
 2018-05-22 16:37:39 +02:00
Christophe Romain
0bd4d1aade Update mix.exs version 2018-04-25 12:30:36 +02:00
Christophe Romain
f3b3bffec0 Get rid of 'fs' package dependency in mix 2018-03-23 14:48:17 +01:00
Paweł Chmielowski
92bc5dc85b Update mix deps 2018-03-23 13:27:58 +01:00
Christophe Romain
baf2473688 Update mix.exs version 2018-03-23 12:56:17 +01:00
Christophe Romain
7abd13974b Remove deps override on mix 2018-01-22 17:42:02 +01:00
Christophe Romain
1daa7ef785 Sync mix and rebar for eimp dep 2018-01-16 11:45:29 +01:00
Christophe Romain
8bdccc25ab Include acme deps in release, fixes f2c3fe8ac 2018-01-15 22:21:24 +01:00
Christophe Romain
f2c3fe8ac6 Add mix dependencies for acme support 2018-01-12 12:28:31 +01:00
Christophe Romain
465629d458 Prepare mix for 18.01 2018-01-10 23:06:06 +01:00
Christophe Romain
7875cac786 Update mix deps 2018-01-10 18:14:52 +01:00
Christophe Romain
88e6f1c6aa Update mix deps 2018-01-10 12:07:19 +01:00
Christophe Romain
8641c6cb34 Update mix deps 2018-01-10 11:48:53 +01:00
Mickael Remond
1fcb6d7f36
Make mysql and pgsql one of the default module for Mix 2017-12-29 17:22:59 +01:00
Christophe Romain
cdc9c93b9b Fix stun/esip mix deps 2017-12-28 15:38:24 +01:00
Christophe Romain
dd9281da13 Let mix pass compile ejabberd as dependency 2017-12-28 15:16:29 +01:00
Christophe Romain
1b8794c991 Update mix spec 2017-12-28 14:43:13 +01:00
Christophe Romain
6bdf29676c Add missing application building with mix 2017-12-27 12:33:52 +01:00
Christophe Romain
9fcc12dca7 Prepare mix for 17.12 2017-12-27 11:42:37 +01:00
Christophe Romain
e7308b7d86 Update dependencies 2017-12-26 11:13:18 +01:00
Christophe Romain
826387446a Let mix aware of unpackaged hex.pm dependencies (#2170) 2017-12-21 11:10:56 +01:00
Paweł Chmielowski
e47b016e76 Add fs as dep in mix.exs 2017-11-09 09:59:49 +01:00
Paweł Chmielowski
7121a95428 Define flags that depend on erlang version in mix.exs 2017-11-06 12:40:00 +01:00
Jorje Barrera
06cd373a18 Support for --enable-graphics in mix.exs 2017-10-24 18:02:52 +08:00
Christophe Romain
9e95150803 Fix warning when compile with newer elixir 2017-10-04 12:03:36 +02:00
Christophe Romain
d576902bd4 Prepare mix for 17.09 2017-09-28 15:21:11 +02:00
Christophe Romain
65f4094804 Prepare packaging for 17.08 2017-08-03 16:55:56 +02:00
Christophe Romain
d63ea000c7 Prepare package for 17.06-beta 2017-06-13 11:02:30 +02:00
Rene Klacan
04fd5567a7 Fix mix warnings 2017-06-04 12:24:35 +02:00
Rene Klacan
a98685e0bb Fix version to be SemVer compatible 2017-06-04 03:01:51 +02:00
Christophe Romain
0f864d9466 Mix needs include path to p1_utils 2017-03-28 16:08:10 +02:00