Update version according to OSCI-1016

Increase open files limit according to OSCI-1077

Change-Id: I892ccc5d7bdc78451aca19708b975e4af426a6a5

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..0a29ee2
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+This is rabbitmq-server, a message broker implementing AMQP, STOMP and MQTT.
+
+Most of the documentation for RabbitMQ is provided on the RabbitMQ web
+site. You can see documentation for the current version at:
+
+http://www.rabbitmq.com/documentation.html
+
+and for previous versions at:
+
+http://www.rabbitmq.com/previous.html
+
+Man pages are installed with this package. Of particular interest are
+rabbitmqctl(1), to interact with a running RabbitMQ server, and
+rabbitmq-plugins(1), to enable and disable plugins. These should be
+run as the superuser.
+
+An example configuration file is provided in the same directory as
+this README. Copy it to /etc/rabbitmq/rabbitmq.config to use it. The
+RabbitMQ server must be restarted after changing the configuration
+file or enabling or disabling plugins.

diff --git a/rabbitmq-script-wrapper b/rabbitmq-script-wrapper
index 72ae60966a56f8c78de5d90367a636abae1b8ae9..926ecc94d8e670f7be43f2bc2db754ed9cfd2952 100644 (file)
--- a/rabbitmq-script-wrapper
+++ b/rabbitmq-script-wrapper
@@ -11,8 +11,8 @@
 ##
 ##  The Original Code is RabbitMQ.
 ##
-##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+##  The Initial Developer of the Original Code is GoPivotal, Inc.
+##  Copyright (c) 2007-2013 GoPivotal, Inc.  All rights reserved.
 ##
 
 # Escape spaces and quotes, because shell is revolting.

diff --git a/rabbitmq-server-2.8.7.tar.gz b/rabbitmq-server-2.8.7.tar.gz
deleted file mode 100644 (file)
index eeef92f..0000000
Binary files a/rabbitmq-server-2.8.7.tar.gz and /dev/null differ

diff --git a/rabbitmq-server-3.2.3.tar.gz b/rabbitmq-server-3.2.3.tar.gz
new file mode 100644 (file)
index 0000000..8d1ea7b
Binary files /dev/null and b/rabbitmq-server-3.2.3.tar.gz differ

diff --git a/rabbitmq-server.default b/rabbitmq-server.default
index 0de8d9518d90207922537e68a2e5ccc79f15f30e..4bdd4e67aa09acbaae5be6d6794c6d82bd813446 100644 (file)
--- a/rabbitmq-server.default
+++ b/rabbitmq-server.default
@@ -6,4 +6,5 @@
 # to handle many simultaneous connections. Refer to the system
 # documentation for ulimit (in man bash) for more information.
 #
-ulimit -n 102400
+ulimit -S -n 102400
+ulimit -H -n 105472

diff --git a/rabbitmq-server.init b/rabbitmq-server.init
index 7cdf5351919cafe9c6eced7e5c3113e84635ba79..a7e57e86c38e42f73ef1b650b873942265805e34 100644 (file)
--- a/rabbitmq-server.init
+++ b/rabbitmq-server.init
@@ -14,6 +14,9 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
+# Source function library.
+. /etc/init.d/functions
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=rabbitmq-server
 DAEMON=/usr/sbin/${NAME}
@@ -24,7 +27,7 @@ ROTATE_SUFFIX=
 INIT_LOG_DIR=/var/log/rabbitmq
 PID_FILE=/var/run/rabbitmq/pid
 
-START_PROG="runuser rabbitmq --session-command"
+START_PROG="daemon"
 LOCK_FILE=/var/lock/subsys/$NAME
 
 test -x $DAEMON || exit 0

diff --git a/rabbitmq-server.ocf b/rabbitmq-server.ocf
index 1455728630af910801482c7f54b851b8ffbfa576..6b3abf3ea3733d89bec829951ba30fb225795099 100644 (file)
--- a/rabbitmq-server.ocf
+++ b/rabbitmq-server.ocf
@@ -11,8 +11,8 @@
 ##
 ##  The Original Code is RabbitMQ.
 ##
-##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+##  The Initial Developer of the Original Code is GoPivotal, Inc.
+##  Copyright (c) 2007-2013 GoPivotal, Inc.  All rights reserved.
 ##
 
 ##

diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 24581c39f3966815d4087017c69d295c9c4b08dd..5bd67fb3bfd49e4db0d48d9bf6827119df3225a0 100644 (file)
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,20 +1,21 @@
 %define debug_package %{nil}
 
 Name: rabbitmq-server
-Version: 2.8.7
-Release: 3%{?dist}
-License: MPLv1.1
+Version: 3.2.3
+Release: 1%{?dist}
+License: MPLv1.1 and MIT and ASL 2.0 and BSD
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
 Source1: rabbitmq-server.init
 Source2: rabbitmq-script-wrapper
 Source3: rabbitmq-server.logrotate
 Source4: rabbitmq-server.ocf
-Source5: rabbitmq-server.default
+Source5: README
+Source6: rabbitmq-server.default
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
-BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, zip
-Requires: erlang >= R12B-3, logrotate
+BuildRequires: erlang >= R13B-03, python-simplejson, xmlto, libxslt, zip
+Requires: erlang >= R13B-03, logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
 Summary: The RabbitMQ server
 Requires(post): chkconfig initscripts
@@ -32,22 +33,28 @@ scalable implementation of an AMQP broker.
 %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
 %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
 
+
 %define _maindir %{buildroot}%{_rabbit_erllibdir}
 
+
 %prep
 %setup -q
 
 %build
 cp %{S:2} %{_rabbit_wrapper}
 cp %{S:4} %{_rabbit_server_ocf}
+cp %{S:5} %{_builddir}/rabbitmq-server-%{version}/README
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
+# Note that we pass /tmp to DOC_INSTALL_DIR here because we're using %doc
+# to actually install rabbitmq.config.example, so this is just a fake/temp path
 make install TARGET_DIR=%{_maindir} \
              SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
-             MAN_DIR=%{buildroot}%{_mandir}
+             MAN_DIR=%{buildroot}%{_mandir} \
+             DOC_INSTALL_DIR=/tmp
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
 mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
@@ -60,9 +67,8 @@ 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
-install -p -D -m 0644 %{S:5} %{buildroot}%{_sysconfdir}/default/rabbitmq-server
+install -p -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/default/rabbitmq-server
 
 mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
 
@@ -114,31 +120,51 @@ done
 
 %files -f ../%{name}.files
 %defattr(-,root,root,-)
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
+%attr(0755, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
+%attr(0755, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
 %dir %{_sysconfdir}/rabbitmq
 %{_initrddir}/rabbitmq-server
 %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
 %config(noreplace) %{_sysconfdir}/default/rabbitmq-server
 %doc LICENSE*
+%doc README
+%doc docs/rabbitmq.config.example
 
 %clean
 rm -rf %{buildroot}
 
 %changelog
-* Mon Dec 24 2012 Matthew Mosesohn <mmosesohn@mirantis.com> 2.8.7-2
-- Added zip for buildreq
+* Thu Jan 23 2014 emile@rabbitmq.com 3.2.3-1
+- New Upstream Release
+
+* Tue Dec 10 2013 emile@rabbitmq.com 3.2.2-1
+- New Upstream Release
+
+* Wed Oct 23 2013 emile@rabbitmq.com 3.2.0-1
+- New Upstream Release
+
+* Thu Aug 15 2013 simon@rabbitmq.com 3.1.5-1
+- New Upstream Release
 
-* Thu Sep 27 2012 emile@rabbitmq.com 2.8.7-1
+* Tue Jun 25 2013 tim@rabbitmq.com 3.1.3-1
 - New Upstream Release
 
-* Wed Aug 22 2012 emile@rabbitmq.com 2.8.6-1
+* Mon Jun 24 2013 tim@rabbitmq.com 3.1.2-1
 - New Upstream Release
 
-* Wed Aug 1 2012 tim@rabbitmq.com 2.8.5-1
+* Mon May 20 2013 tim@rabbitmq.com 3.1.1-1
+- Test release
+
+* Wed May 1 2013 simon@rabbitmq.com 3.1.0-1
+- New Upstream Release
+
+* Mon Dec 24 2012 Matthew Mosesohn <mmosesohn@mirantis.com> 2.8.7-2
+- Added zip for buildreq
+
+* Tue Dec 11 2012 simon@rabbitmq.com 3.0.1-1
 - New Upstream Release
 
-* Thu Jun 21 2012 simon@rabbitmq.com 2.8.3-1
+* Fri Nov 16 2012 simon@rabbitmq.com 3.0.0-1
 - New Upstream Release
 
 * Fri Dec 16 2011 steve@rabbitmq.com 2.7.1-1