diff -u rabbitmq-server-1.5.5/debian/rabbitmq-server.logrotate rabbitmq-server-1.5.5/debian/rabbitmq-server.logrotate --- rabbitmq-server-1.5.5/debian/rabbitmq-server.logrotate +++ rabbitmq-server-1.5.5/debian/rabbitmq-server.logrotate @@ -8,5 +8,5 @@ sharedscripts postrotate - /etc/init.d/rabbitmq-server rotate-logs > /dev/null + /etc/init.d/rabbitmq-server rotate-logs endscript } diff -u rabbitmq-server-1.5.5/debian/control rabbitmq-server-1.5.5/debian/control --- rabbitmq-server-1.5.5/debian/control +++ rabbitmq-server-1.5.5/debian/control @@ -1,14 +1,13 @@ Source: rabbitmq-server Section: net Priority: extra -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Tony Garnock-Jones -Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson +Maintainer: John Leuner +Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-os-mon, 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-nox, erlang-os-mon, 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 reverted: --- rabbitmq-server-1.5.5/debian/watch +++ rabbitmq-server-1.5.5.orig/debian/watch @@ -1,4 +0,0 @@ -version=3 - -http://www.rabbitmq.com/releases/rabbitmq-server/v(.*)/rabbitmq-server-(\d.*)\.tar\.gz \ - debian uupdate diff -u rabbitmq-server-1.5.5/debian/rules rabbitmq-server-1.5.5/debian/rules --- rabbitmq-server-1.5.5/debian/rules +++ rabbitmq-server-1.5.5/debian/rules @@ -17,3 +17,2 @@ - for script in rabbitmqctl rabbitmq-server rabbitmq-multi; do \ - install -p -D -m 0755 debian/rabbitmq-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \ - done + cp debian/rabbitmqctl_wrapper $(DEB_DESTDIR)usr/sbin/rabbitmqctl + chmod a+x $(DEB_DESTDIR)usr/sbin/rabbitmqctl diff -u rabbitmq-server-1.5.5/debian/dirs rabbitmq-server-1.5.5/debian/dirs --- rabbitmq-server-1.5.5/debian/dirs +++ rabbitmq-server-1.5.5/debian/dirs @@ -7,3 +7,2 @@ etc/logrotate.d -etc/rabbitmq reverted: --- rabbitmq-server-1.5.5/debian/rabbitmq-script-wrapper +++ rabbitmq-server-1.5.5.orig/debian/rabbitmq-script-wrapper @@ -1,23 +0,0 @@ -#!/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 - su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" -else - /usr/lib/rabbitmq/bin/${SCRIPT} - echo -e "\nOnly root should run ${SCRIPT}\n" - exit 1 -fi - diff -u rabbitmq-server-1.5.5/debian/postinst rabbitmq-server-1.5.5/debian/postinst --- rabbitmq-server-1.5.5/debian/postinst +++ rabbitmq-server-1.5.5/debian/postinst @@ -25,8 +25,8 @@ # create rabbitmq user if ! getent passwd rabbitmq >/dev/null; then - adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq \ - --no-create-home --gecos "RabbitMQ messaging server" rabbitmq + adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq --no-create-home rabbitmq + usermod -c "RabbitMQ messaging server" rabbitmq fi chown -R rabbitmq:rabbitmq /var/lib/rabbitmq diff -u rabbitmq-server-1.5.5/debian/changelog rabbitmq-server-1.5.5/debian/changelog --- rabbitmq-server-1.5.5/debian/changelog +++ rabbitmq-server-1.5.5/debian/changelog @@ -1,46 +1,71 @@ -rabbitmq-server (1.5.5-0ubuntu1) karmic; urgency=low +rabbitmq-server (1.5.5-1) unstable; urgency=low - * New upstream release: (LP: #380567): - - in a clustered setup, bindings to durable queues are now - correctly recovered when a queue's node restarts. - - node failure in a clustered setup could trigger premature exchange - auto-deletion - - the cluster config file name was inadvertently changed from - rabbitmq_cluster.config to cluster.config in release 1.5.4. It has - now been changed back. - - when attempting to delete a non-existing exchange, return 404 - (not found), as defined by the spec, rather than 541 (internal error) - - correct some type specs to keep dialyzer happy - - display the node name and database dir in the startup message - - -- Matthias Radestock Tue, 26 May 2009 11:51:23 +0100 - -rabbitmq-server (1.5.4-0ubuntu1) jaunty; urgency=low - - [ Simon MacMullen ] - * New upstream release: (LP: #356905): - - Set the current working dir of the various scripts to /var/lib/rabbitmq - instead of /. - - Starting a RabbitMQ instance that contains a large number (thousands) - durable exchanges, queues or bindings now takes just a few seconds instead - of several minutes. - - make the default settings of the various env vars which can be set in - rabbitmq.conf visible to that script. - - permit configuration of rabbitmqctl's Erlang start parameters by - sourcing rabbitmq.conf from the script and adding some env vars - - -- Mathias Gug Wed, 08 Apr 2009 13:25:05 -0400 - -rabbitmq-server (1.5.3-0ubuntu1) jaunty; urgency=low - - * New upstream bugfix release (LP: #334404). + * New upstream release - -- Simon MacMullen Wed, 25 Feb 2009 12:06:59 +0000 + -- John Leuner Tue, 02 Jun 2009 12:53:32 +0200 -rabbitmq-server (1.5.1-0ubuntu1) jaunty; urgency=low +rabbitmq-server (1.5.4-4) unstable; urgency=low - * Initial release. Based on the work from Simon MacMullen and Matthias - Radestock. (LP: #309653) + * Add new dependency on erlang-os-mon to work with new erlang packages in + debian - -- Mathias Gug Tue, 17 Feb 2009 14:07:54 -0500 + -- John Leuner Mon, 11 May 2009 21:20:04 +0200 +rabbitmq-server (1.5.4-3) unstable; urgency=low + + * Previous partial upload failed + + -- John Leuner Fri, 10 Apr 2009 20:25:51 +0200 + +rabbitmq-server (1.5.4-2) unstable; urgency=low + + * Fix incorrect changed-by field in .changes file + + -- John Leuner Fri, 10 Apr 2009 19:40:04 +0200 + +rabbitmq-server (1.5.4-1) unstable; urgency=low + + * New upstream release + + -- John Leuner Fri, 10 Apr 2009 17:54:21 +0200 + +rabbitmq-server (1.5.0-5) unstable; urgency=low + + * Include the full license for amqp-0.8.json in debian/copyright + + -- John Leuner Fri, 27 Feb 2009 16:16:54 +0200 + +rabbitmq-server (1.5.0-4) unstable; urgency=low + + * Clarify and explicitly list the license and copyright for + codegen/amqp-0.8.json + + * Explicitly list the authors and copyright for the rest of the codebase + at the top of debian/copyright + + * Clarify the copyright of the files in src/tcp_* . The rabbitmq authors have + confirmed that they are the original authors of this code and that the + files at http://code.google.com/p/cacherl/ were taken without their + knowledge from the rabbitmq project. (Comparing the commit dates in version + control shows that cacherl is newer) + + -- John Leuner Wed, 25 Feb 2009 13:10:15 +0200 + +rabbitmq-server (1.5.0-3) unstable; urgency=low + + * Previous changelog entry had an incorrect Maintainer name + + -- John Leuner Wed, 28 Jan 2009 16:45:33 +0200 + +rabbitmq-server (1.5.0-2) unstable; urgency=low + + * Reupload package to unstable. Mistakenly uploaded to testing last time, closes: #507902 + + -- John Leuner Mon, 19 Jan 2009 17:38:43 +0200 + +rabbitmq-server (1.5.0-1) testing; urgency=low + + * New Upstream Release + * First Debian upload, closes: #507902 + + -- John Leuner Wed, 17 Dec 2008 18:23:47 +0000 diff -u rabbitmq-server-1.5.5/debian/init.d rabbitmq-server-1.5.5/debian/init.d --- rabbitmq-server-1.5.5/debian/init.d +++ rabbitmq-server-1.5.5/debian/init.d @@ -9,8 +9,8 @@ # Short-Description: Enable AMQP service provided by RabbitMQ broker ### END INIT INFO -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DAEMON=/usr/sbin/rabbitmq-multi +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/lib/rabbitmq/bin/rabbitmq-multi NAME=rabbitmq-server DESC=rabbitmq-server USER=rabbitmq @@ -26,10 +26,11 @@ RETVAL=0 set -e +cd / start_rabbitmq () { set +e - $DAEMON start_all ${NODE_COUNT} > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err + su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err case "$?" in 0) echo SUCCESS @@ -51,7 +52,7 @@ set +e status_rabbitmq quiet if [ $RETVAL = 0 ] ; then - $DAEMON stop_all > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err + su $USER -s /bin/sh -c "$DAEMON stop_all" > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err RETVAL=$? if [ $RETVAL != 0 ] ; then echo FAILED - check /var/log/rabbitmq/shutdown_log, _err @@ -66,9 +67,9 @@ status_rabbitmq() { set +e if [ "$1" != "quiet" ] ; then - $DAEMON status 2>&1 + su $USER -s /bin/sh -c "$DAEMON status" 2>&1 else - $DAEMON status > /dev/null 2>&1 + su $USER -s /bin/sh -c "$DAEMON status" > /dev/null 2>&1 fi if [ $? != 0 ] ; then RETVAL=1 @@ -78,10 +79,7 @@ rotate_logs_rabbitmq() { set +e - $DAEMON rotate_logs ${ROTATE_SUFFIX} - if [ $? != 0 ] ; then - RETVAL=1 - fi + su $USER -s /bin/sh -c "$DAEMON rotate_logs ${ROTATE_SUFFIX}" 2>&1 set -e } diff -u rabbitmq-server-1.5.5/debian/postrm rabbitmq-server-1.5.5/debian/postrm --- rabbitmq-server-1.5.5/debian/postrm +++ rabbitmq-server-1.5.5/debian/postrm @@ -31,9 +31,6 @@ if [ -d /var/run/rabbitmq ]; then rm -r /var/run/rabbitmq fi - if [ -d /etc/rabbitmq ]; then - rm -r /etc/rabbitmq - fi if getent passwd rabbitmq >/dev/null; then deluser rabbitmq fi only in patch2: unchanged: --- rabbitmq-server-1.5.5.orig/debian/rabbitmqctl_wrapper +++ rabbitmq-server-1.5.5/debian/rabbitmqctl_wrapper @@ -0,0 +1,21 @@ +#!/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 / + +if [ `id -u` = 0 ] ; then + su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl ${CMDLINE}" +else + /usr/lib/rabbitmq/bin/rabbitmqctl + echo -e "\nOnly root should run rabbitmqctl\n" + exit 1 +fi +