diff --git a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch index e8e2112..32b99a6 100644 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch @@ -11,10 +11,10 @@ first one. Signed-off-by: Peter Lemenkov diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index 706df55..e1932cc 100644 +index f06c3d0..63c35ec 100644 --- a/src/rabbit_nodes_common.erl +++ b/src/rabbit_nodes_common.erl -@@ -80,9 +80,14 @@ do_ensure_epmd(false, Prog) -> +@@ -80,10 +80,15 @@ do_ensure_epmd(false, Prog) -> rabbit_log:error("ensure_epmd: unable to find executable '~s' in PATH: '~s'", [Prog, Path]); do_ensure_epmd(Exe, _) -> ID = rabbit_misc:random(1000000000), @@ -24,8 +24,9 @@ index 706df55..e1932cc 100644 + end, Port = open_port( {spawn_executable, Exe}, - [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]), + [{args, ["-boot", "no_dot_erlang", + "-sname", rabbit_misc:format("epmd-starter-~b", [ID]), + "-proto_dist", rabbit_misc:format("~p", [ProtoDist]), - "-noshell", "-eval", "halt()."]}, + "-noinput", "-s", "erlang", "halt"]}, exit_status, stderr_to_stdout, use_stdio]), port_shutdown_loop(Port). diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index eab670c..91dd256 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov diff --git a/src/rabbit.erl b/src/rabbit.erl -index 722da4c85..efbf57319 100644 +index 5dc1d2c2d..ec8c68596 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -354,123 +354,9 @@ broker_start() -> - Plugins = rabbit_plugins:setup(), - ToBeLoaded = Plugins ++ ?APPS, - start_apps(ToBeLoaded), +@@ -365,123 +365,9 @@ load_all_apps() -> + + broker_start(Apps) -> + start_loaded_apps(Apps), - maybe_sd_notify(), ok = rabbit_lager:broker_is_started(), ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 8cf842b..d523016 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -4,13 +4,13 @@ Subject: [PATCH] Add systemd notification support diff --git a/src/rabbit.erl b/src/rabbit.erl -index efbf57319..c6821d80e 100644 +index ec8c68596..ccec8b688 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -354,6 +354,11 @@ broker_start() -> - Plugins = rabbit_plugins:setup(), - ToBeLoaded = Plugins ++ ?APPS, - start_apps(ToBeLoaded), +@@ -365,6 +365,11 @@ load_all_apps() -> + + broker_start(Apps) -> + start_loaded_apps(Apps), + case code:load_file(sd_notify) of + {module, sd_notify} -> SDNotify = sd_notify, + SDNotify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"); diff --git a/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch index 5bcdcaa..cc12490 100644 --- a/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch +++ b/rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Allow guest login from non-loopback connections diff --git a/Makefile b/Makefile -index 4a1e18a9f..ed68c4d56 100644 +index ad73ff5de..d6631f326 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ define PROJECT_ENV diff --git a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch index 19a9add..a3390ea 100644 --- a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch +++ b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch @@ -5,7 +5,7 @@ Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS Signed-off-by: Peter Lemenkov diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server -index 69474d697..6b4a94d0f 100755 +index 0c040b95e..6ad81afd2 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -193,6 +193,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ @@ -14,5 +14,5 @@ index 69474d697..6b4a94d0f 100755 -hidden \ + ${RABBITMQ_SERVER_ERL_ARGS} \ -s rabbit_prelaunch \ + ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ - -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \ diff --git a/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch b/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch new file mode 100644 index 0000000..4904a38 --- /dev/null +++ b/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch @@ -0,0 +1,20 @@ +From: Peter Lemenkov +Date: Tue, 7 Jan 2020 00:19:51 +0300 +Subject: [PATCH] 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 ad023e7..d1cffb9 100644 +--- a/scripts/rabbitmq-script-wrapper ++++ b/scripts/rabbitmq-script-wrapper +@@ -45,7 +45,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 2dc36b7..00815d5 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -1,10 +1,10 @@ %global erlang_minver 20 %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq +%global debug_package %{nil} Name: rabbitmq-server -Version: 3.7.14 +Version: 3.7.23 Release: 1 License: MPLv1.1 -URL: https://www.rabbitmq.com/ Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/rabbitmq-server_%{version}.orig.tar.xz Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/rabbitmq-server_%{version}.orig.tar.xz.asc # curl -O https://raw.githubusercontent.com/lemenkov/rabbitmq-server/cdfc661/packaging/RPMS/Fedora/rabbitmq-server.logrotate @@ -18,8 +18,9 @@ Patch4: rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SER Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch Patch102: rabbitmq-common-0002-force-python3.patch Patch201: rabbitmq-server-release-0001-Don-t-use-templates.patch +Patch202: rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch -BuildArch: noarch +URL: https://www.rabbitmq.com/ BuildRequires: elixir erlang >= %{erlang_minver} libxslt python3 python3-simplejson rsync BuildRequires: systemd xmlto zip Requires: logrotate erlang-erts%{?_isa} >= %{erlang_minver} @@ -56,6 +57,7 @@ cd deps/rabbit_common %patch102 -p1 cd ../.. %patch201 -p1 +%patch202 -p1 cd deps/amqp10_common %patch301 -p1 cd ../.. @@ -146,5 +148,5 @@ done %{_mandir}/man8/rabbitmqctl.8* %changelog -* Mon Aug 24 2020 shaoqiang kang - 3.7.14-1 +* Thu Sep 3 2020 shaoqiang kang - 3.7.23-1 - Package init diff --git a/rabbitmq-server_3.7.14.orig.tar.xz b/rabbitmq-server_3.7.14.orig.tar.xz deleted file mode 100644 index 7106c9f..0000000 Binary files a/rabbitmq-server_3.7.14.orig.tar.xz and /dev/null differ diff --git a/rabbitmq-server_3.7.14.orig.tar.xz.asc b/rabbitmq-server_3.7.14.orig.tar.xz.asc deleted file mode 100644 index d1f8aa8..0000000 --- a/rabbitmq-server_3.7.14.orig.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJcnUHAAAoJEGtzo25gJt/KDc0P/jG4ZIyxmi/8G64adFspiSNS -tNlfZREH5xEhOWURBVY/+MDPYY0kG8SzgFo2mDQVariryiZkayHWtC6oy4FACH2n -mIJ7eCPAw0Y+m8x+2ndHIuy8TiSP8Ue156KcaSTjl+VxYtUZLHx5Z2Hs5MqNqdjv -VhN735Q78pHUgKfTbWGX5obPa4SCLqZUSG+Yc17hEo6fEJGgJuHHOAtHPBeL363W -dLKWRR5lHQVwr9ot3ngS3RreIIv2GX+zMijyanA8/v5y0TzAj76J9i73v6FOpHtK -1dkCi5gwE8wlpRIIJrMDVjpD7LsyrPXby7gPGrpOjnjHAegPVaHZOe4IRxqAUMr9 -zE52vC+NHUuEaoyho/O2WAVd7RNOGj3o2MlFOrXhODUQHeszOu0DY0A/VZHX1Grx -18W72nbk/CjAUsA1Lm6EGgYhagt5PE1hngFxrZN3tIJw2Y9urEwCttcBQmzfdBvC -LzhnBzOy30nbctUPGG8zxliYiSbUBbUUmO2+7PxMBkoLjPZ5l2cqOAl+tKvx2q1w -2LENcwfoNsJwEWJhLRB1d5Zk7UlKTdShR14Ar1P0G2mCkznJq3zv6zRhaBCte0xW -/MVhQUER+xuLft1ym6xkLQ+558jHSu/HUDL1BLSmkQGu+ywiHg3JXxqgD5qBXJbn -ZGbebTm9FdPfQXWHnqop -=g5Mj ------END PGP SIGNATURE----- diff --git a/rabbitmq-server_3.7.23.orig.tar.xz b/rabbitmq-server_3.7.23.orig.tar.xz new file mode 100644 index 0000000..5dc7f27 Binary files /dev/null and b/rabbitmq-server_3.7.23.orig.tar.xz differ diff --git a/rabbitmq-server_3.7.23.orig.tar.xz.asc b/rabbitmq-server_3.7.23.orig.tar.xz.asc new file mode 100644 index 0000000..568e84e --- /dev/null +++ b/rabbitmq-server_3.7.23.orig.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJd6JfNAAoJEGtzo25gJt/Kj4MP/AuPKqamP46clQrYkATFjXYj +iKaGhxO4Uls5HBYF7B1JT/SswWEMKHse5PZzg0ijn5eo+TVgG3SHpvlJWoZnB2Ig +Wss1vEsGJYetIxNH14U3uqMcl9keEe1CAA6HExkCZAXB1iDIv/Y6X2APzRN5TC7t ++5u2I61IBEpD5a4JebQbLt0IX40ITMAsaLRDcQ2+5voK034G3aQx2/5RnOdNezxn +PZY+A4ajghn6SARqiRGqKdCoqQVxC7hs+4tMGJJLDugYDvUXEFbUy1l813vEh24d +eMhe1PyzxO+eftEzxo0V/aUF2FvS9VdI2lKay2Uj27viiu8IaO/2INc478Tqybg7 +lr6anz5aHq1JN9Zrniq+EeL4uPIvTnrDeAE4W3XzctMscYRNeKwvVPxSL4A4Oa+G +dTjANDRIyorJSLf5PayZh0GtKyhfGWjDmbhs6GIBLLA7cs5LAwd78+aP2NZdVyPU +6nTS4kDJ2+23ACczXiP9nyJaiAUCSFPQRnHU5X8VKlXTYtaKl7KlR8TuTii0ppi5 +UWlMGUADiEkO8F1Px+C+yXrU1FXZhu3//BzQxh1NLzLTO4O4reWTHUegycyOFGfg +Bz0DxkcA2jqZzzdJ03/CEBeU5zt5VNa9DP4Pqeu3u/em0EyL48j3APYurdo7flLG +oqs3gaeRAxF1qzVaEUBD +=1rQe +-----END PGP SIGNATURE-----