Define base64url dependency only when using rebar2 and Erlang<24

base64url is not called directly in ejabberd code since e227940,
it is only required by p1_acme and erlang-jose 1.11.1

erlang-jose 1.11.1 defines base64url dependency as an hex package,
and rebar2 is not able to download it.
For that reason, when compiling ejabberd with rebar2,
we provide a rebar2-friendly base64url dependency definition.
That way when jose is downloaded, that dependency is already available.

.github/workflows/ci.yml

@@ -204,7 +204,7 @@ jobs:
 
     - name: Upload test logs
       if: always() && steps.ct.outcome == 'failure' && github.repository == 'processone/ejabberd'
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         publish_dir: _build/test
         exclude_assets: '.github,lib,plugins'

.github/workflows/runtime.yml

@@ -193,7 +193,7 @@ jobs:
       run: |
         sed -i "s|^modules:|modules:\n  'ModPresenceDemo': {}|g" ejabberd.yml.example
         cat ejabberd.yml.example
-        sed -i 's|^{deps, \(.*\)|{deps, \1\n  {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
+        sed -i 's|^{deps, \[\(.*\)|{deps, [{decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}},\n \1|g' rebar.config
         cat rebar.config
 
     - name: Compile

mix.exs

@@ -44,7 +44,7 @@ defmodule Ejabberd.MixProject do
   def application do
     [mod: {:ejabberd_app, []},
      applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib, :mix,
-                    :base64url, :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
+                    :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
                     :p1_utils, :stringprep, :syntax_tools, :yconf]
      ++ cond_apps(),
      included_applications: [:mnesia, :os_mon,
@@ -129,8 +129,7 @@ defmodule Ejabberd.MixProject do
   end
 
   defp deps do
-    [{:base64url, "~> 1.0"},
-     {:cache_tab, "~> 1.0"},
+    [{:cache_tab, "~> 1.0"},
      {:dialyxir, "~> 1.2", only: [:test], runtime: false},
      {:eimp, "~> 1.0"},
      {:ex_doc, "~> 0.31", only: [:dev, :edoc], runtime: false},

rebar.config

@@ -22,7 +22,10 @@
 %%% Dependencies
 %%%
 
-{deps, [{base64url, ".*", {git, "https://github.com/dvv/base64url", {tag, "1.0.1"}}},
+{deps, [{if_not_rebar3,
+         {if_version_below, "24",
+          {base64url, ".*", {git, "https://github.com/dvv/base64url", {tag, "1.0.1"}}}
+        }},
         {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.30"}}},
         {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.22"}}},
         {if_var_true, pam,

test/mam_tests.erl

@@ -492,7 +492,7 @@ send_query(Config, #mam_query{xmlns = NS} = Query) ->
     maybe_recv_iq_result(Config, NS, I),
     I.
 
-recv_fin(Config, I, QueryID, NS, IsComplete) when NS == ?NS_MAM_1; NS == ?NS_MAM_2 ->
+recv_fin(Config, I, _QueryID, NS, IsComplete) when NS == ?NS_MAM_1; NS == ?NS_MAM_2 ->
     ct:comment("Receiving fin iq for namespace '~s'", [NS]),
     #iq{type = result, id = I,
 	sub_els = [#mam_fin{xmlns = NS,

test/offline_tests.erl

@@ -142,7 +142,7 @@ unsupported_iq(Config) ->
 %%%===================================================================
 %%% Master-slave tests
 %%%===================================================================
-master_slave_cases(DB) ->
+master_slave_cases(_DB) ->
     {offline_master_slave, [sequence],
      [master_slave_test(flex),
       master_slave_test(send_all),
@@ -233,8 +233,6 @@ mucsub_mam_slave(Config) ->
     gen_mod:update_module(Server, mod_mam, #{user_mucsub_from_muc_archive => true}),
 
     Room = suite:muc_room_jid(Config),
-    MyJID = my_jid(Config),
-    MyJIDBare = jid:remove_resource(MyJID),
     ok = mam_tests:set_default(Config, always),
     #presence{} = send_recv(Config, #presence{}),
     send(Config, #presence{type = unavailable}),

test/vcard_tests.erl

@@ -119,7 +119,7 @@ xupdate_master(Config) ->
 	      sub_els = [#vcard_xupdate{hash = ImgHash}]} = recv_presence(Config),
     #iq{type = result, sub_els = []} =
 	send_recv(Config, #iq{type = set, sub_els = [#vcard_temp{}]}),
-    ?recv2(#presence{from = MyJID, type = available,
+    {_, _} = ?recv2(#presence{from = MyJID, type = available,
 		     sub_els = [#vcard_xupdate{hash = undefined}]},
 	   #presence{from = Peer, type = unavailable}),
     disconnect(Config).

tools/make-binaries

@@ -70,10 +70,10 @@ termcap_vsn='1.3.1'
 expat_vsn='2.6.2'
 zlib_vsn='1.3.1'
 yaml_vsn='0.2.5'
-ssl_vsn='3.2.1'
+ssl_vsn='3.3.0'
 otp_vsn='26.2.3'
 elixir_vsn='1.16.2'
-pam_vsn='1.5.2'
+pam_vsn='1.6.1'
 png_vsn='1.6.42'
 jpeg_vsn='9f'
 webp_vsn='1.3.2'