diff --git a/rabbitmq-server-0002-Use-default-EPMD-socket.patch b/rabbitmq-server-0002-Use-default-EPMD-socket.patch index e7d6b9acfde981d37378aa37cd3f5d0897c83ed9..50d6c770220437a517541c61191630df14dfeb6f 100644 --- a/rabbitmq-server-0002-Use-default-EPMD-socket.patch +++ b/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/rabbitmq-server-0004-force-python3.patch b/rabbitmq-server-0004-force-python3.patch index 5affba2d8c0e5346d9a259974a04b60a84931ab0..e9901b4ae49fa03d8d8bd6357cfdbf8164ed633a 100644 --- a/rabbitmq-server-0004-force-python3.patch +++ b/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/rabbitmq-server.spec b/rabbitmq-server.spec index 42fe967c5d870ebef5a7f87849d280e4b755a92e..b9820c7febfd86d22df6672a1b4aac0f5d705f13 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -2,7 +2,7 @@ %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq %global debug_package %{nil} Name: rabbitmq-server -Version: 3.9.10 +Version: 3.9.23 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 @@ -12,11 +12,12 @@ Source3: rabbitmq-server.logrotate # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_16/packaging/RPMS/Fedora/rabbitmq-server.tmpfiles 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 -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 +Patch1: rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch +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 + URL: https://www.rabbitmq.com/ BuildRequires: elixir erlang >= %{erlang_minver} libxslt python3 python3-simplejson rsync BuildRequires: systemd xmlto zip @@ -138,6 +139,9 @@ done %{_mandir}/man8/rabbitmqctl.8* %changelog +* Wed Oct 19 2022 liyuxiang - 3.9.23-1 +- Update to version 3.9.23 to fix CVE-2022-31008 + * Tue Jan 18 2022 Ge Wang - 3.9.10-1 - Update to version 3.9.10 diff --git a/rabbitmq-server_3.9.10.orig.tar.xz.asc b/rabbitmq-server_3.9.10.orig.tar.xz.asc deleted file mode 100644 index bf88d488f4ccfccff07c7eb75a539c550e9a6194..0000000000000000000000000000000000000000 --- a/rabbitmq-server_3.9.10.orig.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAmGXrBEACgkQa3OjbmAm -38pEGRAAqIGFRQWsGXTxkJkamWlBIXVTCoPQO6j0UNMwhtSWCPAl3QMUH3nAIMX4 -78JVU6vicouBSsfODLu8ug5lEAovlgtrOuhVZrveDR5+JIHtb/7ggO9TwJ8hYpgX -eS9+hyAAKRU1JdblBffV8YLBkuLPN7a/N29TMcIyM9ZLwQXOCua1PTiUxEMtJWpZ -d9g4f0NHwX3Un94jjWtpWHAdzfRj4m8ZUzZ6XYJeMUBZ2x0CApogYkCe/q7vXVae -jQOZfBLkJS1ZXbQCggqqZHFDZdnP27AF5ZtH+3ItgoTRZLviGWt+SR7PzT29O99J -UNmRq0BUbjddv6qaIr32Gb7lJ43X5OEWpZKymHF/+YgRUn698Tz1DtrVI9pvERIi -DSdNzUryYvcnxylCq+barcYp9l3Pxwwi6uG3mZoLy5n5uo0qPcW4iNE5lXIYWvcK -bmpjUppCidNUyL8oIXObmN+qz6NNhBr8VwTHdhu2qwkA4uEhKWo0/YZWN53NLoFu -ivRWfXe5bAlk8IH+ccrnIGF2Gfiy96yWhZkech2mZt3CPdOELz7f6qYYNbb6cAld -Drvqz06iKlB+bdJHKQagxLO2xU3LcLlzVIaI9iNhfvwjTsVOAJVpZPs+AQTOsEqg -7SDd08ZbLgcqgXjnstkKl8qFO8NY4YJrN2OlUeEgQM7L8cIhQng= -=lwrZ ------END PGP SIGNATURE----- diff --git a/rabbitmq-server_3.9.10.orig.tar.xz b/rabbitmq-server_3.9.23.orig.tar.xz similarity index 31% rename from rabbitmq-server_3.9.10.orig.tar.xz rename to rabbitmq-server_3.9.23.orig.tar.xz index 5dcfd5717b1aa8895226d1344d5ab13c4ed2053a..ab2386d9a88b1fffd66351f89933e76fd72ebe2f 100644 Binary files a/rabbitmq-server_3.9.10.orig.tar.xz and b/rabbitmq-server_3.9.23.orig.tar.xz differ diff --git a/rabbitmq-server_3.9.23.orig.tar.xz.asc b/rabbitmq-server_3.9.23.orig.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..2fb42d948f7db7ba83ef86d0bb12450b194c6b40 --- /dev/null +++ b/rabbitmq-server_3.9.23.orig.tar.xz.asc @@ -0,0 +1,16 @@ +-----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-----