mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 13:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
280568d50b
aports/community/eturnal/002-fix-tests.patch
Linux User 1084047354 community/eturnal: update to 1.10.1-r2 
should now also build on riscv
2023-04-18 15:00:41 +00:00

176 lines
7.9 KiB
Diff
Raw Blame History

diff --git a/rebar.config b/rebar.config
index 676736e..7fedfd3 100644
--- a/rebar.config
+++ b/rebar.config
@@ -11,7 +11,6 @@
[{release, {eturnal, {cmd, "scripts/get-version"}},
[eturnal,
sasl,
- runtime_tools,
recon,
% For mod_stats_influx:
{influx_udp, none},
@@ -21,9 +20,10 @@
{prometheus_httpd, none},
{prometheus, none},
{accept, none},
- {inets, none}]},
+ {inets, none},
+ {ssl, none}]},
% We don't use {mode, dev}: https://github.com/erlang/rebar3/issues/2598
- {dev_mode, true},
+ {dev_mode, false}, % See: https://github.com/erlang/rebar3/issues/2739
{debug_info, keep},
{include_erts, false},
{include_src, true},
@@ -120,10 +120,12 @@
filter => "*.erl",
ruleset => erl_files,
rules =>
- [{elvis_style, no_if_expression, disable},
+ [{elvis_style, no_import, disable},
+ {elvis_style, no_if_expression, disable},
{elvis_style, no_catch_expressions, #{ignore => [{eturnal, log_control_listener}]}},
{elvis_style, no_spec_with_records, #{ignore => [eturnal_cert]}},
{elvis_style, atom_naming_convention, #{ignore => [eturnal_cert]}},
+ {elvis_style, export_used_types, #{ignore => [eturnal_misc]}},
{elvis_style, macro_names, #{ignore => [eturnal_module]}},
{elvis_text_style, line_length, #{limit => 80}}]},
#{dirs => ["."],
@@ -139,43 +141,19 @@
[{config, "config/shell.config"}]}.
{profiles,
+ % Production release:
[{prod,
[{relx,
- [{mode, prod},
- {overlay,
- [{template, "scripts/stun", "bin/stun"}]}]}]},
- % Stripped-down binary release:
- {stripped,
- [{relx,
- [{mode, prod},
- {overlay,
- [{template, "scripts/stun", "bin/stun"}]},
- {exclude_apps,
- [sasl,
- runtime_tools,
- recon,
- compiler, % Unused 'p1_utils' dependency.
- quantile_estimator]}]}, % Unused 'prometheus' dependency.
- {erl_opts,
- [no_debug_info,
- deterministic]}]},
- % Cross compilation:
- {cross,
- [{relx,
- % We don't use {mode, prod}: https://github.com/erlang/rebar3/issues/2598
[{dev_mode, false},
{debug_info, strip},
- {include_erts, "lib/erlang"},
- {system_libs, "lib/erlang/lib"},
+ {system_libs, true},
+ {include_erts, true},
{include_src, false},
{overlay,
- [{template, "scripts/stun", "bin/stun"}]},
+ [{template, "client/stun", "bin/stun"}]},
{exclude_apps,
- [sasl,
- runtime_tools,
- recon,
- compiler, % Unused 'p1_utils' dependency.
- quantile_estimator]}]}, % Unused 'prometheus' dependency.
+ [compiler, % Unused 'p1_utils' dependency.
+ quantile_estimator]}]}, % Unused 'prometheus' dependency.
{erl_opts,
[no_debug_info,
deterministic]}]},
@@ -221,11 +199,15 @@
{plugins, [{rebar3_archive_plugin, "0.0.2"}]}]}]}.
{pre_hooks,
- [{release, "chmod o-rw config/eturnal.yml"},
+ [{clean, "rm -f client/stun"},
+ {release, "escript client/build client/stun"},
+ {release, "chmod o-rw config/eturnal.yml"},
+ {tar, "escript client/build client/stun"},
{tar, "chmod o-rw config/eturnal.yml"}]}.
{plugins,
- [rebar3_lint]}.
+ [rebar3_appup_plugin,
+ rebar3_lint]}.
{alias,
[{check,
diff --git a/rebar.lock b/rebar.lock
index 9277535..1a7a403 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,47 +1,47 @@
{"1.2.0",
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},1},
{<<"conf">>,{pkg,<<"conf">>,<<"0.2.6">>},0},
- {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.15">>},1},
- {<<"fast_yaml">>,{pkg,<<"fast_yaml">>,<<"1.0.33">>},1},
+ {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.16">>},1},
+ {<<"fast_yaml">>,{pkg,<<"fast_yaml">>,<<"1.0.36">>},1},
{<<"influx_udp">>,{pkg,<<"influx_udp">>,<<"1.1.2">>},0},
{<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},1},
{<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.2">>},1},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.8.2">>},1},
+ {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.10.0">>},1},
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},0},
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},2},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.2">>},0},
- {<<"stun">>,{pkg,<<"stun">>,<<"1.2.5">>},0},
+ {<<"recon">>,{pkg,<<"recon">>,<<"2.5.3">>},0},
+ {<<"stun">>,{pkg,<<"stun">>,<<"1.2.7">>},0},
{<<"ulitos">>,{pkg,<<"ulitos">>,<<"0.4.0">>},1},
{<<"yval">>,{pkg,<<"yval">>,<<"1.0.10">>},1}]}.
[
{pkg_hash,[
{<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
{<<"conf">>, <<"EE45DBA0F258309294AA47973711959ED4FC9428F44EB6CD3DBA9499183D0533">>},
- {<<"fast_tls">>, <<"398E7BA1076DB139307EBEA839428E2836AB682E4DAC61D95B4705A26AFF06B7">>},
- {<<"fast_yaml">>, <<"5C735DA21A4D23B7ED592603B1CD7ABA25F91A735D3C0A8DF2816D335A8DEF6E">>},
+ {<<"fast_tls">>, <<"85FA7F3112EA4FF5CCB4F3ABADC130A8C855AD74EB00869487399CB0C322D208">>},
+ {<<"fast_yaml">>, <<"65413A34A570FD4E205A460BA602E4EE7A682F35C22D2E1C839025DBF515105C">>},
{<<"influx_udp">>, <<"105FD7DFF2FCCC2FFD910094401440D24A6A0F7136F54E7E70A52EA52574FE3C">>},
{<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
{<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>},
- {<<"prometheus">>, <<"B88F24279DD7A1F512CB090595FF6C88B50AAD0A6B394A4C4983725723DCD834">>},
+ {<<"prometheus">>, <<"792ADBF0130FF61B5FA8826F013772AF24B6E57B984445C8D602C8A0355704A1">>},
{<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
{<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
- {<<"recon">>, <<"CBA53FA8DB83AD968C9A652E09C3ED7DDCC4DA434F27C3EAA9CA47FFB2B1FF03">>},
- {<<"stun">>, <<"9EE4B0589D129ABF227859FD6DE6055613446AA8914AF69F60402FFD1C54B353">>},
+ {<<"recon">>, <<"739107B9050EA683C30E96DE050BC59248FD27EC147696F79A8797FF9FA17153">>},
+ {<<"stun">>, <<"D6BDCF0AA72C927FBE8B779FC4EF1F3916C5450B2FF136C800A7A0361FB1DDFF">>},
{<<"ulitos">>, <<"BCDF0528AF4B59F1CB7D710E4B056688751C600833F31F504FEC4BAA88F0F42B">>},
{<<"yval">>, <<"DE3073183A612C39612EE2970C8B40B465D64A5316D320105E308E011F8646B0">>}]},
{pkg_hash_ext,[
{<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
{<<"conf">>, <<"C1539AD3420E18A57E92AEA16F5E43A21E3E120F45B937011952634DDCB13287">>},
- {<<"fast_tls">>, <<"EF516AA226DE9A4605704C18499284CD4FC115A73BD72490341972CE0C2B4D30">>},
- {<<"fast_yaml">>, <<"EFA60A2ACBCD2C2E72EB5E16F1475726B9D88AFCA3AD6DBB4BC549266863E7C8">>},
+ {<<"fast_tls">>, <<"AA08CCA89B4044E74F1F12E399817D8BEAEAE3EE006C98A893C0BFB1D81FBA51">>},
+ {<<"fast_yaml">>, <<"1ABE8F758FC2A86B08EDFF80BBC687CFD41EBC1412CFEC0EF4A0ACFCD032052F">>},
{<<"influx_udp">>, <<"740DCC6B0F0F376B929A9270E5F4F6EEFD5061635E76C8FCC0508F8B336F1A82">>},
{<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
{<<"poolboy">>, <<"DAD79704CE5440F3D5A3681C8590B9DC25D1A561E8F5A9C995281012860901E3">>},
- {<<"prometheus">>, <<"C3ABD6521E52CEC4F0D8ECA603CF214DFC84D8A27AA85946639F1424B8554D98">>},
+ {<<"prometheus">>, <<"2A99BB6DCE85E238C7236FDE6B0064F9834DC420DDBD962AAC4EA2A3C3D59384">>},
{<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
{<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
- {<<"recon">>, <<"2C7523C8DEE91DFF41F6B3D63CBA2BD49EB6D2FE5BF1EEC0DF7F87EB5E230E1C">>},
- {<<"stun">>, <<"63BB44264EAD2963BEB84BE62352CD9082F02661059BCBAD20AC6710380710E1">>},
+ {<<"recon">>, <<"6C6683F46FD4A1DFD98404B9F78DCABC7FCD8826613A89DCB984727A8C3099D7">>},
+ {<<"stun">>, <<"3FB1F07AAA630B2276E83D267557D1CEB3D2CE52D1145DE71864160210655852">>},
{<<"ulitos">>, <<"AFDCE50A77081EB8D931799A6E015458482EABF9BA8AF367C50CD8660A749B88">>},
{<<"yval">>, <<"0F7EFF50CB24F5F6CC3549FC54BFE4AF58B3FC4553B0829325BAA199C48BA276">>}]}
].
Reference in New Issue View Git Blame Copy Permalink