From 6f2b524c427e7819841b8d9efc612316801d28be Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Oct 01 2019 19:25:30 +0000 Subject: RabbitMQ ver. 3.8.0 --- diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index b7a4dc3..d9a01ad 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -1,17 +1,21 @@ +From 5520a8d2bcc50e3875940ab2d16055ac7839ed86 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 19 May 2016 16:04:56 +0300 Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov +--- + src/rabbit.erl | 114 ------------------------------------------------- + 1 file changed, 114 deletions(-) diff --git a/src/rabbit.erl b/src/rabbit.erl -index b39a81550..20f98cd0e 100644 +index c49c4b7e7..de51e658f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -352,123 +352,9 @@ broker_start() -> - Plugins = rabbit_plugins:setup(), - ToBeLoaded = Plugins ++ ?APPS, - start_apps(ToBeLoaded), +@@ -339,123 +339,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())). @@ -132,3 +136,6 @@ index b39a81550..20f98cd0e 100644 start_it(StartFun) -> Marker = spawn_link(fun() -> receive stop -> ok end end), case catch register(rabbit_boot, Marker) of +-- +2.21.0 + diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 4e3c68d..6712136 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -1,16 +1,20 @@ +From 5469e5c3c861e8d55ca7ac50954e72b142139992 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 18 Feb 2015 16:11:12 -0500 Subject: [PATCH] Add systemd notification support +--- + src/rabbit.erl | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/src/rabbit.erl b/src/rabbit.erl -index 20f98cd0e..fd1023f24 100644 +index de51e658f..007b9fa6a 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -352,6 +352,11 @@ broker_start() -> - Plugins = rabbit_plugins:setup(), - ToBeLoaded = Plugins ++ ?APPS, - start_apps(ToBeLoaded), +@@ -339,6 +339,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"); @@ -19,3 +23,6 @@ index 20f98cd0e..fd1023f24 100644 ok = rabbit_lager:broker_is_started(), ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())). +-- +2.21.0 + diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 3207e3f..cace799 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -1,4 +1,4 @@ -%global erlang_minver 20 +%global erlang_minver 21.3 # We want to install into /usr/lib, even on 64-bit platforms %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq # Technically, we're noarch; but Elixir we're using is not. @@ -6,8 +6,8 @@ Name: rabbitmq-server -Version: 3.7.16 -Release: 2%{?dist} +Version: 3.8.0 +Release: 1%{?dist} License: MPLv1.1 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 @@ -35,6 +35,7 @@ BuildRequires: systemd BuildRequires: xmlto BuildRequires: zip Requires: logrotate +Requires: erlang-cuttlefish Requires: erlang-erts%{?_isa} >= %{erlang_minver} Requires: erlang-kernel%{?_isa} >= %{erlang_minver} Requires: erlang-eldap%{?_isa} >= %{erlang_minver} @@ -120,12 +121,14 @@ for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-diagnostics ln -s %{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app} done +ln -s %{_bindir}/cuttlefish %{buildroot}%{_rabbit_libdir}/bin/cuttlefish + install -p -D -m 0755 scripts/rabbitmq-server.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server -install -p -D -m 0644 ./deps/rabbit/docs/rabbitmq.config.example %{buildroot}%{_sysconfdir}/rabbitmq/rabbitmq.config +install -p -D -m 0644 ./deps/rabbit/docs/rabbitmq.conf.example %{buildroot}%{_sysconfdir}/rabbitmq/rabbitmq.conf install -d %{buildroot}%{_localstatedir}/run/rabbitmq install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf @@ -171,7 +174,7 @@ done %files %dir %attr(0755, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq -%config(noreplace) %attr(0644, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq/rabbitmq.config +%config(noreplace) %attr(0644, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq/rabbitmq.conf %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server %{_sbindir}/rabbitmqctl %{_sbindir}/rabbitmq-server @@ -194,10 +197,15 @@ done %{_mandir}/man8/rabbitmq-plugins.8* %{_mandir}/man8/rabbitmq-server.8* %{_mandir}/man8/rabbitmq-service.8* +%{_mandir}/man8/rabbitmq-queues.8* +%{_mandir}/man8/rabbitmq-upgrade.8* %{_mandir}/man8/rabbitmqctl.8* %changelog +* Tue Oct 1 2019 John Eckersberg - 3.8.0-1 +- Ver. 3.8.0 + * Tue Sep 24 2019 John Eckersberg - 3.7.16-2 - Enable rabbitmq-diagnostics command