rpms / rabbitmq-server

Clone
Source Code
GIT

6f2b52 RabbitMQ ver. 3.8.0

Authored and Committed by jeckersb 5 years ago
raw patch tree parent
3 files changed. 37 lines added. 15 lines removed.
rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
file modified
+12 -5
rabbitmq-server-0002-Add-systemd-notification-support.patch
file modified
+12 -5
rabbitmq-server.spec
file modified
+13 -5 
    RabbitMQ ver. 3.8.0
file modified
+12 -5
rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch CHANGED
@@ -1,17 +1,21 @@
1
+ From 5520a8d2bcc50e3875940ab2d16055ac7839ed86 Mon Sep 17 00:00:00 2001
1
2
From: Peter Lemenkov <lemenkov@gmail.com>
2
3
Date: Thu, 19 May 2016 16:04:56 +0300
3
4
Subject: [PATCH] Remove excessive sd_notify code
4
5
5
6
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
7
+ ---
8
+ src/rabbit.erl | 114 -------------------------------------------------
9
+ 1 file changed, 114 deletions(-)
6
10
7
11
diff --git a/src/rabbit.erl b/src/rabbit.erl
8
- index b39a81550..20f98cd0e 100644
12
+ index c49c4b7e7..de51e658f 100644
9
13
--- a/src/rabbit.erl
10
14
+++ b/src/rabbit.erl
11
- @@ -352,123 +352,9 @@ broker_start() ->
12
- Plugins = rabbit_plugins:setup(),
13
- ToBeLoaded = Plugins ++ ?APPS,
14
- start_apps(ToBeLoaded),
15
+ @@ -339,123 +339,9 @@ load_all_apps() ->
16
+
17
+ broker_start(Apps) ->
18
+ start_loaded_apps(Apps),
15
19
- maybe_sd_notify(),
16
20
ok = rabbit_lager:broker_is_started(),
17
21
ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())).
@@ -132,3 +136,6 @@ index b39a81550..20f98cd0e 100644
132
136
start_it(StartFun) ->
133
137
Marker = spawn_link(fun() -> receive stop -> ok end end),
134
138
case catch register(rabbit_boot, Marker) of
139
+ --
140
+ 2.21.0
141
+
file modified
+12 -5
rabbitmq-server-0002-Add-systemd-notification-support.patch CHANGED
@@ -1,16 +1,20 @@
1
+ From 5469e5c3c861e8d55ca7ac50954e72b142139992 Mon Sep 17 00:00:00 2001
1
2
From: John Eckersberg <jeckersb@redhat.com>
2
3
Date: Wed, 18 Feb 2015 16:11:12 -0500
3
4
Subject: [PATCH] Add systemd notification support
4
5
6
+ ---
7
+ src/rabbit.erl | 5 +++++
8
+ 1 file changed, 5 insertions(+)
5
9
6
10
diff --git a/src/rabbit.erl b/src/rabbit.erl
7
- index 20f98cd0e..fd1023f24 100644
11
+ index de51e658f..007b9fa6a 100644
8
12
--- a/src/rabbit.erl
9
13
+++ b/src/rabbit.erl
10
- @@ -352,6 +352,11 @@ broker_start() ->
11
- Plugins = rabbit_plugins:setup(),
12
- ToBeLoaded = Plugins ++ ?APPS,
13
- start_apps(ToBeLoaded),
14
+ @@ -339,6 +339,11 @@ load_all_apps() ->
15
+
16
+ broker_start(Apps) ->
17
+ start_loaded_apps(Apps),
14
18
+ case code:load_file(sd_notify) of
15
19
+ {module, sd_notify} -> SDNotify = sd_notify,
16
20
+ SDNotify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n");
@@ -19,3 +23,6 @@ index 20f98cd0e..fd1023f24 100644
19
23
ok = rabbit_lager:broker_is_started(),
20
24
ok = log_broker_started(rabbit_plugins:strictly_plugins(rabbit_plugins:active())).
21
25
26
+ --
27
+ 2.21.0
28
+
file modified
+13 -5
rabbitmq-server.spec CHANGED
@@ -1,4 +1,4 @@
1
- %global erlang_minver 20
1
+ %global erlang_minver 21.3
2
2
# We want to install into /usr/lib, even on 64-bit platforms
3
3
%global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
4
4
# Technically, we're noarch; but Elixir we're using is not.
@@ -6,8 +6,8 @@
6
6
7
7
8
8
Name: rabbitmq-server
9
- Version: 3.7.16
10
- Release: 2%{?dist}
9
+ Version: 3.8.0
10
+ Release: 1%{?dist}
11
11
License: MPLv1.1
12
12
Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz
13
13
Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz.asc
@@ -35,6 +35,7 @@ BuildRequires: systemd
35
35
BuildRequires: xmlto
36
36
BuildRequires: zip
37
37
Requires: logrotate
38
+ Requires: erlang-cuttlefish
38
39
Requires: erlang-erts%{?_isa} >= %{erlang_minver}
39
40
Requires: erlang-kernel%{?_isa} >= %{erlang_minver}
40
41
Requires: erlang-eldap%{?_isa} >= %{erlang_minver}
@@ -120,12 +121,14 @@ for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-diagnostics
120
121
ln -s %{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app}
121
122
done
122
123
124
+ ln -s %{_bindir}/cuttlefish %{buildroot}%{_rabbit_libdir}/bin/cuttlefish
125
+
123
126
install -p -D -m 0755 scripts/rabbitmq-server.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
124
127
install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
125
128
126
129
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
127
130
128
- install -p -D -m 0644 ./deps/rabbit/docs/rabbitmq.config.example %{buildroot}%{_sysconfdir}/rabbitmq/rabbitmq.config
131
+ install -p -D -m 0644 ./deps/rabbit/docs/rabbitmq.conf.example %{buildroot}%{_sysconfdir}/rabbitmq/rabbitmq.conf
129
132
130
133
install -d %{buildroot}%{_localstatedir}/run/rabbitmq
131
134
install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
@@ -171,7 +174,7 @@ done
171
174
172
175
%files
173
176
%dir %attr(0755, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq
174
- %config(noreplace) %attr(0644, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq/rabbitmq.config
177
+ %config(noreplace) %attr(0644, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq/rabbitmq.conf
175
178
%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
176
179
%{_sbindir}/rabbitmqctl
177
180
%{_sbindir}/rabbitmq-server
@@ -194,10 +197,15 @@ done
194
197
%{_mandir}/man8/rabbitmq-plugins.8*
195
198
%{_mandir}/man8/rabbitmq-server.8*
196
199
%{_mandir}/man8/rabbitmq-service.8*
200
+ %{_mandir}/man8/rabbitmq-queues.8*
201
+ %{_mandir}/man8/rabbitmq-upgrade.8*
197
202
%{_mandir}/man8/rabbitmqctl.8*
198
203
199
204
200
205
%changelog
206
+ * Tue Oct 1 2019 John Eckersberg <eck@redhat.com> - 3.8.0-1
207
+ - Ver. 3.8.0
208
+
201
209
* Tue Sep 24 2019 John Eckersberg <eck@redhat.com> - 3.7.16-2
202
210
- Enable rabbitmq-diagnostics command
203
211

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation