diff --git a/.gitignore b/.gitignore index 8ec0b8d..b87f74b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ rabbitmq-server-1.8.0.tar.gz /rabbitmq-server-3.6.5.tar.xz /rabbitmq-server-3.6.6.tar.xz /rabbitmq-server-3.6.9.tar.xz +/rabbitmq-server-3.6.10.tar.xz diff --git a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch index a923a28..cb9a286 100644 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch @@ -11,7 +11,7 @@ first one. Signed-off-by: Peter Lemenkov diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl -index 70a5355..18f7714 100644 +index 84069f3..218f789 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -221,9 +221,14 @@ set_cluster_name(Name) -> diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index eed62b0..6a3091d 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov diff --git a/src/rabbit.erl b/src/rabbit.erl -index 1a69dd5..942a1cc 100644 +index d328a78d4..9a21d22b5 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -293,121 +293,8 @@ broker_start() -> diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 0370af5..9c0ec0b 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Add systemd notification support diff --git a/src/rabbit.erl b/src/rabbit.erl -index 942a1cc..7337927 100644 +index 9a21d22b5..af2b95194 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -293,6 +293,11 @@ broker_start() -> 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 3d5e70b..5e910d6 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 @@ -5,7 +5,7 @@ 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 53be9fc..4d8cb9e 100644 +index 12fa5b4dd..72590eb31 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -60,15 +60,3 @@ @@ -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 fb4ce32..2aaf59c 100644 +index 4d955f82a..33afbc3a1 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 08fc87e..d926724 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 @@ -4,7 +4,7 @@ Subject: [PATCH] Allow guest login from non-loopback connections diff --git a/Makefile b/Makefile -index c824002..a28ea89 100644 +index 0ea8dcaa0..0bef7901f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ define PROJECT_ENV 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 b79ba48..11ed376 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,10 +5,10 @@ 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 77f4bf4..3766e19 100755 +index 4d6dc3ff5..cc3479d37 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server -@@ -82,6 +82,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ +@@ -84,6 +84,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -boot "${CLEAN_BOOT_FILE}" \ -noinput \ -hidden \ diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index bc521c8..bfe7b53 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -4,7 +4,7 @@ Name: rabbitmq-server -Version: 3.6.9 +Version: 3.6.10 Release: 1%{?dist} License: MPLv1.1 Group: Development/Libraries @@ -184,6 +184,9 @@ done %changelog +* Wed Jun 7 2017 Peter Lemenkov - 3.6.10-1 +- Ver. 3.6.10 + * Thu Apr 20 2017 Peter Lemenkov - 3.6.9-1 - Ver. 3.6.9 diff --git a/sources b/sources index 6d337a6..a4f285c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-server-3.6.9.tar.xz) = a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 +SHA512 (rabbitmq-server-3.6.10.tar.xz) = 64e618e51ab259463029ad75b981dbf64687515e52d19854f225d4c68077e683ef56f0f6bb92cbbf91f140bc829d905473d687d083d12f36dd2cdfab3defaed6