From 55cf12b921a8c195db54570f9999303a2a7c79bb Mon Sep 17 00:00:00 2001 From: wang--ge Date: Wed, 30 Nov 2022 11:08:12 +0800 Subject: [PATCH] Downgrade required erlang version (cherry picked from commit ce14c992c4e0953fec47c9fa7c0109adfc89ec36) --- ...06-Downgrade-required-erlang-version.patch | 43 +++++++++++++++++++ rabbitmq-server.spec | 6 ++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 rabbitmq-server-0006-Downgrade-required-erlang-version.patch diff --git a/rabbitmq-server-0006-Downgrade-required-erlang-version.patch b/rabbitmq-server-0006-Downgrade-required-erlang-version.patch new file mode 100644 index 0000000..59b4597 --- /dev/null +++ b/rabbitmq-server-0006-Downgrade-required-erlang-version.patch @@ -0,0 +1,43 @@ +From 403ac97fed3b8bc065d5cb51c616af52f3df0dca Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Tue, 29 Nov 2022 14:46:54 +0800 +Subject: [PATCH] downgrade required erlang version + +--- + .../rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl | 4 ++-- + .../rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl +index 2467570..eb19bbe 100644 +--- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl ++++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl +@@ -6,8 +6,8 @@ + + -export([check/1]). + +--define(OTP_MINIMUM, "24.2"). +--define(ERTS_MINIMUM, "12.2"). ++-define(OTP_MINIMUM, "23.2"). ++-define(ERTS_MINIMUM, "11.1"). + + check(_Context) -> + ?LOG_DEBUG( +diff --git a/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl b/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl +index 2467570..eb19bbe 100644 +--- a/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl ++++ b/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_erlang_compat.erl +@@ -6,8 +6,8 @@ + + -export([check/1]). + +--define(OTP_MINIMUM, "24.2"). +--define(ERTS_MINIMUM, "12.2"). ++-define(OTP_MINIMUM, "23.2"). ++-define(ERTS_MINIMUM, "11.1"). + + check(_Context) -> + ?LOG_DEBUG( +-- +2.27.0 + diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index b9820c7..d062815 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -3,7 +3,7 @@ %global debug_package %{nil} Name: rabbitmq-server Version: 3.9.23 -Release: 1 +Release: 2 License: MPLv2.0 and Apache-2.0 and MIT and BSD and ISC 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 @@ -17,6 +17,7 @@ Patch2: rabbitmq-server-0002-Use-default-EPMD-socket.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 +Patch6: rabbitmq-server-0006-Downgrade-required-erlang-version.patch URL: https://www.rabbitmq.com/ BuildRequires: elixir erlang >= %{erlang_minver} libxslt python3 python3-simplejson rsync @@ -139,6 +140,9 @@ done %{_mandir}/man8/rabbitmqctl.8* %changelog +* Tue Nov 29 2022 Ge Wang - 3.9.23-2 +- Downgrade required erlang version + * Wed Oct 19 2022 liyuxiang - 3.9.23-1 - Update to version 3.9.23 to fix CVE-2022-31008 -- Gitee