summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-17 16:26:07 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-17 16:26:07 +0100
commit1182174aee17523fc53d651df95c5384b4df3f97 (patch)
tree6082abd8ee40eb41159b962f0a02718a7b9d8248
parent3583826f205304df7cf5d6f82b96ef7c6605f5eb (diff)
parent576d9cb9cbfa3e4162d6490ff0d26f076e2f523d (diff)
downloadrabbitmq-server-1182174aee17523fc53d651df95c5384b4df3f97.tar.gz
merging in default
-rw-r--r--Makefile2
-rw-r--r--ebin/rabbit_app.in2
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec3
-rw-r--r--packaging/debs/Debian/debian/changelog6
-rw-r--r--packaging/debs/Debian/debian/control4
-rw-r--r--packaging/macports/net/rabbitmq-server/Portfile16
-rw-r--r--packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper12
7 files changed, 23 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 68fc57a5..367f153a 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ clean: cleandb
rm -f docs/*.[0-9].gz
cleandb: stop-node
- erl -mnesia dir '"$(RABBITMQ_MNESIA_DIR)"' -noshell -eval 'lists:foreach(fun file:delete/1, filelib:wildcard(mnesia:system_info(directory) ++ "/*") ++ filelib:wildcard(filename:join(mnesia:system_info(directory), "rabbit_disk_queue/*"))), halt().'
+ rm -rf $(RABBITMQ_MNESIA_DIR)/*
############ various tasks to interact with RabbitMQ ###################
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 5be07492..8e1c890e 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -11,6 +11,8 @@
rabbit_sup,
rabbit_tcp_client_sup]},
{applications, [kernel, stdlib, sasl, mnesia, os_mon]},
+%% we also depend on ssl but it shouldn't be in here as we don't
+%% actually want to start it
{mod, {rabbit, []}},
{env, [{tcp_listeners, [{"0.0.0.0", 5672}]},
{extra_startup_steps, []},
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 875381e8..9e7c4bfb 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -117,6 +117,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Wed Jun 17 2009 Matthias Radestock <matthias@lshift.net> 1.6.0-1
+- New upstream release
+
* Tue May 19 2009 Matthias Radestock <matthias@lshift.net> 1.5.5-1
- Maintenance release for the 1.5.x series
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 7c5673f7..ac94c8a3 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.6.0-1) hardy; urgency=low
+
+ * New Upstream Release
+
+ -- Matthias Radestock <matthias@lshift.net> Tue, 16 Jun 2009 15:02:58 +0100
+
rabbitmq-server (1.5.5-1) hardy; urgency=low
* New Upstream Release
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 21636072..d4e2cd17 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -2,12 +2,12 @@ Source: rabbitmq-server
Section: net
Priority: extra
Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com>
-Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson
+Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson
Standards-Version: 3.8.0
Package: rabbitmq-server
Architecture: all
-Depends: erlang-nox, erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
+Depends: erlang-base | erlang-base-hipe, erlang-ssl | erlang-nox (<< 1:13.b-dfsg1-1), erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
Description: An AMQP server written in Erlang
RabbitMQ is an implementation of AMQP, the emerging standard for high
performance enterprise messaging. The RabbitMQ server is a robust and
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
index 7fb31ad6..4db6c2f6 100644
--- a/packaging/macports/net/rabbitmq-server/Portfile
+++ b/packaging/macports/net/rabbitmq-server/Portfile
@@ -3,7 +3,7 @@
PortSystem 1.0
name rabbitmq-server
-version 1.5.3
+version 1.5.5
revision 0
categories net
maintainers tonyg@rabbitmq.com
@@ -19,9 +19,9 @@ homepage http://www.rabbitmq.com/
master_sites http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
checksums \
- md5 3242a67885c2471b5ab62254bf024679 \
- sha1 f4d6a01eaa2c74fa32f567fe410d21d9be1b43aa \
- rmd160 1a1c4b97d765548028c161d1617905151ca9e040
+ md5 1dceb98bb57cd6acef90f58e96a7fce4 \
+ sha1 5daa50859c9f2342cc824188f4a3cc7f9edb938e \
+ rmd160 6e3703a30d45cb21ba6f7435fb68992027cf18f0
depends_build port:erlang port:py25-simplejson
depends_run port:erlang
@@ -64,19 +64,19 @@ post-destroot {
${sbindir}/rabbitmq-multi \
${sbindir}/rabbitmq-server \
${sbindir}/rabbitmqctl
- reinplace -E "s:(RABBITMQ_CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
+ reinplace -E "s:(CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
${sbindir}/rabbitmq-multi \
${sbindir}/rabbitmq-server \
${sbindir}/rabbitmqctl
- reinplace -E "s:(RABBITMQ_LOG_BASE)=/:\\1=${prefix}/:" \
+ reinplace -E "s:(LOG_BASE)=/:\\1=${prefix}/:" \
${sbindir}/rabbitmq-multi \
${sbindir}/rabbitmq-server \
${sbindir}/rabbitmqctl
- reinplace -E "s:(RABBITMQ_MNESIA_BASE)=/:\\1=${prefix}/:" \
+ reinplace -E "s:(MNESIA_BASE)=/:\\1=${prefix}/:" \
${sbindir}/rabbitmq-multi \
${sbindir}/rabbitmq-server \
${sbindir}/rabbitmqctl
- reinplace -E "s:(RABBITMQ_PIDS_FILE)=/:\\1=${prefix}/:" \
+ reinplace -E "s:(PIDS_FILE)=/:\\1=${prefix}/:" \
${sbindir}/rabbitmq-multi \
${sbindir}/rabbitmq-server \
${sbindir}/rabbitmqctl
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
index b806049c..0d7118c4 100644
--- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
+++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -1,20 +1,10 @@
#!/bin/bash
-# Escape spaces and quotes, because shell is revolting.
-for arg in "$@" ; do
- # Escape quotes in parameters, so that they're passed through cleanly.
- arg=$(sed -e 's/"/\\"/' <<-END
- $arg
- END
- )
- CMDLINE="${CMDLINE} \"${arg}\""
-done
-
cd /var/lib/rabbitmq
SCRIPT=`basename $0`
if [ `id -u` = 0 ] ; then
- sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
+ sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
else
/usr/lib/rabbitmq/bin/${SCRIPT}
echo -e "\nOnly root should run ${SCRIPT}\n"