From c5c4868506f6ff29e1a08d04f7a0150574f771f5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Nov 14 2017 13:43:34 +0000 Subject: Ver. 3.6.14 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 4d1c690..fbcf5fe 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ rabbitmq-server-1.8.0.tar.gz /rabbitmq-server-3.6.9.tar.xz /rabbitmq-server-3.6.10.tar.xz /rabbitmq-server-3.6.12.tar.xz +/rabbitmq-server-3.6.14.tar.xz diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index cf3bcfe..1135b57 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov diff --git a/src/rabbit.erl b/src/rabbit.erl -index fbd8840c3..b16b13785 100644 +index 8971c6456..0f0256155 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -293,121 +293,8 @@ broker_start() -> +@@ -300,121 +300,8 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 78efecf..8e712f5 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Add systemd notification support diff --git a/src/rabbit.erl b/src/rabbit.erl -index b16b13785..f76501a40 100644 +index 0f0256155..e40955e1f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -293,6 +293,11 @@ broker_start() -> +@@ -300,6 +300,11 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), 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 new file mode 100644 index 0000000..4136faa --- /dev/null +++ b/rabbitmq-server-0003-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 2f91e3f96..d92e27da7 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,7 +37,7 @@ define PROJECT_ENV + {default_user_tags, [administrator]}, + {default_vhost, <<"/">>}, + {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, +- {loopback_users, [<<"guest">>]}, ++ {loopback_users, []}, + {password_hashing_module, rabbit_password_hashing_sha256}, + {cluster_nodes, {[], disc}}, + {server_properties, []}, diff --git a/rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch b/rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch deleted file mode 100644 index 5e910d6..0000000 --- a/rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch +++ /dev/null @@ -1,125 +0,0 @@ -From: Peter Lemenkov -Date: Wed, 25 May 2016 22:24:44 +0300 -Subject: [PATCH] Revert "Distinct exit-codes for CLI utilities" - -This reverts commit 7984540175d0b8852025165b6b6a0ac05d692c98. - -diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl -index 12fa5b4dd..72590eb31 100644 ---- a/include/rabbit_cli.hrl -+++ b/include/rabbit_cli.hrl -@@ -60,15 +60,3 @@ - -define(ITERATIONS_DEF, {?ITERATIONS_OPT, {option, integer_to_list(rabbit_pbe:default_iterations())}}). - -define(LIST_CIPHERS_DEF, {?LIST_CIPHERS_OPT, flag}). - -define(LIST_HASHES_DEF, {?LIST_HASHES_OPT, flag}). -- -- --%% Subset of standartized exit codes from sysexits.h, see --%% https://github.com/rabbitmq/rabbitmq-server/issues/396 for discussion. ---define(EX_OK , 0). ---define(EX_USAGE , 64). % Bad command-line arguments. ---define(EX_DATAERR , 65). % Wrong data in command-line arguments. ---define(EX_NOUSER , 67). % The user specified does not exist. ---define(EX_UNAVAILABLE, 69). % Could not connect to the target node. ---define(EX_SOFTWARE , 70). % Failed to execute command. ---define(EX_TEMPFAIL , 75). % Temporary error (e.g. something has timed out). ---define(EX_CONFIG , 78). % Misconfiguration detected -diff --git a/src/rabbit_cli.erl b/src/rabbit_cli.erl -index 4d955f82a..33afbc3a1 100644 ---- a/src/rabbit_cli.erl -+++ b/src/rabbit_cli.erl -@@ -57,7 +57,7 @@ ensure_cli_distribution() -> - {error, Error} -> - print_error("Failed to initialize erlang distribution: ~p.", - [Error]), -- rabbit_misc:quit(?EX_TEMPFAIL) -+ rabbit_misc:quit(2) - end. - - %%---------------------------------------------------------------------------- -@@ -83,10 +83,10 @@ main(ParseFun, DoFun, UsageMod) -> - %% thrown errors into normal return values - case catch DoFun(Command, Node, Args, Opts) of - ok -> -- rabbit_misc:quit(?EX_OK); -+ rabbit_misc:quit(0); - {ok, Result} -> - rabbit_control_misc:print_cmd_result(Command, Result), -- rabbit_misc:quit(?EX_OK); -+ rabbit_misc:quit(0); - {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> %% < R15 - PrintInvalidCommandError(), - usage(UsageMod); -@@ -96,51 +96,51 @@ main(ParseFun, DoFun, UsageMod) -> - {error, {missing_dependencies, Missing, Blame}} -> - print_error("dependent plugins ~p not found; used by ~p.", - [Missing, Blame]), -- rabbit_misc:quit(?EX_CONFIG); -+ rabbit_misc:quit(2); - {'EXIT', {badarg, _}} -> - print_error("invalid parameter: ~p", [Args]), -- usage(UsageMod, ?EX_DATAERR); -+ usage(UsageMod, 2); - {error, {Problem, Reason}} when is_atom(Problem), is_binary(Reason) -> - %% We handle this common case specially to avoid ~p since - %% that has i18n issues - print_error("~s: ~s", [Problem, Reason]), -- rabbit_misc:quit(?EX_SOFTWARE); -+ rabbit_misc:quit(2); - {error, Reason} -> - print_error("~p", [Reason]), -- rabbit_misc:quit(?EX_SOFTWARE); -+ rabbit_misc:quit(2); - {error_string, Reason} -> - print_error("~s", [Reason]), -- rabbit_misc:quit(?EX_SOFTWARE); -+ rabbit_misc:quit(2); - {badrpc, {'EXIT', Reason}} -> - print_error("~p", [Reason]), -- rabbit_misc:quit(?EX_SOFTWARE); -+ rabbit_misc:quit(2); - {badrpc, Reason} -> - case Reason of - timeout -> - print_error("operation ~w on node ~w timed out", [Command, Node]), -- rabbit_misc:quit(?EX_TEMPFAIL); -+ rabbit_misc:quit(2); - _ -> - print_error("unable to connect to node ~w: ~w", [Node, Reason]), - print_badrpc_diagnostics([Node]), - case Command of -- stop -> rabbit_misc:quit(?EX_OK); -- _ -> rabbit_misc:quit(?EX_UNAVAILABLE) -+ stop -> rabbit_misc:quit(0); -+ _ -> rabbit_misc:quit(2) - end - end; - {badrpc_multi, Reason, Nodes} -> - print_error("unable to connect to nodes ~p: ~w", [Nodes, Reason]), - print_badrpc_diagnostics(Nodes), -- rabbit_misc:quit(?EX_UNAVAILABLE); -+ rabbit_misc:quit(2); - function_clause -> - print_error("operation ~w used with invalid parameter: ~p", - [Command, Args]), - usage(UsageMod); - {refused, Username, _, _} -> - print_error("failed to authenticate user \"~s\"", [Username]), -- rabbit_misc:quit(?EX_NOUSER); -+ rabbit_misc:quit(2); - Other -> - print_error("~p", [Other]), -- rabbit_misc:quit(?EX_SOFTWARE) -+ rabbit_misc:quit(2) - end. - - start_distribution_anon(0, LastError) -> -@@ -187,7 +187,7 @@ generate_cli_node_name() -> - list_to_atom(NameAsList). - - usage(Mod) -> -- usage(Mod, ?EX_USAGE). -+ usage(Mod, 1). - - usage(Mod, ExitCode) -> - io:format("~s", [Mod:usage()]), diff --git a/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch deleted file mode 100644 index 4a94c31..0000000 --- a/rabbitmq-server-0004-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 3e3f3b23e..559d59f05 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ define PROJECT_ENV - {default_user_tags, [administrator]}, - {default_vhost, <<"/">>}, - {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, -- {loopback_users, [<<"guest">>]}, -+ {loopback_users, []}, - {password_hashing_module, rabbit_password_hashing_sha256}, - {cluster_nodes, {[], disc}}, - {server_properties, []}, 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 new file mode 100644 index 0000000..11ed376 --- /dev/null +++ b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch @@ -0,0 +1,18 @@ +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 4d6dc3ff5..cc3479d37 100755 +--- a/scripts/rabbitmq-server ++++ b/scripts/rabbitmq-server +@@ -84,6 +84,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ + -boot "${CLEAN_BOOT_FILE}" \ + -noinput \ + -hidden \ ++ ${RABBITMQ_SERVER_ERL_ARGS} \ + -s rabbit_prelaunch \ + ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ + -extra "${RABBITMQ_NODENAME}" diff --git a/rabbitmq-server-0005-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0005-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch deleted file mode 100644 index 11ed376..0000000 --- a/rabbitmq-server-0005-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 4d6dc3ff5..cc3479d37 100755 ---- a/scripts/rabbitmq-server -+++ b/scripts/rabbitmq-server -@@ -84,6 +84,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ - -boot "${CLEAN_BOOT_FILE}" \ - -noinput \ - -hidden \ -+ ${RABBITMQ_SERVER_ERL_ARGS} \ - -s rabbit_prelaunch \ - ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ - -extra "${RABBITMQ_NODENAME}" diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 6149e6d..beb34a3 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -4,10 +4,10 @@ Name: rabbitmq-server -Version: 3.6.12 +Version: 3.6.14 Release: 1%{?dist} License: MPLv1.1 -Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz +Source0: https://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/231e90c/scripts/rabbitmq-script-wrapper # sed -i -e "s, @STDOUT_STDERR_REDIRECTION@,,g" rabbitmq-script-wrapper # sed -i -e "s,@SU_RABBITMQ_SH_C@,su rabbitmq -s /bin/sh -c,g" rabbitmq-script-wrapper @@ -18,12 +18,11 @@ Source3: rabbitmq-server.logrotate 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-Revert-Distinct-exit-codes-for-CLI-utilities.patch -Patch4: rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch -Patch5: rabbitmq-server-0005-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.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 Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch -URL: http://www.rabbitmq.com/ +URL: https://www.rabbitmq.com/ BuildArch: noarch BuildRequires: erlang >= %{erlang_minver}, python-simplejson, xmlto, libxslt, python, zip BuildRequires: rsync @@ -61,7 +60,6 @@ cd deps/rabbit %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 cd ../.. cd deps/rabbit_common @@ -184,6 +182,9 @@ done %changelog +* Tue Nov 14 2017 Peter Lemenkov - 3.6.14-1 +- Ver. 3.6.14 + * Tue Sep 19 2017 Peter Lemenkov - 3.6.12-1 - Ver. 3.6.12 diff --git a/sources b/sources index 0fa7a83..321de03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-server-3.6.12.tar.xz) = 8d447815f6a4f732260f690b651758fb7372ca0fd1f21cec0a82790788cbc6193ab64813160183956b8e1a6d0bad64ff38cad7be7e5bbb90791d390a48ef2151 +SHA512 (rabbitmq-server-3.6.14.tar.xz) = 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f