From fac8b4b0029cd711169dc5d0913be85cb67daf50 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 14 2022 17:07:24 +0000 Subject: Merge branch 'f35' into c9s-sig-messaging-rabbitmq --- diff --git a/.rabbitmq-server.metadata b/.rabbitmq-server.metadata index 2208a63..6b8b817 100644 --- a/.rabbitmq-server.metadata +++ b/.rabbitmq-server.metadata @@ -1,2 +1,2 @@ -8b799e75e451bfc9d700758fd4a7836c03b43b24 SOURCES/rabbitmq-server_3.9.10.orig.tar.xz -2c06c5566b02e1c91493d606dd99e04ed5208186 SOURCES/rabbitmq-server_3.9.10.orig.tar.xz.asc +3aa37ff311d63916b7931f2d8d42a91550bcfe99 SOURCES/rabbitmq-server_3.9.21.orig.tar.xz +969b138aa9ec6bd44ee98f67edc237b801e75a00 SOURCES/rabbitmq-server_3.9.21.orig.tar.xz.asc diff --git a/SOURCES/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch b/SOURCES/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch index d268c65..cd7752e 100644 --- a/SOURCES/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch +++ b/SOURCES/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/deps/rabbit/Makefile b/deps/rabbit/Makefile -index 276ba826fa..8857372040 100644 +index e7b5181cbf..e3021da070 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -39,7 +39,7 @@ define PROJECT_ENV diff --git a/SOURCES/rabbitmq-server-0002-Use-default-EPMD-socket.patch b/SOURCES/rabbitmq-server-0002-Use-default-EPMD-socket.patch index e7d6b9a..50d6c77 100644 --- a/SOURCES/rabbitmq-server-0002-Use-default-EPMD-socket.patch +++ b/SOURCES/rabbitmq-server-0002-Use-default-EPMD-socket.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use default EPMD socket Signed-off-by: Peter Lemenkov diff --git a/deps/rabbit/docs/rabbitmq-server.service.example b/deps/rabbit/docs/rabbitmq-server.service.example -index dec70eb635..a9aa3c1614 100644 +index 69531b1ff6..9c12824a0e 100644 --- a/deps/rabbit/docs/rabbitmq-server.service.example +++ b/deps/rabbit/docs/rabbitmq-server.service.example @@ -1,8 +1,8 @@ @@ -18,4 +18,4 @@ index dec70eb635..a9aa3c1614 100644 +Wants=network.target epmd.socket [Service] - Type=notify + # Note: You *may* wish to uncomment the following lines to apply systemd diff --git a/SOURCES/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch b/SOURCES/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch index 758a2fb..589453a 100644 --- a/SOURCES/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch +++ b/SOURCES/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch @@ -11,10 +11,10 @@ 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 dc00eaa300..e18afc13e0 100644 +index b73debfe17..66da48fd3c 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() -> +@@ -108,10 +108,15 @@ epmd_port() -> ensure_epmd() -> Exe = rabbit_runtime:get_erl_path(), ID = rabbit_misc:random(1000000000), diff --git a/SOURCES/rabbitmq-server-0004-force-python3.patch b/SOURCES/rabbitmq-server-0004-force-python3.patch index 5affba2..e9901b4 100644 --- a/SOURCES/rabbitmq-server-0004-force-python3.patch +++ b/SOURCES/rabbitmq-server-0004-force-python3.patch @@ -14,19 +14,6 @@ index dc4480a181..cf93227177 100755 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 @@ -37,16 +24,3 @@ index 2e7bad69e9..8a02fcbb31 100755 ## 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/SPECS/rabbitmq-server.spec b/SPECS/rabbitmq-server.spec index 7edaf6a..192d3bc 100644 --- a/SPECS/rabbitmq-server.spec +++ b/SPECS/rabbitmq-server.spec @@ -6,7 +6,7 @@ Name: rabbitmq-server -Version: 3.9.10 +Version: 3.9.21 Release: 1%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz @@ -182,6 +182,12 @@ done %changelog +* Tue Jul 12 2022 Peter Lemenkov - 3.9.21-1 +- Ver. 3.9.21 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 22 2021 Peter Lemenkov - 3.9.10-1 - Ver. 3.9.10