From 889a63518db9650edd8a3999eed105c36add36ba Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Oct 12 2021 19:17:00 +0000 Subject: RabbitMQ ver. 3.9.7 Signed-off-by: Peter Lemenkov --- diff --git a/rabbitmq-amqp1.0-common-0001-force-python3.patch b/rabbitmq-amqp1.0-common-0001-force-python3.patch deleted file mode 100644 index dcf4e82..0000000 --- a/rabbitmq-amqp1.0-common-0001-force-python3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lon Hohberger -Date: Tue, 29 Jan 2019 11:36:11 -0500 -Subject: [PATCH] force python3 - -Signed-off-by: Lon Hohberger - -diff --git a/codegen.py b/codegen.py -index dc4480a..cf93227 100755 ---- a/codegen.py -+++ b/codegen.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - from __future__ import print_function - -diff --git a/development.post.mk b/development.post.mk -index 3f8301a..b7f960a 100644 ---- a/development.post.mk -+++ b/development.post.mk -@@ -2,7 +2,7 @@ - # Framing sources generation. - # -------------------------------------------------------------------- - --PYTHON ?= python -+PYTHON ?= python3 - CODEGEN = $(CURDIR)/codegen.py - CODEGEN_DIR ?= $(DEPS_DIR)/rabbitmq_codegen - CODEGEN_AMQP = $(CODEGEN_DIR)/amqp_codegen.py diff --git a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch deleted file mode 100644 index 0fd9255..0000000 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Peter Lemenkov -Date: Fri, 15 Jul 2016 16:01:08 +0200 -Subject: [PATCH] Use proto_dist from command line - -Use protocol distribution value from command line when provided instead -of always using default value (inet_tcp) when trying to check epmd. - -If provided more than one protocol distribution types, then use the -first one. - -Signed-off-by: Peter Lemenkov - -diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index 7e87ce2..d456ec7 100644 ---- a/src/rabbit_nodes_common.erl -+++ b/src/rabbit_nodes_common.erl -@@ -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; -+ error -> "inet_tcp" -+ end, - Port = open_port( - {spawn_executable, Exe}, - [{args, ["-boot", "no_dot_erlang", - "-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]), - port_shutdown_loop(Port). diff --git a/rabbitmq-common-0002-force-python3.patch b/rabbitmq-common-0002-force-python3.patch deleted file mode 100644 index 40298cc..0000000 --- a/rabbitmq-common-0002-force-python3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lon Hohberger -Date: Tue, 29 Jan 2019 11:36:11 -0500 -Subject: [PATCH] force python3 - -Signed-off-by: Lon Hohberger - -diff --git a/codegen.py b/codegen.py -index 787e852..3bb5e2f 100755 ---- a/codegen.py -+++ b/codegen.py -@@ -1,2 +1,2 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - -## 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 -+++ b/development.post.mk -@@ -2,7 +2,7 @@ - # Framing sources generation. - # -------------------------------------------------------------------- - --PYTHON ?= python -+PYTHON ?= python3 - CODEGEN = $(CURDIR)/codegen.py - CODEGEN_DIR ?= $(DEPS_DIR)/rabbitmq_codegen - CODEGEN_AMQP = $(CODEGEN_DIR)/amqp_codegen.py 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 deleted file mode 100644 index e709d6f..0000000 --- a/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 726f370..801855c 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 @@ -3,10 +3,10 @@ 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 9cfc14f60..816466f98 100644 ---- a/Makefile -+++ b/Makefile +diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile +index 3f4c52fdb8..06ad19a587 100644 +--- a/deps/rabbit/Makefile ++++ b/deps/rabbit/Makefile @@ -39,7 +39,7 @@ define PROJECT_ENV {default_user_tags, [administrator]}, {default_vhost, <<"/">>}, diff --git a/rabbitmq-server-0002-Use-default-EPMD-socket.patch b/rabbitmq-server-0002-Use-default-EPMD-socket.patch index 2c01853..e7d6b9a 100644 --- a/rabbitmq-server-0002-Use-default-EPMD-socket.patch +++ b/rabbitmq-server-0002-Use-default-EPMD-socket.patch @@ -4,10 +4,10 @@ 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 +diff --git a/deps/rabbit/docs/rabbitmq-server.service.example b/deps/rabbit/docs/rabbitmq-server.service.example +index dec70eb635..a9aa3c1614 100644 +--- a/deps/rabbit/docs/rabbitmq-server.service.example ++++ b/deps/rabbit/docs/rabbitmq-server.service.example @@ -1,8 +1,8 @@ # systemd unit example [Unit] diff --git a/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch b/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch new file mode 100644 index 0000000..78a5412 --- /dev/null +++ b/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch @@ -0,0 +1,32 @@ +From: Peter Lemenkov +Date: Fri, 15 Jul 2016 16:01:08 +0200 +Subject: [PATCH] Use proto_dist from command line + +Use protocol distribution value from command line when provided instead +of always using default value (inet_tcp) when trying to check epmd. + +If provided more than one protocol distribution types, then use the +first one. + +Signed-off-by: Peter Lemenkov + +diff --git a/deps/rabbit_common/src/rabbit_nodes_common.erl b/deps/rabbit_common/src/rabbit_nodes_common.erl +index 9d72c29652..fd02b30ede 100644 +--- a/deps/rabbit_common/src/rabbit_nodes_common.erl ++++ b/deps/rabbit_common/src/rabbit_nodes_common.erl +@@ -105,10 +105,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; ++ error -> "inet_tcp" ++ end, + Port = open_port( + {spawn_executable, Exe}, + [{args, ["-boot", "no_dot_erlang", + "-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]), + port_shutdown_loop(Port). diff --git a/rabbitmq-server-0004-force-python3.patch b/rabbitmq-server-0004-force-python3.patch new file mode 100644 index 0000000..5affba2 --- /dev/null +++ b/rabbitmq-server-0004-force-python3.patch @@ -0,0 +1,52 @@ +From: Lon Hohberger +Date: Tue, 29 Jan 2019 11:36:11 -0500 +Subject: [PATCH] force python3 + +Signed-off-by: Lon Hohberger + +diff --git a/deps/amqp10_common/codegen.py b/deps/amqp10_common/codegen.py +index dc4480a181..cf93227177 100755 +--- a/deps/amqp10_common/codegen.py ++++ b/deps/amqp10_common/codegen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + from __future__ import print_function + +diff --git a/deps/amqp10_common/development.post.mk b/deps/amqp10_common/development.post.mk +index 3f8301acd1..b7f960a7e7 100644 +--- a/deps/amqp10_common/development.post.mk ++++ b/deps/amqp10_common/development.post.mk +@@ -2,7 +2,7 @@ + # Framing sources generation. + # -------------------------------------------------------------------- + +-PYTHON ?= python ++PYTHON ?= python3 + CODEGEN = $(CURDIR)/codegen.py + CODEGEN_DIR ?= $(DEPS_DIR)/rabbitmq_codegen + CODEGEN_AMQP = $(CODEGEN_DIR)/amqp_codegen.py +diff --git a/deps/rabbit_common/codegen.py b/deps/rabbit_common/codegen.py +index 2e7bad69e9..8a02fcbb31 100755 +--- a/deps/rabbit_common/codegen.py ++++ b/deps/rabbit_common/codegen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + ## 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/deps/rabbit_common/development.post.mk b/deps/rabbit_common/development.post.mk +index 65708dbcd7..ec905a4615 100644 +--- a/deps/rabbit_common/development.post.mk ++++ b/deps/rabbit_common/development.post.mk +@@ -2,7 +2,7 @@ + # Framing sources generation. + # -------------------------------------------------------------------- + +-PYTHON ?= python ++PYTHON ?= python3 + CODEGEN = $(CURDIR)/codegen.py + CODEGEN_DIR ?= $(DEPS_DIR)/rabbitmq_codegen + CODEGEN_AMQP = $(CODEGEN_DIR)/amqp_codegen.py diff --git a/rabbitmq-server-0005-Partially-revert-Use-template-in-rabbitmq-script-wra.patch b/rabbitmq-server-0005-Partially-revert-Use-template-in-rabbitmq-script-wra.patch new file mode 100644 index 0000000..1f413b3 --- /dev/null +++ b/rabbitmq-server-0005-Partially-revert-Use-template-in-rabbitmq-script-wra.patch @@ -0,0 +1,20 @@ +From: Peter Lemenkov +Date: Tue, 7 Jan 2020 00:19:51 +0300 +Subject: [PATCH] Partially revert "Use template in rabbitmq-script-wrapper for + RabbitMQ user and group" + +This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb. + +diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper +index da8fe252e7..cbe65ad33c 100644 +--- a/scripts/rabbitmq-script-wrapper ++++ b/scripts/rabbitmq-script-wrapper +@@ -37,7 +37,7 @@ maybe_fixup_erlang_cookie() { + _erlang_cookie="$_rabbitmq_home/.erlang.cookie" + if [ -f "$_erlang_cookie" ] + then +- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie" ++ chown rabbitmq:rabbitmq "$_erlang_cookie" + chmod 400 "$_erlang_cookie" + fi + } diff --git a/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch b/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch deleted file mode 100644 index 27f4e0b..0000000 --- a/rabbitmq-server-release-0001-Partially-revert-Use-template-in-rabbitmq-script-wra.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 7 Jan 2020 00:19:51 +0300 -Subject: [PATCH] Partially revert "Use template in rabbitmq-script-wrapper for - RabbitMQ user and group" - -This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb. - -diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper -index fa5edfc..b834ae8 100644 ---- a/scripts/rabbitmq-script-wrapper -+++ b/scripts/rabbitmq-script-wrapper -@@ -43,7 +43,7 @@ maybe_fixup_erlang_cookie() { - _erlang_cookie="$_rabbitmq_home/.erlang.cookie" - if [ -f "$_erlang_cookie" ] - then -- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie" -+ chown rabbitmq:rabbitmq "$_erlang_cookie" - chmod 400 "$_erlang_cookie" - fi - } diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 9dcc8d9..233d0f9 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -1,4 +1,4 @@ -%global erlang_minver 22 +%global erlang_minver 23 # We want to install into /usr/lib, even on 64-bit platforms %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq # Technically, we're noarch; but Elixir we're using is not. @@ -6,7 +6,7 @@ Name: rabbitmq-server -Version: 3.8.19 +Version: 3.9.7 Release: 1%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz @@ -18,10 +18,9 @@ Source5: rabbitmq-server.tmpfiles Source6: rabbitmq-server-cuttlefish Patch1: rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch Patch2: rabbitmq-server-0002-Use-default-EPMD-socket.patch -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 -Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch +Patch3: rabbitmq-server-0003-Use-proto_dist-from-command-line.patch +Patch4: rabbitmq-server-0004-force-python3.patch +Patch5: rabbitmq-server-0005-Partially-revert-Use-template-in-rabbitmq-script-wra.patch URL: https://www.rabbitmq.com/ BuildRequires: make @@ -60,23 +59,7 @@ performance enterprise messaging. The RabbitMQ server is a robust and scalable implementation of an AMQP broker. %prep -%setup -q - -cd deps/rabbit -%patch1 -p1 -%patch2 -p1 -cd ../.. - -cd deps/rabbit_common -%patch101 -p1 -%patch102 -p1 -cd ../.. - -%patch201 -p1 - -cd deps/amqp10_common -%patch301 -p1 -cd ../.. +%autosetup -p1 # We have to remove it until common_test subpackage lands RHOS rm -f \ @@ -200,6 +183,9 @@ done %changelog +* Tue Oct 12 2021 Peter Lemenkov - 3.9.7-1 +- Ver. 3.9.7 + * Wed Aug 11 2021 Peter Lemenkov - 3.8.19-1 - Ver. 3.8.19 diff --git a/sources b/sources index 1c00c31..c2e37ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rabbitmq-server_3.8.19.orig.tar.xz) = 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea -SHA512 (rabbitmq-server_3.8.19.orig.tar.xz.asc) = 7ce5cbc09dfa34b5b7a955116cf210fa4dc5d7734f5462d7dc8a8938f6f0ac662391bc19e08859bba5f1a3e55d11a2940384c3b46099f0065214ea21cde7cc82 +SHA512 (rabbitmq-server_3.9.7.orig.tar.xz) = 4467381e330241839367be0a959ee909ef0531b3273e4dcc60977927a2c70eeb81ebcda59c3a699a9a026598e1eb58f3d6b0484381327af1e822de6bd7c1b95e +SHA512 (rabbitmq-server_3.9.7.orig.tar.xz.asc) = 699b9bdf71f72753b75f6d850fa0e33761b2bd6d26f4188baaf7004c99fee36e13a7884914e536dadb5e14165084d228b1004e67b9510301e177bc40721446ea