From bd8436610b051556b8fb23f7955039a8a8f0baaa4c3abf0351b1768bbce16eb7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 4 Apr 2014 07:51:56 +0000 Subject: [PATCH 1/2] Accepting request 228860 from home:vuntz:branches:network:messaging:amqp Fixes to OCF file OBS-URL: https://build.opensuse.org/request/show/228860 OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=39 --- ocf-fixes.patch | 22 ++++++++++++++++++++++ rabbitmq-server.changes | 11 +++++++++++ rabbitmq-server.spec | 6 ++++-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ocf-fixes.patch diff --git a/ocf-fixes.patch b/ocf-fixes.patch new file mode 100644 index 0000000..f200461 --- /dev/null +++ b/ocf-fixes.patch @@ -0,0 +1,22 @@ +Index: rabbitmq-server-2.8.7/rabbitmq-server.ocf +=================================================================== +--- rabbitmq-server-2.8.7.orig/rabbitmq-server.ocf ++++ rabbitmq-server-2.8.7/rabbitmq-server.ocf +@@ -256,7 +256,7 @@ rabbitmqctl_action() { + ocf_log debug "RabbitMQ server is running normally" + return $OCF_SUCCESS + ;; +- 2) ++ 1|2) + ocf_log debug "RabbitMQ server is not running" + return $OCF_NOT_RUNNING + ;; +@@ -299,7 +299,7 @@ rabbit_stop() { + return $OCF_SUCCESS + fi + +- $RABBITMQ_CTL stop ++ rabbitmqctl_action stop + rc=$? + + if [ "$rc" != 0 ]; then diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes index 80068e8..5bc0a1e 100644 --- a/rabbitmq-server.changes +++ b/rabbitmq-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 2 21:03:09 UTC 2014 - vuntz@suse.com + +- Add ocf-fixes.patch to fix issues in the OCF file: + - use the wrapper function to call rabbitmqctl for stop, so that + we interpret correctly the exit code. + - accept 1 as valid exit code from "rabbitmqctl status", instead + of totally breaking when we get it. +- We use a patch as the OCF file comes from upstream, so it's + better to keep the changes isolated. + ------------------------------------------------------------------- Thu Mar 27 11:20:12 UTC 2014 - dmueller@suse.com diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 73667b8..35e69ed 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -41,6 +41,7 @@ Source6: rabbitmq-server.service Source7: rabbitmq-server.tmpfiles.d.conf Patch0: no-nmap.patch Patch1: no-remove-common.patch +Patch10: ocf-fixes.patch BuildRequires: erlang BuildRequires: erlang-src BuildRequires: fdupes @@ -102,6 +103,9 @@ This package includes the RabbitMQ AMQP language bindings for Erlang. %setup -q %patch0 %patch1 +%define _rabbit_server_ocf `basename %{SOURCE4}` +cp %{SOURCE4} %{_rabbit_server_ocf} +%patch10 -p1 %build make all VERSION=%{version} @@ -127,11 +131,9 @@ install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service # Install wrapper scripts %define _rabbit_wrapper %{_builddir}/`basename %{SOURCE2}` -%define _rabbit_server_ocf %{_builddir}/`basename %{SOURCE4}` cp %{SOURCE2} %{_rabbit_wrapper} sed -i 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' %{_rabbit_wrapper} sed -i 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper} -cp %{SOURCE4} %{_rabbit_server_ocf} install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins From 8b9acdfa1412e8aead9132c22340a47a9a0586983850e2df6ec3b7103e7ddf54 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 4 Apr 2014 07:59:39 +0000 Subject: [PATCH 2/2] - update to 3.3.0: * long list of security, bugfixes and enhancements * see http://www.rabbitmq.com/release-notes/README-3.3.0.txt OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=40 --- rabbitmq-server-3.2.4.tar.gz | 3 --- rabbitmq-server-3.3.0.tar.gz | 3 +++ rabbitmq-server.changes | 7 +++++++ rabbitmq-server.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 rabbitmq-server-3.2.4.tar.gz create mode 100644 rabbitmq-server-3.3.0.tar.gz diff --git a/rabbitmq-server-3.2.4.tar.gz b/rabbitmq-server-3.2.4.tar.gz deleted file mode 100644 index 82e1d07..0000000 --- a/rabbitmq-server-3.2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a930f92b362df2f292ec5f0281aa2011eb0c668faf6e24c4653a9fc53ec43b9f -size 3588097 diff --git a/rabbitmq-server-3.3.0.tar.gz b/rabbitmq-server-3.3.0.tar.gz new file mode 100644 index 0000000..68ca383 --- /dev/null +++ b/rabbitmq-server-3.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f0e2584becfd9826a79f44484db9bda853ffaefbdcc47cbc4065d88c2fd8623 +size 3468885 diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes index 5bc0a1e..638eaf3 100644 --- a/rabbitmq-server.changes +++ b/rabbitmq-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 4 07:55:49 UTC 2014 - dmueller@suse.com + +- update to 3.3.0: + * long list of security, bugfixes and enhancements + * see http://www.rabbitmq.com/release-notes/README-3.3.0.txt + ------------------------------------------------------------------- Wed Apr 2 21:03:09 UTC 2014 - vuntz@suse.com diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 35e69ed..91ceb9e 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -24,7 +24,7 @@ %endif Name: rabbitmq-server -Version: 3.2.4 +Version: 3.3.0 Release: 0 Summary: The RabbitMQ Server License: MPL-1.1