From 4e80693201d0de8f66b9f9f9acf39fd2a139890a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 07 2016 12:16:09 +0000 Subject: Ver. 3.6.3 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 8eb3d41..fb3737f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ rabbitmq-server-1.8.0.tar.gz /rabbitmq-server-3.5.7.tar.gz /rabbitmq-server-3.6.1.tar.xz /rabbitmq-server-3.6.2.tar.xz +/rabbitmq-server-3.6.3.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 ba3ed59..61a7f40 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 2cc353d..8a19427 100644 +index a86fd97..32ff240 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -284,120 +284,8 @@ broker_start() -> +@@ -280,120 +280,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 ee909d3..7e8b0a4 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 8a19427..82e611c 100644 +index 32ff240..f9e8231 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -284,6 +284,11 @@ broker_start() -> +@@ -280,6 +280,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 c1e7891..74be7fb 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 @@ -24,10 +24,10 @@ index 7f5db60..01cb91c 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 4151504..5622fe8 100644 +index 6b35482..dc490ad 100644 --- a/src/rabbit_cli.erl +++ b/src/rabbit_cli.erl -@@ -57,7 +57,7 @@ ensure_cli_distribution() -> +@@ -58,7 +58,7 @@ ensure_cli_distribution() -> {error, Error} -> print_error("Failed to initialize erlang distribution: ~p.", [Error]), @@ -36,7 +36,7 @@ index 4151504..5622fe8 100644 end. %%---------------------------------------------------------------------------- -@@ -83,10 +83,10 @@ main(ParseFun, DoFun, UsageMod) -> +@@ -84,10 +84,10 @@ main(ParseFun, DoFun, UsageMod) -> %% thrown errors into normal return values case catch DoFun(Command, Node, Args, Opts) of ok -> @@ -49,7 +49,7 @@ index 4151504..5622fe8 100644 {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> %% < R15 PrintInvalidCommandError(), usage(UsageMod); -@@ -96,51 +96,51 @@ main(ParseFun, DoFun, UsageMod) -> +@@ -97,51 +97,51 @@ main(ParseFun, DoFun, UsageMod) -> {error, {missing_dependencies, Missing, Blame}} -> print_error("dependent plugins ~p not found; used by ~p.", [Missing, Blame]), @@ -113,7 +113,7 @@ index 4151504..5622fe8 100644 end. start_distribution_anon(0, LastError) -> -@@ -171,7 +171,7 @@ name_type() -> +@@ -172,7 +172,7 @@ name_type() -> end. usage(Mod) -> diff --git a/rabbitmq-server-0005-Initialise-wait_timeout-in-slave-promotion.patch b/rabbitmq-server-0005-Initialise-wait_timeout-in-slave-promotion.patch deleted file mode 100644 index 20d8f7b..0000000 --- a/rabbitmq-server-0005-Initialise-wait_timeout-in-slave-promotion.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Diana Corbacho -Date: Thu, 26 May 2016 16:05:16 +0100 -Subject: [PATCH] Initialise wait_timeout in slave promotion - - -diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl -index e447e9d..c481706 100644 ---- a/src/rabbit_mirror_queue_master.erl -+++ b/src/rabbit_mirror_queue_master.erl -@@ -518,6 +518,7 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) -> - Depth = BQ:depth(BQS1), - true = Len == Depth, %% ASSERTION: everything must have been requeued - ok = gm:broadcast(GM, {depth, Depth}), -+ WaitTimeout = rabbit_misc:get_env(rabbit, slave_wait_timeout, 15000), - #state { name = QName, - gm = GM, - coordinator = CPid, -@@ -525,7 +526,8 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) -> - backing_queue_state = BQS1, - seen_status = Seen, - confirmed = [], -- known_senders = sets:from_list(KS) }. -+ known_senders = sets:from_list(KS), -+ wait_timeout = WaitTimeout }. - - sender_death_fun() -> - Self = self(), diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index fc8534a..e9df6e3 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -4,11 +4,11 @@ Name: rabbitmq-server -Version: 3.6.2 -Release: 4%{?dist} +Version: 3.6.3 +Release: 1%{?dist} License: MPLv1.1 Group: Development/Libraries -Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz +Source0: http://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 @@ -20,7 +20,6 @@ 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-Initialise-wait_timeout-in-slave-promotion.patch URL: http://www.rabbitmq.com/ BuildArch: noarch BuildRequires: erlang >= %{erlang_minver}, python-simplejson, xmlto, libxslt, python, zip @@ -57,7 +56,6 @@ scalable implementation of an AMQP broker. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # We have to remove it until common_test subpackage lands RHOS rm -f \ @@ -173,6 +171,9 @@ done %changelog +* Thu Jul 7 2016 Peter Lemenkov - 3.6.3-1 +- Ver. 3.6.3 + * Wed Jun 29 2016 Peter Lemenkov - 3.6.2-4 - Fixed crash during slave promotion diff --git a/sources b/sources index bbc28a8..d94c855 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -999d209301d1b5b5e1b279ab13a040da rabbitmq-server-3.6.2.tar.xz +3568dceb7f120549fc0add9836b89659 rabbitmq-server-3.6.3.tar.xz