commit 3d9a61084a2c73587a7ed832929b7901c9605753
Author: John Eckersberg <[email protected]>
Date: Tue Dec 16 11:22:18 2014 -0500
Rebase to 3.3.5 (RHBZ#1144100)
.gitignore | 1 +
rabbitmq-server-allow-guest-non-loopback.patch | 11 ++++++
rabbitmq-server-systemd-notify-support.patch | 21 ++++++++++++
rabbitmq-server.service | 8 +----
rabbitmq-server.spec | 41 ++++++++++++++++++++---
sources | 2 +-
6 files changed, 70 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19ee106..6d29ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ rabbitmq-server-1.8.0.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
diff --git a/rabbitmq-server-allow-guest-non-loopback.patch
b/rabbitmq-server-allow-guest-non-loopback.patch
new file mode 100644
index 0000000..f82db8c
--- /dev/null
+++ b/rabbitmq-server-allow-guest-non-loopback.patch
@@ -0,0 +1,11 @@
+--- rabbitmq-server-3.3.5/ebin/rabbit_app.in.orig 2014-10-30
13:57:00.406551209 -0400
++++ rabbitmq-server-3.3.5/ebin/rabbit_app.in 2014-10-30 13:57:25.722546887
-0400
+@@ -34,7 +34,7 @@
+ {default_user_tags, [administrator]},
+ {default_vhost, <<"/">>},
+ {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
+- {loopback_users, [<<"guest">>]},
++ {loopback_users, []},
+ {cluster_nodes, {[], disc}},
+ {server_properties, []},
+ {collect_statistics, none},
diff --git a/rabbitmq-server-systemd-notify-support.patch
b/rabbitmq-server-systemd-notify-support.patch
new file mode 100644
index 0000000..2d50de1
--- /dev/null
+++ b/rabbitmq-server-systemd-notify-support.patch
@@ -0,0 +1,21 @@
+diff -Naur rabbitmq-server-3.3.5.orig/src/rabbit.erl
rabbitmq-server-3.3.5/src/rabbit.erl
+--- rabbitmq-server-3.3.5.orig/src/rabbit.erl 2014-08-27 09:33:37.404506484
-0400
++++ rabbitmq-server-3.3.5/src/rabbit.erl 2014-08-27 09:34:51.800243321
-0400
+@@ -314,6 +314,8 @@
+ rabbit_mnesia:check_cluster_consistency(),
+ ok = app_utils:start_applications(
+ app_startup_order(), fun handle_app_error/2),
++ {module, sd_notify} == code:load_file(sd_notify) andalso
++ sd_notify:sd_notify(0, "READY=1"),
+ ok = log_broker_started(rabbit_plugins:active())
+ end).
+
+@@ -336,6 +338,8 @@
+ false),
+ ok = app_utils:start_applications(
+ StartupApps, fun handle_app_error/2),
++ {module, sd_notify} == code:load_file(sd_notify) andalso
++ sd_notify:sd_notify(0, "READY=1"),
+ ok = log_broker_started(Plugins)
+ end).
+
diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index 193661d..90f1553 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -3,18 +3,12 @@ Description=RabbitMQ broker
After=syslog.target network.target
[Service]
-Type=simple
+Type=notify
User=rabbitmq
Group=rabbitmq
-Environment=RABBITMQ_PID_FILE=/var/run/rabbitmq/pid
WorkingDirectory=/var/lib/rabbitmq
-# Ensure cookie is created to avoid race
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1059913
-ExecStartPre=-/bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl status > /dev/null
2>&1"
ExecStart=/usr/lib/rabbitmq/bin/rabbitmq-server
-ExecStartPost=/usr/lib/rabbitmq/bin/rabbitmqctl wait /var/run/rabbitmq/pid
ExecStop=/usr/lib/rabbitmq/bin/rabbitmqctl stop
-ExecStopPost=/usr/bin/rm /var/run/rabbitmq/pid
[Install]
WantedBy=multi-user.target
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 10e9bc8..9d697a4 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -2,8 +2,8 @@
Name: rabbitmq-server
-Version: 3.1.5
-Release: 7%{?dist}
+Version: 3.3.5
+Release: 3%{?dist}
License: MPLv1.1
Group: Development/Libraries
Source:
http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Requires: erlang-mnesia%{?_isa} >= %{erlang_minver}
Requires: erlang-os_mon%{?_isa} >= %{erlang_minver}
Requires: erlang-public_key%{?_isa} >= %{erlang_minver}
Requires: erlang-sasl%{?_isa} >= %{erlang_minver}
+Requires: erlang-sd_notify%{?_isa}
Requires: erlang-ssl%{?_isa} >= %{erlang_minver}
Requires: erlang-stdlib%{?_isa} >= %{erlang_minver}
Requires: erlang-tools%{?_isa} >= %{erlang_minver}
@@ -52,6 +53,11 @@ Requires(preun):initscripts
# https://bugzilla.redhat.com/show_bug.cgi?id=1032595#c8
Patch0: rabbitmq-probe-ephemeral-port.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1103524
+Patch1: rabbitmq-server-systemd-notify-support.patch
+
+Patch2: rabbitmq-server-allow-guest-non-loopback.patch
+
%description
RabbitMQ is an implementation of AMQP, the emerging standard for high
performance enterprise messaging. The RabbitMQ server is a robust and
@@ -70,6 +76,8 @@ scalable implementation of an AMQP broker.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
cp %{S:2} %{_rabbit_wrapper}
@@ -82,7 +90,8 @@ rm -rf %{buildroot}
make install TARGET_DIR=%{_maindir} \
SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
- MAN_DIR=%{buildroot}%{_mandir}
+ MAN_DIR=%{buildroot}%{_mandir} \
+ DOC_INSTALL_DIR=%{buildroot}%{_pkgdocdir}
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
@@ -95,6 +104,7 @@ install -p -D -m 0644 %{S:6}
%{buildroot}%{_unitdir}/%{name}.service
%endif
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
install -p -D -m 0755 %{_rabbit_server_ocf}
%{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
install -p -D -m 0644 %{S:3}
%{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
@@ -200,9 +210,28 @@ done
rm -rf %{buildroot}
%changelog
-* Sun Jun 01 2014 Lon Hohberger <[email protected]> - 3.1.5-7
-- Use specific subpackages of erlang instead of the entire
- metapackage (bz1083637)
+* Tue Nov 18 2014 John Eckersberg <[email protected]> - 3.3.5-3
+- Add rabbitmq-plugins to default path (rhbz#1126680)
+
+* Thu Oct 30 2014 John Eckersberg <[email protected]> - 3.3.5-2
+- Add patch to allow guest login from non-loopback connections
+
+* Wed Aug 27 2014 John Eckersberg <[email protected]> - 3.3.5-1
+- Rebase to 3.3.5 from rawhide
+
+* Tue Jun 17 2014 John Eckersberg <[email protected]> - 3.1.5-6.3
+- Revert changes from 3.1.5-6.1 and 3.1.5-6.2
+- Update service file to require epmd socket
+
+* Thu Jun 5 2014 John Eckersberg <[email protected]> - 3.1.5-6.2
+- Use forking daemon to prevent race (RHBZ#1104193 continued)
+
+* Thu Jun 5 2014 John Eckersberg <[email protected]> - 3.1.5-6.1
+- Temporarily comment out ExecStartPre/Post lines in service file
(RHBZ#1104193)
+
+* Thu May 08 2014 Lon Hohberger <[email protected]> - 3.1.5-6.0
+- Conditionalize systemd BuildRequires
+- Require only the parts of Erlang that are needed to run
* Wed Apr 09 2014 Alan Pevec <[email protected]> - 3.1.5-6
- Fix failure to start on boot on RHEL7 (#1085418)
diff --git a/sources b/sources
index 23ffe6f..63756e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a412e0d9dcba1e926981a71ee41ccfc rabbitmq-server-3.1.5.tar.gz
+3bf0c4be1aaa6fdb483470aba14a6c81 rabbitmq-server-3.3.5.tar.gz
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
