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 32b99a6..0fd9255 100644 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch @@ -11,12 +11,12 @@ first one. Signed-off-by: Peter Lemenkov diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index f06c3d0..63c35ec 100644 +index 7e87ce2..d456ec7 100644 --- a/src/rabbit_nodes_common.erl +++ b/src/rabbit_nodes_common.erl -@@ -80,10 +80,15 @@ do_ensure_epmd(false, Prog) -> - rabbit_log:error("ensure_epmd: unable to find executable '~s' in PATH: '~s'", [Prog, Path]); - do_ensure_epmd(Exe, _) -> +@@ -79,10 +79,15 @@ epmd_port() -> + ensure_epmd() -> + Exe = rabbit_runtime:get_erl_path(), ID = rabbit_misc:random(1000000000), + ProtoDist = case init:get_argument(proto_dist) of + {ok, [Proto | _Protos]} -> Proto; diff --git a/rabbitmq-common-0002-force-python3.patch b/rabbitmq-common-0002-force-python3.patch index f081021..5b1c474 100644 --- a/rabbitmq-common-0002-force-python3.patch +++ b/rabbitmq-common-0002-force-python3.patch @@ -5,15 +5,15 @@ Subject: [PATCH] force python3 Signed-off-by: Lon Hohberger diff --git a/codegen.py b/codegen.py -index 8b81362..4c0d714 100755 +index 787e852..3bb5e2f 100755 --- a/codegen.py +++ b/codegen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - ## The contents of this file are subject to the Mozilla Public License - ## Version 1.1 (the "License"); you may not use this file except in + ## This Source Code Form is subject to the terms of the Mozilla Public + ## License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/development.post.mk b/development.post.mk index 65708db..ec905a4 100644 --- a/development.post.mk 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 new file mode 100644 index 0000000..e709d6f --- /dev/null +++ b/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch @@ -0,0 +1,20 @@ +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 d456ec7..71786da 100644 +--- a/src/rabbit_nodes_common.erl ++++ b/src/rabbit_nodes_common.erl +@@ -89,7 +89,8 @@ ensure_epmd() -> + "-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 index 60d88be..726f370 100644 --- a/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch +++ b/rabbitmq-server-0001-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 86db54b86..dbc33277d 100644 +index 9cfc14f60..816466f98 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ define PROJECT_ENV diff --git a/rabbitmq-server-0002-Use-default-EPMD-socket.patch b/rabbitmq-server-0002-Use-default-EPMD-socket.patch new file mode 100644 index 0000000..2c01853 --- /dev/null +++ b/rabbitmq-server-0002-Use-default-EPMD-socket.patch @@ -0,0 +1,21 @@ +From: Peter Lemenkov +Date: Tue, 1 Sep 2020 12:29:25 +0200 +Subject: [PATCH] Use default EPMD socket + +Signed-off-by: Peter Lemenkov + +diff --git a/docs/rabbitmq-server.service.example b/docs/rabbitmq-server.service.example +index dec70eb63..a9aa3c161 100644 +--- a/docs/rabbitmq-server.service.example ++++ b/docs/rabbitmq-server.service.example +@@ -1,8 +1,8 @@ + # systemd unit example + [Unit] + Description=RabbitMQ broker +-After=network.target epmd@0.0.0.0.socket +-Wants=network.target epmd@0.0.0.0.socket ++After=network.target epmd.socket ++Wants=network.target epmd.socket + + [Service] + Type=notify diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 4092e9e..5caf086 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -6,8 +6,8 @@ Name: rabbitmq-server -Version: 3.8.5 -Release: 2%{?dist} +Version: 3.8.7 +Release: 1%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz.asc @@ -19,6 +19,7 @@ Patch1: rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.pat Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch Patch102: rabbitmq-common-0002-force-python3.patch Patch201: rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch +Patch202: rabbitmq-server-0002-Use-default-EPMD-socket.patch Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch URL: https://www.rabbitmq.com/ @@ -70,6 +71,7 @@ cd deps/rabbit_common cd ../.. %patch201 -p1 +%patch202 -p1 cd deps/amqp10_common %patch301 -p1 @@ -197,6 +199,9 @@ done %changelog +* Tue Sep 1 2020 Peter Lemenkov - 3.8.7-1 +- Ver. 3.8.7 + * Wed Jul 29 2020 Fedora Release Engineering - 3.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/rabbitmq-server_3.8.5.orig.tar.xz.asc b/rabbitmq-server_3.8.5.orig.tar.xz.asc deleted file mode 100644 index 5c89f71..0000000 --- a/rabbitmq-server_3.8.5.orig.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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 fbe1694..e234d95 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (rabbitmq-server_3.8.5.orig.tar.xz) = 91cb3b6aec55e6acf77700e939a01649d785fabbf7ed0a410ae9470c156cf28b0ebafa250949e9dca7699b7cc258efa40d66f00deb9896940743e069db714cda +SHA512 (rabbitmq-server_3.8.7.orig.tar.xz) = 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac +SHA512 (rabbitmq-server_3.8.7.orig.tar.xz.asc) = 09037e7d31f62448c17cd46199669b330232c30931048834e8eb4eb3d0dbde826165dd84f5d11b0435fe0666941cf45c3bb5c5950f154b8e3188810900082a46