diff --git a/rabbitmq-server-0006-Downgrade-required-erlang-version.patch b/rabbitmq-server-0006-Downgrade-required-erlang-version.patch deleted file mode 100644 index 59b4597c8734742c5784aafd56a6b2012c63c334..0000000000000000000000000000000000000000 --- a/rabbitmq-server-0006-Downgrade-required-erlang-version.patch +++ /dev/null @@ -1,43 +0,0 @@ -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-0006-fix-elixir-version.patch b/rabbitmq-server-0006-fix-elixir-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..a2f19ceed6186aa1184adcbf9601774f9bcfcd28 --- /dev/null +++ b/rabbitmq-server-0006-fix-elixir-version.patch @@ -0,0 +1,25 @@ +From bb22530976e8ee139daf271eeedeb9ac40dbd10c Mon Sep 17 00:00:00 2001 +From: shafeipaozi <2829702579@qq.com> +Date: Thu, 21 Mar 2024 21:32:01 +0800 +Subject: [PATCH] gg + +--- + rabbitmq-server-3.12.10/deps/rabbitmq_cli/mix.exs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rabbitmq-server-3.12.10/deps/rabbitmq_cli/mix.exs b/rabbitmq-server-3.12.10/deps/rabbitmq_cli/mix.exs +index ac1909b..3b5a70e 100644 +--- a/deps/rabbitmq_cli/mix.exs ++++ b/deps/rabbitmq_cli/mix.exs +@@ -11,7 +11,7 @@ defmodule RabbitMQCtl.MixfileBase do + [ + app: :rabbitmqctl, + version: "3.12.1", +- elixir: ">= 1.13.4 and < 1.16.0", ++ elixir: ">= 1.13.4 and < 1.16.2", + build_embedded: Mix.env() == :prod, + start_permanent: Mix.env() == :prod, + escript: [main_module: RabbitMQCtl, emu_args: "-hidden", path: "escript/rabbitmqctl"], +-- +2.42.0 + diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index d062815d0d451f7ed455e05c01b0987fc07c20fb..c7b4c446af668f9b417608e0b10c23b95fa07f44 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -2,8 +2,8 @@ %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq %global debug_package %{nil} Name: rabbitmq-server -Version: 3.9.23 -Release: 2 +Version: 3.12.10 +Release: 1 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,7 +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 +Patch6: rabbitmq-server-0006-fix-elixir-version.patch URL: https://www.rabbitmq.com/ BuildRequires: elixir erlang >= %{erlang_minver} libxslt python3 python3-simplejson rsync @@ -135,11 +135,15 @@ done %{_mandir}/man8/rabbitmq-plugins.8* %{_mandir}/man8/rabbitmq-server.8* %{_mandir}/man8/rabbitmq-service.8* +%{_mandir}/man8/rabbitmq-streams.8* %{_mandir}/man8/rabbitmq-queues.8* %{_mandir}/man8/rabbitmq-upgrade.8* %{_mandir}/man8/rabbitmqctl.8* %changelog +* Thu Mar 21 2024 shafeipaozi - 3.12.10-1 +- Update to version 3.12.10 + * Tue Nov 29 2022 Ge Wang - 3.9.23-2 - Downgrade required erlang version diff --git a/rabbitmq-server_3.9.23.orig.tar.xz b/rabbitmq-server_3.12.10.orig.tar.xz similarity index 31% rename from rabbitmq-server_3.9.23.orig.tar.xz rename to rabbitmq-server_3.12.10.orig.tar.xz index ab2386d9a88b1fffd66351f89933e76fd72ebe2f..3b0dad105261e6984c3114a08f53fc71f791cc7d 100644 Binary files a/rabbitmq-server_3.9.23.orig.tar.xz and b/rabbitmq-server_3.12.10.orig.tar.xz differ diff --git a/rabbitmq-server_3.12.10.orig.tar.xz.asc b/rabbitmq-server_3.12.10.orig.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..9cf73a817da311e075d93e357c24634bca924762 --- /dev/null +++ b/rabbitmq-server_3.12.10.orig.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAmVdhFYACgkQa3OjbmAm +38oJ0BAAoCx5ecatr95zhbGDpwby0zqzPUeDMCDXpskg0rJxzL8Lp3uQXkGsDGbv +j+T6VXk0BA1Hg/mcoO7x1iJE938h+QGLsGV3be8CN5TY3romsS9cJWo4MU1sEo1v +95iZBUPQd80MaeGnoHFAlCSYuXfTtL7UN11nXwS8gExiLSrqkZR/Up+T0SUgfrqn +8WAdWCBJnOnCA05//cWvU5JYfGQ3555QftudrWxUb+xpLyiu01pDLpv0CroL2sYn +FZ2eg9GhbTRfjypcD+waChN5iFGRUs/YSPhnuFx8gKAahrdTK5dPibp0gCk4Vg+F +tqDtZYCwVHIgdlSlmY23LvhOQeEeosasjRzxQaCEWo2YwXYvYI3SawjGZSItQGUT +sPsdJYxFw5WyHFFxiKadixMv89ROAuikKj+xYz2WtnqR1vhXvfkaJJR7Q/7mfJ7A +0vMW4WvrZxFwcS2SodNdSQLX4F/kBZqOsy1KImtAxwBRGO/8TtS/vHNBH7/Y17ZE +FTy0nWWzAIkXsDvA+Ad9ORwf2uNQTYyE2dd47Glm00CyHmVY4+ZO5T8xeW5qXQ0j +yICsIeO6zi86aYVnEsMB6AxjnMjnYswxcEd9A86DnfUJ/WwZc2RxqtRMorSoR3vv +jdKX50bc38/J8EOXmBOSGa1MUvJGgav7PZtNkLRebqVN06Nk4p0= +=srnx +-----END PGP SIGNATURE----- diff --git a/rabbitmq-server_3.9.23.orig.tar.xz.asc b/rabbitmq-server_3.9.23.orig.tar.xz.asc deleted file mode 100644 index 2fb42d948f7db7ba83ef86d0bb12450b194c6b40..0000000000000000000000000000000000000000 --- a/rabbitmq-server_3.9.23.orig.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAmMst+MACgkQa3OjbmAm -38pJCA/+Ngkk5GznDZjvrDj2bDERG0s44aOXkxkQUYtCgyXrJFb2KAwgNBHW58Lr -zu5oFhdx9550BXkIKxJRfZOOkROrVqch/USuJtXfs1BIkx8uncCzf7aDKqQtziRp -Ouzceq9BrpQEJKNq9sRLAaUmRAXIiEym0988aN+to4c2teaCRrDdgjPdhbSYl8S/ -hnnJgAtR3T+18BHxzyMB90BISaVk3GBFzcXzXC4ovUiin4ckyFd+humbZtqOVVb+ -p3COa9YIsJUKPGra7Xk3A3xQlKlbEDaPJxtWS0+p9SbtJGjM3XkWGm3ucoWx4hyU -LvMrWG1MkW499p23CFo8QowQgukN5CziPN1e2keazDvs36qMPTcglBPlpQVazX6Z -BoApiIYUV+kCksknrjrJ/wT7+3dHwjBC+Ln+iwQ7wJteBBtZiD59UmYAgoeOKyFe -YDjzFSZYnazbROubTI4/734HOJytytzjPPnvFwC1+OHVXmD4xknk0isz+DZGJbPY -JbDINCL40+a6f5aoFoXnu6s1dqVnQHrxfaMZz/+FEVVtEGtDmZemyVfYxY4yFMt8 -0+Qfv/iZAPej60XESk1BqR8JPyTyctln0TxMB8i9JEIJwE0CPmjPdPIZu2iQgNvZ -kS9utErHh0kLIOtcr2rd5rl3HpRXg0X2GEREYiFC9NTY8mrdjW4= -=Uw3e ------END PGP SIGNATURE-----