From 2dece138ee3e89f109125c9e292975d97f757248 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Apr 20 2017 16:11:55 +0000 Subject: Ver. 3.6.9 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 21fa448..8ec0b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ rabbitmq-server-1.8.0.tar.gz /rabbitmq-server-3.6.3.tar.xz /rabbitmq-server-3.6.5.tar.xz /rabbitmq-server-3.6.6.tar.xz +/rabbitmq-server-3.6.9.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 e93c46c..eed62b0 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 1f0df1a..1a35669 100644 +index 1a69dd5..942a1cc 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -280,120 +280,8 @@ broker_start() -> +@@ -293,121 +293,8 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), @@ -80,15 +80,16 @@ index 1f0df1a..1a35669 100644 - use_stdio, out]). - -sd_notify_socat(Unit) -> -- case sd_open_port() of -- {'EXIT', Exit} -> -- io:format(standard_error, "Failed to start socat ~p~n", [Exit]), -- false; +- 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() -> diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 958619d..0370af5 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 1a35669..6b1531d 100644 +index 942a1cc..7337927 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -280,6 +280,11 @@ broker_start() -> +@@ -293,6 +293,11 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), 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 index ae6213f..3d5e70b 100644 --- a/rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch +++ b/rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch @@ -25,7 +25,7 @@ index 53be9fc..4d8cb9e 100644 --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 c0e5c93..ee72090 100644 +index fb4ce32..2aaf59c 100644 --- a/src/rabbit_cli.erl +++ b/src/rabbit_cli.erl @@ -57,7 +57,7 @@ ensure_cli_distribution() -> 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 index ee8ed8b..08fc87e 100644 --- a/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch +++ b/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch @@ -3,16 +3,16 @@ Date: Thu, 30 Oct 2014 14:01:08 -0400 Subject: [PATCH] Allow guest login from non-loopback connections -diff --git a/src/rabbit.app.src b/src/rabbit.app.src -index dd38ad4..b03a888 100644 ---- a/src/rabbit.app.src -+++ b/src/rabbit.app.src -@@ -39,7 +39,7 @@ - {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/Makefile b/Makefile +index c824002..a28ea89 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,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-0005-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0005-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch index 54948e8..b79ba48 100644 --- 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 @@ -5,7 +5,7 @@ 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 7b0599e..130ff0b 100755 +index 77f4bf4..3766e19 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -82,6 +82,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 1bedc32..bc521c8 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -4,8 +4,8 @@ Name: rabbitmq-server -Version: 3.6.6 -Release: 2%{?dist} +Version: 3.6.9 +Release: 1%{?dist} License: MPLv1.1 Group: Development/Libraries Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz @@ -184,6 +184,9 @@ done %changelog +* Thu Apr 20 2017 Peter Lemenkov - 3.6.9-1 +- Ver. 3.6.9 + * Wed Mar 8 2017 Peter Lemenkov - 3.6.6-2 - Set version explicitly diff --git a/sources b/sources index 67a0005..6d337a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-server-3.6.6.tar.xz) = 6a79226ffa61103d237a8978587df966141c17d6f6348cc6c0971ffbd7a1adc593b3eecfec327ffe589d5fd3029fe045fbd80ed0d5a0f24ffb478cc8de5c124b +SHA512 (rabbitmq-server-3.6.9.tar.xz) = a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662