From 1d1d3c2347fb43dbf44035209c8cfd4318a7186a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Feb 04 2019 15:10:47 +0000 Subject: RabbitMQ ver. 3.7.11 --- diff --git a/.gitignore b/.gitignore index 9b427f6..352c2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,3 @@ -rabbitmq-server-1.8.0.tar.gz -/rabbitmq-server-2.0.0.tar.gz -/rabbitmq-server-2.1.0.tar.gz -/rabbitmq-server-2.1.1.tar.gz -/rabbitmq-server-2.2.0.tar.gz -/rabbitmq-server-2.6.0.tar.gz -/rabbitmq-server-2.6.1.tar.gz -/rabbitmq-server-2.8.4.tar.gz -/rabbitmq-server-2.8.5.tar.gz -/rabbitmq-server-2.8.7.tar.gz -/rabbitmq-server-3.0.4.tar.gz -/rabbitmq-server-3.1.2.tar.gz -/rabbitmq-server-3.1.3.tar.gz -/rabbitmq-server-3.1.5.tar.gz -/rabbitmq-server-3.3.5.tar.gz -/rabbitmq-server-3.4.0.tar.gz -/rabbitmq-server-3.4.1.tar.gz -/rabbitmq-server-3.4.2.tar.gz -/rabbitmq-server-3.4.3.tar.gz -/rabbitmq-server-3.4.4.tar.gz -/rabbitmq-server-3.5.0.tar.gz -/rabbitmq-server-3.5.1.tar.gz -/rabbitmq-server-3.5.2.tar.gz -/rabbitmq-server-3.5.3.tar.gz -/rabbitmq-server-3.5.4.rc1.tar.gz -/rabbitmq-server-3.5.4.rc2.tar.gz -/rabbitmq-server-3.5.4.tar.gz -/rabbitmq-server-3.5.5.tar.gz -/rabbitmq-server-3.5.6.tar.gz -/rabbitmq-server-3.5.7.tar.gz -/rabbitmq-server-3.6.1.tar.xz -/rabbitmq-server-3.6.2.tar.xz -/rabbitmq-server-3.6.3.tar.xz -/rabbitmq-server-3.6.5.tar.xz -/rabbitmq-server-3.6.6.tar.xz -/rabbitmq-server-3.6.9.tar.xz -/rabbitmq-server-3.6.10.tar.xz -/rabbitmq-server-3.6.12.tar.xz -/rabbitmq-server-3.6.14.tar.xz -/rabbitmq-server-3.6.15.tar.xz -/rabbitmq-server-3.6.16.tar.xz +/rabbitmq-server-[0-9]*.[0-9]*.[0-9]*.tar.[xg]z +*~ +/rabbitmq-server_3.7.11.orig.tar.xz 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 a85f7b4..14c2f7a 100644 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch @@ -11,19 +11,19 @@ first one. Signed-off-by: Peter Lemenkov diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index a385a42..afa99ae 100644 +index e773bf6..1cbe1a4 100644 --- a/src/rabbit_nodes_common.erl +++ b/src/rabbit_nodes_common.erl -@@ -37,9 +37,14 @@ parts(NodeStr) -> - ensure_epmd() -> - {ok, Prog} = init:get_argument(progname), +@@ -80,9 +80,14 @@ 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), + ProtoDist = case init:get_argument(proto_dist) of + {ok, [Proto | _Protos]} -> Proto; + error -> "inet_tcp" + end, Port = open_port( - {spawn_executable, os:find_executable(Prog)}, + {spawn_executable, Exe}, [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]), + "-proto_dist", rabbit_misc:format("~p", [ProtoDist]), "-noshell", "-eval", "halt()."]}, diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index 1135b57..5567c1f 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -5,15 +5,16 @@ Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov diff --git a/src/rabbit.erl b/src/rabbit.erl -index 8971c6456..0f0256155 100644 +index 2b043178a..81ddc4e45 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -300,121 +300,8 @@ broker_start() -> +@@ -349,123 +349,9 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), - maybe_sd_notify(), - ok = log_broker_started(rabbit_plugins:active()). + ok = rabbit_lager:broker_is_started(), + ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). -%% Try to send systemd ready notification if it makes sense in the -%% current environment. standard_error is used intentionally in all @@ -93,7 +94,8 @@ index 8971c6456..0f0256155 100644 - end. - -sd_current_unit() -> -- case catch re:run(os:cmd("systemctl status " ++ os:getpid()), "([-.@0-9a-zA-Z]+)", [unicode, {capture, all_but_first, list}]) of +- CmdOut = os:cmd("ps -o unit= -p " ++ os:getpid()), +- case catch re:run(CmdOut, "([-.@0-9a-zA-Z]+)", [unicode, {capture, all_but_first, list}]) of - {'EXIT', _} -> - error; - {match, [Unit]} -> @@ -116,7 +118,7 @@ index 8971c6456..0f0256155 100644 - io:format(standard_error, "Service still in 'activating' state, bailing out~n", []), - false; -sd_wait_activation(Port, Unit, AttemptsLeft) -> -- case os:cmd("systemctl show --property=ActiveState " ++ Unit) of +- case os:cmd("systemctl show --property=ActiveState -- '" ++ Unit ++ "'") of - "ActiveState=activating\n" -> - timer:sleep(1000), - sd_wait_activation(Port, Unit, AttemptsLeft - 1); diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 8e712f5..71fe2e9 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Add systemd notification support diff --git a/src/rabbit.erl b/src/rabbit.erl -index 0f0256155..e40955e1f 100644 +index 81ddc4e45..f5673c9f8 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -300,6 +300,11 @@ broker_start() -> +@@ -349,6 +349,11 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), @@ -16,6 +16,6 @@ index 0f0256155..e40955e1f 100644 + SDNotify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"); + {error, _} -> ok + end, - ok = log_broker_started(rabbit_plugins:active()). + ok = rabbit_lager:broker_is_started(), + ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). - start_it(StartFun) -> 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 a8dc1eb..5bcdcaa 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 8cb133ab1..85215122c 100644 +index 4a1e18a9f..ed68c4d56 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ define PROJECT_ENV @@ -14,5 +14,5 @@ index 8cb133ab1..85215122c 100644 - {loopback_users, [<<"guest">>]}, + {loopback_users, []}, {password_hashing_module, rabbit_password_hashing_sha256}, - {cluster_nodes, {[], disc}}, {server_properties, []}, + {collect_statistics, none}, 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 11ed376..d53f7a6 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,14 +5,14 @@ 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 4d6dc3ff5..cc3479d37 100755 +index 045ca5017..bc8d3d60a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server -@@ -84,6 +84,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ +@@ -192,6 +192,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -boot "${CLEAN_BOOT_FILE}" \ -noinput \ -hidden \ + ${RABBITMQ_SERVER_ERL_ARGS} \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \ - -extra "${RABBITMQ_NODENAME}" + -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \ diff --git a/rabbitmq-server-3.6.16.tar.xz.asc b/rabbitmq-server-3.6.16.tar.xz.asc deleted file mode 100644 index bcfe570..0000000 --- a/rabbitmq-server-3.6.16.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAlshCk8ACgkQa3OjbmAm -38rGpg//S5ASA8q66LMWo2G0erDtpi04RXrBvXvHgf8A1Qoi/Q+MuAbU542lPQie -MuYzW7aHbrCvmbACqUW6xuIPuhiMl1eoILutn4wuKNT5mpmjCqWRLVKrILpI7h+5 -UAwby9V9avrdkSPYDgY6rn0h8XzmSTaRo8gQrrgsc+suvCF2KiV2pL6gv7fF385E -z0bhIADXIwZUeyNe2mI6NbmkIleflT014YmqKvV/CxEvhejsbzrn2osrnJK3i1KG -Ru1b/ttqH28zc+NZ28PQdD0tXS3rrGka/96qVPU28xkVeDwv8xmzC1tzUuIrUF0Y -mOx7LueWt18elJ7VjQnTQHLw9CoysXGcl7yY7jHek7KkCACjUs9Jo8QmIrR+Lgon -VlQujR1Ua28skcenIHCYN9slShTvSTeHrLYj1aeuNEMXceQRHAvlk2QLTrPhJqlK -eIDx8yOu+WYNH1YmTracywFmjXmF/hvJTRS0/OffZDlb6X1hOws6CJIj3SW0W+3H -q1F6BEdAt0TkGzmgv9QtjhbSPS2c421KpXb09M+19Z14VEvB2PHhRNHwPsEWcJMQ -+UALCPdt0gNGLydM4GiGERWlIbRtopbgh9kfkc9FLeBjPMsr8DFZDa38YAyocDXK -NrgQ6PDPIOphqvveiFu+oambDsa83auhT7qx+aVYTRB6DNowCyY= -=reui ------END PGP SIGNATURE----- diff --git a/rabbitmq-server-release-0001-Don-t-use-templates.patch b/rabbitmq-server-release-0001-Don-t-use-templates.patch index 2a03997..26eb088 100644 --- a/rabbitmq-server-release-0001-Don-t-use-templates.patch +++ b/rabbitmq-server-release-0001-Don-t-use-templates.patch @@ -5,23 +5,15 @@ Subject: [PATCH] Don't use templates Signed-off-by: Peter Lemenkov diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper -index f7333dc..801323b 100644 +index 9aae4f3..f658e26 100644 --- a/scripts/rabbitmq-script-wrapper +++ b/scripts/rabbitmq-script-wrapper -@@ -30,14 +30,14 @@ if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then - RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV") - . "$RABBITMQ_ENV" +@@ -79,7 +79,7 @@ exec_rabbitmq_server() { + # shellcheck source=/dev/null + . "$RABBITMQ_ENV" -- exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ -+ exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" - elif [ \( `id -u` = `id -u rabbitmq` -a "$SCRIPT" != "rabbitmq-plugins" \) -o \( `id -u` = 0 -a "$SCRIPT" = "rabbitmq-plugins" \) ] ; then - if [ -f $PWD/.erlang.cookie ] ; then - export HOME=. - fi - exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@" - elif [ `id -u` = 0 ] ; then -- @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" -+ su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" - else - /usr/lib/rabbitmq/bin/${SCRIPT} - echo +- exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ ++ exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" + } + + run_script_as_rabbitmq() { diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index d6229b5..5bcb1ab 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -1,14 +1,14 @@ -%global erlang_minver 18 +%global erlang_minver 20 # We want to install into /usr/lib, even on 64-bit platforms %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq Name: rabbitmq-server -Version: 3.6.16 -Release: 4%{?dist} +Version: 3.7.11 +Release: 1%{?dist} License: MPLv1.1 -Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_16/%{name}-%{version}.tar.xz -Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_16/%{name}-%{version}.tar.xz.asc +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 # curl -O https://raw.githubusercontent.com/lemenkov/rabbitmq-server/cdfc661/packaging/RPMS/Fedora/rabbitmq-server.logrotate Source3: rabbitmq-server.logrotate # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_16/packaging/RPMS/Fedora/rabbitmq-server.tmpfiles @@ -22,10 +22,16 @@ Patch201: rabbitmq-server-release-0001-Don-t-use-templates.patch URL: https://www.rabbitmq.com/ BuildArch: noarch -BuildRequires: erlang >= %{erlang_minver}, python2-simplejson, xmlto, libxslt, python2, zip +BuildRequires: elixir +BuildRequires: erlang >= %{erlang_minver} +BuildRequires: libxslt BuildRequires: python-unversioned-command +BuildRequires: python2 +BuildRequires: python2-simplejson BuildRequires: rsync BuildRequires: systemd +BuildRequires: xmlto +BuildRequires: zip Requires: logrotate Requires: erlang-erts%{?_isa} >= %{erlang_minver} Requires: erlang-kernel%{?_isa} >= %{erlang_minver} @@ -75,7 +81,7 @@ rm -f \ %build #USE_SPECS="true" USE_PROPER_QC="false" make %{?_smp_mflags} -make %{?_smp_mflags} VERSION="%{version}" +make %{?_smp_mflags} VERSION="%{version}" V=1 %install @@ -173,13 +179,18 @@ done %dir %attr(0750, rabbitmq, rabbitmq) %{_localstatedir}/log/rabbitmq %dir %attr(0755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq %license LICENSE LICENSE-* -%{_mandir}/man1/rabbitmq-plugins.1* -%{_mandir}/man1/rabbitmq-server.1* -%{_mandir}/man1/rabbitmqctl.1* %{_mandir}/man5/rabbitmq-env.conf.5* +%{_mandir}/man8/rabbitmq-echopid.8* +%{_mandir}/man8/rabbitmq-plugins.8* +%{_mandir}/man8/rabbitmq-server.8* +%{_mandir}/man8/rabbitmq-service.8* +%{_mandir}/man8/rabbitmqctl.8* %changelog +* Mon Feb 04 2019 Peter Lemenkov - 3.7.11-1 +- Ver. 3.7.11 + * Sat Feb 02 2019 Fedora Release Engineering - 3.6.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/rabbitmq-server_3.7.11.orig.tar.xz.asc b/rabbitmq-server_3.7.11.orig.tar.xz.asc new file mode 100644 index 0000000..a5698de --- /dev/null +++ b/rabbitmq-server_3.7.11.orig.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJcUzUtAAoJEGtzo25gJt/KQ2oQAIiwPKNKjOdAIUjsN9w21atS +Ihiuct8WQ9KbYmZOaziHavRM2i+Y+uv2dldNpxxFTed68dUV8yzs8LBzwfDF+oIq +DSfkhP2MEzYioRHkrvmlXj3vMT1POoK+C5OMplJHWf/OGgI8pDsBmavxtCl9vPd+ +i8mEMIEz/r/sLkGKcdz+6AtS0gFHd41E5AqOBP3rGV6mCFrlPegZ/ZaZ8rb3ldlt +XdVoItDsQvZ0VQMlP7bVLqAQEAYq4lj+PuViDr+ocsR5Z0P5lBur/hAc4QNn3I1y +ktBjnjHdd3nV2Uni6u+7++eZQiKlX6xxht4aA8EgMwyGoc6nqlbQpUbTcwe9Rl8I +eJNl2q3yZ6htvzULX66HX8ioFlvVYW63mpwJhdLAsvQjRaQQMOoIyX490XDSLDLW +9h2JbtT0BhOWuoyuu+TK3e4OOA67SFZtKTy2Gf0oUrnf0Ojv3qZm2oIDOOkXr3jj +fbA1Um1tcK7EmHtP2HGwR4IQD7lWrUbJUUnYJjdJGdumuqspRVmxq8Rr4hCdIiz8 +8TihkOgZljyTOcGNbBuLyQ+QQrjfK/v6L00R9T/fa45yhSMHRYKQpUfD51hdmnN8 +CMoQYR4sM7QjKipucCP84BJiPdcmNWhT1DmMpIYiFF5gwyceCJh5gbDi344L5Ak4 +YKbbyXlCIO7UmKES39Wm +=6GWD +-----END PGP SIGNATURE----- diff --git a/sources b/sources index 2163a93..41206e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-server-3.6.16.tar.xz) = e63d62966af4fe6289450f9e2826b9e07673abedb5c63dc16df8dc33e46e2b1e5e2aafb6a2254f282d86add8b4c2fa9bea8edb01d2d7de33120a52890be1d32f +SHA512 (rabbitmq-server_3.7.11.orig.tar.xz) = a54034ebc919be0c6f58832ea5d47f8e3964e30ca9185c59bf882c3dc17d1df5b6e1ab0460f75e8cf0cc325504cc3a674f7cb44a5d7613e16a5ad8b721a286a4