From 343b89013f973924f7a74bd5ae84b6fd845892ef Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 2 Jan 2014 19:07:19 +0000 Subject: [PATCH] Update rabbitmq to 3.2.2. 3.2.2 This release fixes a number of bugs in the broker (including High Availability mode) and plugins (LDAP, Management and MQTT). 3.2.1 This fixes a number of bugs in 3.2.0 and earlier versions. 3.2.0 This release introduces federated queues and features enhanced policies for aspects of the broker which previously required AMQP arguments. Clients can now obtain better feedback about authentication failures and broker alarm conditions. This release corrects a number of defects in the broker and plugins. --- net/rabbitmq/Makefile | 9 +++++++-- net/rabbitmq/PLIST | 9 ++++++--- net/rabbitmq/distinfo | 8 ++++---- net/rabbitmq/version.mk | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 497ffd5dcb37..b71801dc7e16 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/05/13 11:51:38 fhajny Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/02 19:07:19 fhajny Exp $ # PKGNAME= rabbitmq-${RMQ_VERSION} @@ -45,7 +45,10 @@ PKG_HOME.${RMQ_USER}= ${RMQ_DIR} PKG_SHELL.${RMQ_USER}= ${RMQ_SHELL} PKG_SYSCONFSUBDIR= ${PKGBASE} -CONF_FILES+= ${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf ${PKG_SYSCONFDIR}/rabbitmq-env.conf +CONF_FILES+= share/examples/rabbitmq/rabbitmq-env.conf \ + ${PKG_SYSCONFDIR}/rabbitmq-env.conf +CONF_FILES+= share/examples/rabbitmq/rabbitmq.config.example \ + ${PKG_SYSCONFDIR}/rabbitmq.config INSTALLATION_DIRS+= share/examples/rabbitmq @@ -73,6 +76,7 @@ REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmq-server MAKE_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}" MAKE_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/" MAKE_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man" +MAKE_ENV+= DOC_INSTALL_DIR="${DESTDIR}${PREFIX}/share/examples/rabbitmq" MAKE_ENV+= RMQ_VERSION=${RMQ_VERSION} MAKE_ENV+= MAKE_SHELL="${RMQ_SHELL}" MAKE_ENV+= GIT_SSL_NO_VERIFY=true @@ -80,6 +84,7 @@ MAKE_ENV+= GIT_SSL_NO_VERIFY=true INSTALL_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}" INSTALL_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/" INSTALL_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man" +INSTALL_ENV+= DOC_INSTALL_DIR="${DESTDIR}${PREFIX}/share/examples/rabbitmq" INSTALL_ENV+= RMQ_VERSION=${RMQ_VERSION} INSTALL_ENV+= MAKE_SHELL="${RMQ_SHELL}" diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST index a8b8bba6bd8e..ee3fc6464642 100644 --- a/net/rabbitmq/PLIST +++ b/net/rabbitmq/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2013/11/08 21:17:01 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/01/02 19:07:19 fhajny Exp $ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-APACHE2-ExplorerCanvas @@ -62,6 +62,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_client_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_command_assembler.beam +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_helper_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_main.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ctl_usage.beam @@ -84,7 +85,6 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing_amqp_0_8.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing_amqp_0_9_1.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_guid.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_heartbeat.beam -lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_intermediate_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_limiter.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_log.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_memory_monitor.beam @@ -113,10 +113,12 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_parameter_validation.be lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_main.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_usage.beam +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policies.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy_validator.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_prelaunch.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_collector.beam +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_decorator.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_index.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_reader.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_registry.beam @@ -157,7 +159,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit.hrl lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_framing.hrl lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_msg_store.hrl lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/README -lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp_client-3.1.5.ez +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp_client-0.0.0.ez lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowboy-0.5.0-rmq${PKGVERSION}-git4b93c2d.ez lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/eldap-${PKGVERSION}-gite309de4.ez lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/mochiweb-2.7.0-rmq${PKGVERSION}-git680dba8.ez @@ -199,3 +201,4 @@ sbin/rabbitmq-plugins sbin/rabbitmq-server sbin/rabbitmqctl share/examples/rabbitmq/rabbitmq-env.conf +share/examples/rabbitmq/rabbitmq.config.example diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo index 3d5956b51a3b..226ae1624bb1 100644 --- a/net/rabbitmq/distinfo +++ b/net/rabbitmq/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2013/08/26 10:24:38 fhajny Exp $ +$NetBSD: distinfo,v 1.13 2014/01/02 19:07:19 fhajny Exp $ -SHA1 (rabbitmq-server-3.1.5.tar.gz) = 9f0879d0d050c71ec1e221db68d15ef23209b440 -RMD160 (rabbitmq-server-3.1.5.tar.gz) = b486ce1289fb721b63d9401b3f9994adeba1c053 -Size (rabbitmq-server-3.1.5.tar.gz) = 3562221 bytes +SHA1 (rabbitmq-server-3.2.2.tar.gz) = c5de766fa9250a80080140269847416ed45fe053 +RMD160 (rabbitmq-server-3.2.2.tar.gz) = 6b59eb2a03e6e64e2938c74d6ba9686879652a0c +Size (rabbitmq-server-3.2.2.tar.gz) = 3583974 bytes SHA1 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk index 83044745d0c9..bc46db1c8bf4 100644 --- a/net/rabbitmq/version.mk +++ b/net/rabbitmq/version.mk @@ -1,4 +1,4 @@ -# $NetBSD: version.mk,v 1.12 2013/08/26 10:24:38 fhajny Exp $ +# $NetBSD: version.mk,v 1.13 2014/01/02 19:07:19 fhajny Exp $ # -RMQ_VERSION= 3.1.5 +RMQ_VERSION= 3.2.2