diff --git a/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch b/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch deleted file mode 100644 index 9da8fbd..0000000 --- a/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 23 Jul 2019 15:30:08 +0200 -Subject: [PATCH] Disable erl_crash.dump generation for EPMD checker - -Signed-off-by: Peter Lemenkov - -diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index 63c35ec..6d41141 100644 ---- a/src/rabbit_nodes_common.erl -+++ b/src/rabbit_nodes_common.erl -@@ -90,7 +90,8 @@ do_ensure_epmd(Exe, _) -> - "-sname", rabbit_misc:format("epmd-starter-~b", [ID]), - "-proto_dist", rabbit_misc:format("~p", [ProtoDist]), - "-noinput", "-s", "erlang", "halt"]}, -- exit_status, stderr_to_stdout, use_stdio]), -+ exit_status, stderr_to_stdout, use_stdio, -+ {env, [{"ERL_CRASH_DUMP_SECONDS", "0"}]}]), - port_shutdown_loop(Port). - - port_shutdown_loop(Port) -> diff --git a/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch new file mode 100644 index 0000000..60d88be --- /dev/null +++ b/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch @@ -0,0 +1,18 @@ +From: John Eckersberg +Date: Thu, 30 Oct 2014 14:01:08 -0400 +Subject: [PATCH] Allow guest login from non-loopback connections + + +diff --git a/Makefile b/Makefile +index 86db54b86..dbc33277d 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,7 @@ define PROJECT_ENV + {default_user_tags, [administrator]}, + {default_vhost, <<"/">>}, + {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, +- {loopback_users, [<<"guest">>]}, ++ {loopback_users, []}, + {password_hashing_module, rabbit_password_hashing_sha256}, + {server_properties, []}, + {collect_statistics, none}, diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch deleted file mode 100644 index c0becec..0000000 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 19 May 2016 16:04:56 +0300 -Subject: [PATCH] Remove excessive sd_notify code - -Signed-off-by: Peter Lemenkov - -diff --git a/src/rabbit.erl b/src/rabbit.erl -index e4d2ee980..fd3cc81da 100644 ---- a/src/rabbit.erl -+++ b/src/rabbit.erl -@@ -348,123 +348,9 @@ load_all_apps() -> - - broker_start(Apps) -> - start_loaded_apps(Apps), -- maybe_sd_notify(), - ok = rabbit_lager:broker_is_started(), - ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). - --%% Try to send systemd ready notification if it makes sense in the --%% current environment. standard_error is used intentionally in all --%% logging statements, so all this messages will end in systemd --%% journal. --maybe_sd_notify() -> -- case sd_notify_ready() of -- false -> -- io:format(standard_error, "systemd READY notification failed, beware of timeouts~n", []); -- _ -> -- ok -- end. -- --sd_notify_ready() -> -- case {os:type(), os:getenv("NOTIFY_SOCKET")} of -- {{win32, _}, _} -> -- true; -- {_, [_|_]} -> %% Non-empty NOTIFY_SOCKET, give it a try -- sd_notify_legacy() orelse sd_notify_socat(); -- _ -> -- true -- end. -- --sd_notify_data() -> -- "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n". -- --sd_notify_legacy() -> -- case code:load_file(sd_notify) of -- {module, sd_notify} -> -- SDNotify = sd_notify, -- SDNotify:sd_notify(0, sd_notify_data()), -- true; -- {error, _} -> -- false -- end. -- --%% socat(1) is the most portable way the sd_notify could be --%% implemented in erlang, without introducing some NIF. Currently the --%% following issues prevent us from implementing it in a more --%% reasonable way: --%% - systemd-notify(1) is unstable for non-root users --%% - erlang doesn't support unix domain sockets. --%% --%% Some details on how we ended with such a solution: --%% https://github.com/rabbitmq/rabbitmq-server/issues/664 --sd_notify_socat() -> -- case sd_current_unit() of -- {ok, Unit} -> -- io:format(standard_error, "systemd unit for activation check: \"~s\"~n", [Unit]), -- sd_notify_socat(Unit); -- _ -> -- false -- end. -- --socat_socket_arg("@" ++ AbstractUnixSocket) -> -- "abstract-sendto:" ++ AbstractUnixSocket; --socat_socket_arg(UnixSocket) -> -- "unix-sendto:" ++ UnixSocket. -- --sd_open_port() -> -- open_port( -- {spawn_executable, os:find_executable("socat")}, -- [{args, [socat_socket_arg(os:getenv("NOTIFY_SOCKET")), "STDIO"]}, -- use_stdio, out]). -- --sd_notify_socat(Unit) -> -- try sd_open_port() of -- Port -> -- Port ! {self(), {command, sd_notify_data()}}, -- Result = sd_wait_activation(Port, Unit), -- port_close(Port), -- Result -- catch -- Class:Reason -> -- io:format(standard_error, "Failed to start socat ~p:~p~n", [Class, Reason]), -- false -- end. -- --sd_current_unit() -> -- CmdOut = os:cmd("ps -o unit= -p " ++ os:getpid()), -- case catch re:run(CmdOut, "([-.@0-9a-zA-Z]+)", [unicode, {capture, all_but_first, list}]) of -- {'EXIT', _} -> -- error; -- {match, [Unit]} -> -- {ok, Unit}; -- _ -> -- error -- end. -- --sd_wait_activation(Port, Unit) -> -- case os:find_executable("systemctl") of -- false -> -- io:format(standard_error, "'systemctl' unavailable, falling back to sleep~n", []), -- timer:sleep(5000), -- true; -- _ -> -- sd_wait_activation(Port, Unit, 10) -- end. -- --sd_wait_activation(_, _, 0) -> -- io:format(standard_error, "Service still in 'activating' state, bailing out~n", []), -- false; --sd_wait_activation(Port, Unit, AttemptsLeft) -> -- case os:cmd("systemctl show --property=ActiveState -- '" ++ Unit ++ "'") of -- "ActiveState=activating\n" -> -- timer:sleep(1000), -- sd_wait_activation(Port, Unit, AttemptsLeft - 1); -- "ActiveState=" ++ _ -> -- true; -- _ = Err-> -- io:format(standard_error, "Unexpected status from systemd ~p~n", [Err]), -- false -- end. -- - start_it(StartFun) -> - Marker = spawn_link(fun() -> receive stop -> ok end end), - case catch register(rabbit_boot, Marker) of diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch deleted file mode 100644 index b193578..0000000 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: John Eckersberg -Date: Wed, 18 Feb 2015 16:11:12 -0500 -Subject: [PATCH] Add systemd notification support - - -diff --git a/src/rabbit.erl b/src/rabbit.erl -index fd3cc81da..d0ffeeb7e 100644 ---- a/src/rabbit.erl -+++ b/src/rabbit.erl -@@ -348,6 +348,11 @@ load_all_apps() -> - - broker_start(Apps) -> - start_loaded_apps(Apps), -+ case code:load_file(sd_notify) of -+ {module, sd_notify} -> SDNotify = sd_notify, -+ SDNotify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"); -+ {error, _} -> ok -+ end, - ok = rabbit_lager:broker_is_started(), - ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). - diff --git a/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch deleted file mode 100644 index 0f308fa..0000000 --- a/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: John Eckersberg -Date: Thu, 30 Oct 2014 14:01:08 -0400 -Subject: [PATCH] Allow guest login from non-loopback connections - - -diff --git a/Makefile b/Makefile -index 19ce49438..dad8dd334 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,7 +38,7 @@ define PROJECT_ENV - {default_user_tags, [administrator]}, - {default_vhost, <<"/">>}, - {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, -- {loopback_users, [<<"guest">>]}, -+ {loopback_users, []}, - {password_hashing_module, rabbit_password_hashing_sha256}, - {server_properties, []}, - {collect_statistics, none}, diff --git a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch deleted file mode 100644 index 19b4540..0000000 --- a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Peter Lemenkov -Date: Sun, 17 Jul 2016 18:42:06 +0300 -Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS - -Signed-off-by: Peter Lemenkov - -diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server -index 4a2737a5e..50e8d1d91 100755 ---- a/scripts/rabbitmq-server -+++ b/scripts/rabbitmq-server -@@ -193,6 +193,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ - -boot "${CLEAN_BOOT_FILE}" \ - -noinput \ - -hidden \ -+ ${RABBITMQ_SERVER_ERL_ARGS} \ - -s rabbit_prelaunch \ - ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ - ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ diff --git a/rabbitmq-server-release-0001-Don-t-use-templates.patch b/rabbitmq-server-release-0001-Don-t-use-templates.patch deleted file mode 100644 index b5fe3b0..0000000 --- a/rabbitmq-server-release-0001-Don-t-use-templates.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 8 Feb 2018 17:06:41 +0300 -Subject: [PATCH] Don't use templates - -Signed-off-by: Peter Lemenkov - -diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper -index 4acba9d..ad023e7 100644 ---- a/scripts/rabbitmq-script-wrapper -+++ b/scripts/rabbitmq-script-wrapper -@@ -79,7 +79,7 @@ exec_rabbitmq_server() { - # shellcheck source=/dev/null - . "$RABBITMQ_ENV" - -- exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ -+ exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" - } - - run_script_as_rabbitmq() { diff --git a/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch b/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch new file mode 100644 index 0000000..27f4e0b --- /dev/null +++ b/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch @@ -0,0 +1,20 @@ +From: Peter Lemenkov +Date: Tue, 7 Jan 2020 00:19:51 +0300 +Subject: [PATCH] Partially revert "Use template in rabbitmq-script-wrapper for + RabbitMQ user and group" + +This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb. + +diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper +index fa5edfc..b834ae8 100644 +--- a/scripts/rabbitmq-script-wrapper ++++ b/scripts/rabbitmq-script-wrapper +@@ -43,7 +43,7 @@ maybe_fixup_erlang_cookie() { + _erlang_cookie="$_rabbitmq_home/.erlang.cookie" + if [ -f "$_erlang_cookie" ] + then +- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie" ++ chown rabbitmq:rabbitmq "$_erlang_cookie" + chmod 400 "$_erlang_cookie" + fi + } diff --git a/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch b/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch deleted file mode 100644 index 4904a38..0000000 --- a/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 7 Jan 2020 00:19:51 +0300 -Subject: [PATCH] Revert "Use template in rabbitmq-script-wrapper for RabbitMQ - user and group" - -This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb. - -diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper -index ad023e7..d1cffb9 100644 ---- a/scripts/rabbitmq-script-wrapper -+++ b/scripts/rabbitmq-script-wrapper -@@ -45,7 +45,7 @@ maybe_fixup_erlang_cookie() { - _erlang_cookie="$_rabbitmq_home/.erlang.cookie" - if [ -f "$_erlang_cookie" ] - then -- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie" -+ chown rabbitmq:rabbitmq "$_erlang_cookie" - chmod 400 "$_erlang_cookie" - fi - } diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index a871f92..510fd78 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -6,7 +6,7 @@ Name: rabbitmq-server -Version: 3.8.3 +Version: 3.8.5 Release: 1%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz @@ -15,14 +15,10 @@ Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{versio Source3: rabbitmq-server.logrotate # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_16/packaging/RPMS/Fedora/rabbitmq-server.tmpfiles Source5: rabbitmq-server.tmpfiles -Patch1: rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch -Patch2: rabbitmq-server-0002-Add-systemd-notification-support.patch -Patch3: rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch -Patch4: rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch +Patch1: rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch Patch102: rabbitmq-common-0002-force-python3.patch -Patch201: rabbitmq-server-release-0001-Don-t-use-templates.patch -Patch202: rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch +Patch201: rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch URL: https://www.rabbitmq.com/ @@ -66,9 +62,6 @@ scalable implementation of an AMQP broker. cd deps/rabbit %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 cd ../.. cd deps/rabbit_common @@ -77,7 +70,6 @@ cd deps/rabbit_common cd ../.. %patch201 -p1 -%patch202 -p1 cd deps/amqp10_common %patch301 -p1 @@ -205,6 +197,9 @@ done %changelog +* Tue Jun 16 2020 Peter Lemenkov - 3.8.5-1 +- Ver. 3.8.5 + * Mon Apr 20 2020 Peter Lemenkov - 3.8.3-1 - Ver. 3.8.3 diff --git a/rabbitmq-server_3.8.5.orig.tar.xz.asc b/rabbitmq-server_3.8.5.orig.tar.xz.asc new file mode 100644 index 0000000..5c89f71 --- /dev/null +++ b/rabbitmq-server_3.8.5.orig.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJe53hvAAoJEGtzo25gJt/Kdb8P/2cFK06wncUAOoA9dGSnZJvf +PfyiaW1gJgxzgS01C+U/g9IKBIMv8dwB3cvAaH8l5wWjGgKOzrbZX3iIQSTlWdOi +EFQOcGXGX3Tt8v1HMcmYg5/p1mUn5bzDAkejEtQaJ4N7RVU6NSqx6LrFmaZZrADK +M9WjrtxjZPJt10Diy4N417bdQ04dqQALcXgswoQdYktq/kok+jS9nRutnUrwrF2H +h0XWhowVAGyPqFJwF0hMBWZ0cRm4yQMPS0FMrhBVseIq0t0Qep8mTr1MQ2tVXol+ +1B7EACjXrMNFs5JT11TWQy/o269Z2PO1F1c8dZX2pHm8ro+/NNJcWrEqRGMK/IzT +Zr3YnL1nKiapHnrChwn+mne3Y/RBdt/grrHQE6FAcO+9BMVZ3VPL21O5gP7FF4bk +My4M2KvX9Fm5nl9m2YOjKE29qJsz/Mq0/P0brzOo2K7vhAhIU0rM1YXkuhIayiLz +EJBrfQod/CaoCFyw+u0xKhVQlq6dOEP9tuAKdiSbwgl+7D1BbEyBoTx4ci7yR0yK +syP43qy3wtxjwZLXzvTVMmbhf0wc6wJ7zxO6BDbG5Gaf06q43dov72LVLuwSAq1s +juNS2AKeC3kkPHj93Iwx40gjAldzw6jOcueAmJ1DJ8Jizjz9pGTzBWfoXrQP1Q6W +rtDNC0QCLFjcDWnKPAIU +=oAil +-----END PGP SIGNATURE----- diff --git a/sources b/sources index 151a222..13a1fce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rabbitmq-server_3.8.3.orig.tar.xz) = 1547e7935ff34be278970c03b176d76e52a6968cc2955dc75fa00d184ed1ba567e095c5a56e0f2f7c868d41281897c53ec6f4baff019e144aa57afe99cd6adaa -SHA512 (rabbitmq-server_3.8.3.orig.tar.xz.asc) = 113325790cc21fee5b8d560e788b236785f3d77fd4ace1e9a2dd832542d19f8a6192963d51696779fd915b7d9ffbb39e3aa40b5ac59ca087e9aeabd71bbd0940 +SHA512 (rabbitmq-server_3.8.5.orig.tar.xz) = 91cb3b6aec55e6acf77700e939a01649d785fabbf7ed0a410ae9470c156cf28b0ebafa250949e9dca7699b7cc258efa40d66f00deb9896940743e069db714cda +SHA512 (rabbitmq-server_3.8.5.orig.tar.xz.asc) = 5b282a136ca2fee1840043d607d97d37b4d32fa1df98283c2553d12d7fbda64b8c83cd9980040dce3cb7483c25e24795ce9543ed9fca2032dc79852c56542319