-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
erlang: update to 25.3 #5829
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
erlang: update to 25.3 #5829
Changes from 14 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
4288f32
erlang: update to 25.3
hgy59 839cbcf
rabbitmq: update to v3.11.20
hgy59 39164e1
ejabberd: update to v23.04
hgy59 7087815
ejabberd: fix packaging of config files
hgy59 07755b1
ejabberd: provide a copy of the new config files on upgrade
hgy59 462a95f
Merge branch 'master' of https://github.com/hgy59/spksrc into update_…
hgy59 2eb41aa
native/elixir: disable parallel make to fix bootstrap race condition
mreid-tt 234d5b4
Update erlang to 25.3.2.7, rabbitmq to 3.11.28, ejabberd to 23.10
mreid-tt 9828cbb
erlang: update to 25.3.2.21 with OpenSSL include fix
mreid-tt 6e03a67
native/elixir: update to 1.15.8
mreid-tt bd6b087
native/erlang: roll-back to 25.3
mreid-tt 50ac7c3
fix rabbitmq configuration for DSM 7
hgy59 57e1b1c
ejabberd: fix config path for DSM 7+
mreid-tt e0bcf98
fix INSTALL_PREFIX_VAR
hgy59 3196bc9
ejabberd: fixes
hgy59 6e5353f
Revert "fix INSTALL_PREFIX_VAR"
mreid-tt 4f64387
Merge branch 'master' into pr/5829
mreid-tt d49250e
Merge branch 'master' into pr/5829
mreid-tt 0d2dd98
rabbitmq: Add CLI tools with proper permission handling
mreid-tt 8ee216a
ejabberd: Add config-based admin ACL migration for upgrades
mreid-tt fde490f
rabbitmq: Add DSM 7 upgrade data migration and fix CLI wrapper permis…
mreid-tt b26cedc
rabbitmq: Add web interface shortcut
mreid-tt ba7c817
ejabberd: Improve install wizard user experience
mreid-tt b909ee3
ejabberd: Support custom domain while preserving localhost access
mreid-tt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| ejabberd-21.07.tgz SHA1 9d78b5bf034ce6a704d0fb83b1721fa5dfbd20bc | ||
| ejabberd-21.07.tgz SHA256 0e90cfd6c03191ca8aef344b9d543a038e272770be14c2288d83cc4d34825868 | ||
| ejabberd-21.07.tgz MD5 e37000934aea83e3465a7bbbef903193 | ||
| ejabberd-23.10.tar.gz SHA1 dd7143054ac56448b56c8f76bedd6aec374307d8 | ||
| ejabberd-23.10.tar.gz SHA256 0d6e7f0d82d91cda89e2575d99a83507413da2ffde39b2151804947a2a0fa258 | ||
| ejabberd-23.10.tar.gz MD5 c91ae2f93c4c4cd7b00e9cb30ac6044d |
12 changes: 6 additions & 6 deletions
12
cross/ejabberd/patches/001-replace-etc_ejabberd_by_var.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| --- Makefile.in.orig 2020-12-15 14:40:16.000000000 +0000 | ||
| +++ Makefile.in 2020-12-26 13:46:43.686744701 +0000 | ||
| @@ -8,8 +8,8 @@ | ||
| --- Makefile.in.orig 2023-04-18 09:39:33.000000000 +0000 | ||
| +++ Makefile.in 2023-08-04 08:54:24.628004111 +0000 | ||
| @@ -9,8 +9,8 @@ | ||
|
|
||
| DESTDIR = | ||
|
|
||
| -# /etc/ejabberd/ | ||
| -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd | ||
| -ETCDIR = @sysconfdir@/ejabberd | ||
| +# /etc/ejabberd/ => /var/ | ||
| +ETCDIR = $(DESTDIR)@prefix@/var | ||
| +ETCDIR = @localstatedir@ | ||
|
|
||
| # /bin/ | ||
| BINDIR = $(DESTDIR)@bindir@ | ||
| BINDIR = @bindir@ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| erlang-OTP-24.3.4.13.tar.gz SHA1 317bf729e86538300a6b530933dce63c8a15c0b5 | ||
| erlang-OTP-24.3.4.13.tar.gz SHA256 c5c26cf77d6336ef85d3ba7b99b68723847c10f4928f4cbed8ef2c664ca96255 | ||
| erlang-OTP-24.3.4.13.tar.gz MD5 4400a009bbc21afc5995ce664520d45f | ||
| erlang-OTP-25.3.2.21.tar.gz SHA1 dd3427f49265d281753dac35e7ab6766ecf4976e | ||
| erlang-OTP-25.3.2.21.tar.gz SHA256 6761432927a9be4f5c13c4019acd6fa3d2f4363198f790947328023aece1986f | ||
| erlang-OTP-25.3.2.21.tar.gz MD5 54a837341adb9b5e11bba191238d808f |
16 changes: 8 additions & 8 deletions
16
cross/erlang/patches/000-configure-add-ncursesw-to-termcap-libraries.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| # add ncursesw to termcap libraries to link with ncursesw | ||
| # | ||
| --- erts/configure.orig 2021-09-17 08:20:27.000000000 +0000 | ||
| +++ erts/configure 2022-01-16 01:20:16.435834858 +0000 | ||
| @@ -13719,7 +13719,7 @@ | ||
| if test "x$with_termcap" != "xno" && | ||
| test "X$host" != "Xwin32"; then | ||
| # | ||
| --- erts/configure.orig | ||
| +++ erts/configure | ||
| @@ -15563,7 +15563,7 @@ | ||
| then : | ||
|
|
||
| # try these libs | ||
| - termcap_libs="tinfo ncurses curses termcap termlib" | ||
| + termcap_libs="tinfo ncursesw ncurses curses termcap termlib" | ||
|
|
||
| for termcap_lib in $termcap_libs; do | ||
| as_ac_Lib=`$as_echo "ac_cv_lib_$termcap_lib''_tgetent" | $as_tr_sh` | ||
| as_ac_Lib=`printf "%s\n" "ac_cv_lib_$termcap_lib""_tgetent" | $as_tr_sh` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- lib/erl_interface/src/Makefile.in.orig | ||
| +++ lib/erl_interface/src/Makefile.in | ||
| @@ -108,7 +108,7 @@ endif | ||
|
|
||
| WARNFLAGS += -DEI_NO_DEPR_WARN | ||
|
|
||
| -CFLAGS = @DED_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) \ | ||
| +CFLAGS = -Iopenssl/include @DED_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) \ | ||
| -DERLANG_OPENSSL_INTEGRATION | ||
| DED_LD = @DED_LD@ | ||
| DED_LDFLAGS = @DED_LDFLAGS@ | ||
| --- erts/emulator/Makefile.in.orig | ||
| +++ erts/emulator/Makefile.in | ||
| @@ -182,7 +182,7 @@ endif | ||
| # If type isn't one of the above, it *is* opt type... | ||
| override TYPE=opt | ||
| TYPEMARKER = | ||
| -TYPE_FLAGS = @CFLAGS@ | ||
| +TYPE_FLAGS = -Iopenssl/include @CFLAGS@ | ||
| endif | ||
| endif | ||
| endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| rsc:lib/rabbitmq_server-3.10.24/INSTALL | ||
| rsc:lib/rabbitmq_server-3.10.24/LICENSE* | ||
| rsc:lib/rabbitmq_server-3.10.24/escript/ | ||
| rsc:lib/rabbitmq_server-3.10.24/plugins/ | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-defaults | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-diagnostics | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-env | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-plugins | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-queues | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-server | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-streams | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-tanzu | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmq-upgrade | ||
| rsc:lib/rabbitmq_server-3.10.24/sbin/rabbitmqctl | ||
| rsc:lib/rabbitmq_server-3.11.28/INSTALL | ||
| rsc:lib/rabbitmq_server-3.11.28/LICENSE* | ||
| rsc:lib/rabbitmq_server-3.11.28/escript/ | ||
| rsc:lib/rabbitmq_server-3.11.28/plugins/ | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-defaults | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-diagnostics | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-env | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-plugins | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-queues | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-server | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-streams | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-tanzu | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmq-upgrade | ||
| rsc:lib/rabbitmq_server-3.11.28/sbin/rabbitmqctl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| rabbitmq-server-3.10.24.tar.xz SHA1 2b283ef27bb3cf347995828b3ffe983563ff4e43 | ||
| rabbitmq-server-3.10.24.tar.xz SHA256 036ebf9f42e25fd2fba9458dc18b3ce39083caead9890754eef56e0e4c3179ad | ||
| rabbitmq-server-3.10.24.tar.xz MD5 9be567a20b0f437d5d2ee14347fd02dd | ||
| rabbitmq-server-3.11.28.tar.xz SHA1 2e2098b894dd0eb727edec466669e9fd1ee49d73 | ||
| rabbitmq-server-3.11.28.tar.xz SHA256 85e3b3621b6a127214f13b753f9afd9776d8652f6b1469e49d98027f75f41caa | ||
| rabbitmq-server-3.11.28.tar.xz MD5 3f66edcc403bc735a1aae0f465a75a09 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| v1.14.5.tar.gz SHA1 69c852438fa229c22c24a299b71018c8230852cc | ||
| v1.14.5.tar.gz SHA256 2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd | ||
| v1.14.5.tar.gz MD5 fb5ed0ed8ae7007af761b778b72ab9d0 | ||
| elixir-1.15.8.tar.gz SHA1 a79d2fc9535fd6513b33e704e23164da27766397 | ||
| elixir-1.15.8.tar.gz SHA256 09e697ab13fc60f27adaba9b71f8793105acd4320a89b16be0ceb4a13426d779 | ||
| elixir-1.15.8.tar.gz MD5 22feda0b61f3bdcc8083e05b004d2ed2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| erlang-OTP-24.3.tar.gz SHA1 a8cee583409e4b6648208c8b8b6c0cb8693b6ff0 | ||
| erlang-OTP-24.3.tar.gz SHA256 82e821102a083073e7e088961bcd98b9f5fc4608b05702d8c36a9c7d917e8d71 | ||
| erlang-OTP-24.3.tar.gz MD5 747d76df2cc844f55ae47c4fa98c06f3 | ||
| erlang-OTP-25.3.tar.gz SHA1 0922892c4a83a5c1b7bd31c6e4abc1bbcaffffc5 | ||
| erlang-OTP-25.3.tar.gz SHA256 f4fc2c5e1da56eb659003015ab80c42e50cef1129cca8c14457a522d1793498d | ||
| erlang-OTP-25.3.tar.gz MD5 31a0ab7f49316bb16e849566fff4ee4a |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [ejabberd] | ||
| title="ejabberd" | ||
| desc="ejabberd" | ||
| [ejabberd_webui] | ||
| title="HTTP(S)" | ||
| desc="ejabberd web UI" | ||
| port_forward="yes" | ||
| dst.ports="5280/tcp" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.