Updated net/rabbitmq to 2.7.0.

Major changes:
  * Order preservation of re-queued messages
  * Plugins included with server
  * "amqp" URI client connection
  * Performance improvements

See full changelog:

  http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/attachments/20111109/116e9fd4/attachment.txt

8 files changed, 118 insertions, 21 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index d776679c508..8b8078debc6 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/09/29 14:00:39 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/14 11:55:20 fhajny Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
@@ -13,9 +13,10 @@ LICENSE=		mpl-1.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake bash:run
+USE_TOOLS+=		bash:run coreutils gmake unzip
 
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
 BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
 DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
@@ -44,7 +45,7 @@ PKG_HOME.${RMQ_USER}=	${RMQ_DIR}
 PKG_SHELL.${RMQ_USER}=	${RMQ_SHELL}
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
-CONF_FILES+=		${PREFIX}/share/examples/rabbitmq/rabbitmq.conf ${PKG_SYSCONFDIR}/rabbitmq.conf
+CONF_FILES+=		${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf ${PKG_SYSCONFDIR}/rabbitmq-env.conf
 
 INSTALLATION_DIRS+=	share/examples/rabbitmq
 
@@ -56,7 +57,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
-SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-server
+SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-plugins ${SCRIPTS_DIR}/rabbitmq-server
 SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
 SUBST_SED.paths+=	-e 's|/var/log|${VARBASE}/log|g'
@@ -80,7 +81,7 @@ INSTALL_ENV+=		MAKE_SHELL="${RMQ_SHELL}"
 REPLACE_PYTHON+=	calculate-relative
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/rabbitmq.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq.conf
+	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 40cf63bbae3..c739d25004b 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2011/09/29 14:00:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/12/14 11:55:20 fhajny Exp $
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/INSTALL
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-Apache-Basho
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-BSD-glMatrix
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-EJS10
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-Mochi
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-Sammy060
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-eldap
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MIT-jQuery164
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/bpqueue.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/file_handle_cache.beam
@@ -12,6 +18,7 @@ lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_soak_test.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_speed_test.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_tests.beam
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/lqueue.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor_tests.beam
@@ -55,6 +62,7 @@ lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_direct.b
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_fanout.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_headers.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_topic.beam
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_file.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_8.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_9_1.beam
@@ -78,6 +86,8 @@ lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_index.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_net.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_networking.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_node_monitor.beam
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_plugins.beam
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_plugins_usage.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_prelaunch.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_collector.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_index.beam
@@ -118,13 +128,37 @@ lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_msg_store_index.hrl
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/README
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/amqp_client-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/eldap-0.0.0-git.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/erlando-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/mochiweb-1.3-rmq0.0.0-git.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_auth_backend_ldap-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_auth_mechanism_ssl-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_consistent_hash_exchange-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_federation-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc_channel-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_jsonrpc_channel_examples-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management_agent-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_management_visualiser-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_mochiweb-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_shovel-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_shovel_management-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_stomp-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rabbitmq_tracing-0.0.0.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/rfc4627_jsonrpc-0.0.0-git.ez
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/webmachine-1.7.0-rmq0.0.0-hg.ez
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-env
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-plugins
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-server
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmqctl
+man/man1/rabbitmq-plugins.1
 man/man1/rabbitmq-server.1
 man/man1/rabbitmqctl.1
 man/man5/rabbitmq-env.conf.5
 sbin/rabbitmq-env
+sbin/rabbitmq-plugins
 sbin/rabbitmq-server
 sbin/rabbitmqctl
-share/examples/rabbitmq/rabbitmq.conf
+share/examples/rabbitmq/rabbitmq-env.conf
diff --git a/net/rabbitmq/buildlink3.mk b/net/rabbitmq/buildlink3.mk
index ee3c9000dc8..53159a30f30 100644
--- a/net/rabbitmq/buildlink3.mk
+++ b/net/rabbitmq/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/09/29 14:00:39 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2011/12/14 11:55:20 fhajny Exp $
 
 BUILDLINK_TREE+=			rabbitmq
 
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index c9494d6e71b..985e067fd89 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/09/29 14:00:39 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2011/12/14 11:55:20 fhajny Exp $
 
-SHA1 (rabbitmq-server-2.6.1.tar.gz) = 628ec7453c0ee8ec3bad0780504e335b48f9b533
-RMD160 (rabbitmq-server-2.6.1.tar.gz) = 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c
-Size (rabbitmq-server-2.6.1.tar.gz) = 367491 bytes
-SHA1 (patch-aa) = 70d02da132630369cfce53555a0aab614a26c88a
+SHA1 (rabbitmq-server-2.7.0.tar.gz) = f80d58f6b8635e09c1fbd81650a25182eb6cb4b3
+RMD160 (rabbitmq-server-2.7.0.tar.gz) = 1cebc445e15f5667566e0fa7012c35f07922321f
+Size (rabbitmq-server-2.7.0.tar.gz) = 2620191 bytes
+SHA1 (patch-aa) = 5b460db5e84e7691e0d8651cb4dcf7538ffdd38c
+SHA1 (patch-plugins-src__do-package.mk) = 9f0432be5ceb41f3291b565de0abccec40e4aec5
+SHA1 (patch-plugins-src__rabbitmq-erlang-client__Makefile) = bc8ad7e52a2a38c8ebbd231a1f699bcf43f94b3e
diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
index c99cd063766..bd483a41079 100644
--- a/net/rabbitmq/patches/patch-aa
+++ b/net/rabbitmq/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2011/09/29 14:00:39 fhajny Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/14 11:55:20 fhajny Exp $
 
-Fix shell and add Python 2.7.
---- Makefile.orig	2011-02-03 12:47:36.000000000 +0000
+Support for Python 2.7, drop dependency on gsed.
+--- Makefile.orig	2011-11-08 16:55:55.000000000 +0000
 +++ Makefile
 @@ -1,3 +1,4 @@
 +SHELL=$(MAKE_SHELL)
  TMPDIR ?= /tmp
  
  RABBITMQ_NODENAME ?= rabbit
-@@ -24,6 +25,9 @@ USAGES_ERL=$(foreach XML, $(USAGES_XML),
+@@ -26,6 +27,9 @@ QC_TRIALS ?= 100
  ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
  PYTHON=python
  else
@@ -18,7 +18,7 @@ Fix shell and add Python 2.7.
  ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
  PYTHON=python2.6
  else
-@@ -35,6 +39,7 @@ PYTHON=python
+@@ -37,6 +41,7 @@ PYTHON=python
  endif
  endif
  endif
@@ -26,3 +26,14 @@ Fix shell and add Python 2.7.
  
  BASIC_PLT=basic.plt
  RABBIT_PLT=rabbit.plt
+@@ -252,7 +257,9 @@ srcdist: distclean
+ 	cp README.in $(TARGET_SRC_DIR)/README
+ 	elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
+ 		>> $(TARGET_SRC_DIR)/README
+-	sed -i.save 's/%%VSN%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save
++	sed 's/%%VSN%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in \
++		> $(TARGET_SRC_DIR)/ebin/rabbit_app.in.tmp && \
++		mv $(TARGET_SRC_DIR)/ebin/rabbit_app.in.tmp $(TARGET_SRC_DIR)/ebin/rabbit_app.in
+ 
+ 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
+ 	cp codegen.py Makefile generate_app generate_deps calculate-relative $(TARGET_SRC_DIR)
diff --git a/net/rabbitmq/patches/patch-plugins-src__do-package.mk b/net/rabbitmq/patches/patch-plugins-src__do-package.mk
new file mode 100644
index 00000000000..c29508fced1
--- /dev/null
+++ b/net/rabbitmq/patches/patch-plugins-src__do-package.mk
@@ -0,0 +1,34 @@
+$NetBSD: patch-plugins-src__do-package.mk,v 1.1 2011/12/14 11:55:20 fhajny Exp $
+
+Drop dependency on gsed, gcp.
+--- plugins-src/do-package.mk.orig	2011-11-08 16:55:55.000000000 +0000
++++ plugins-src/do-package.mk
+@@ -286,7 +286,7 @@ $(eval $(foreach D,$(TEST_SOURCE_DIRS),$
+ define run_broker
+ 	rm -rf $(TEST_TMPDIR)
+ 	mkdir -p $(foreach D,log plugins $(NODENAME),$(TEST_TMPDIR)/$(D))
+-	cp -a $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
++	cp -pR $(PACKAGE_DIR)/dist/*.ez $(TEST_TMPDIR)/plugins
+ 	$(call copy,$(3),$(TEST_TMPDIR)/plugins)
+ 	rm -f $(TEST_TMPDIR)/plugins/rabbit_common*.ez
+ 	for plugin in \
+@@ -375,7 +375,7 @@ $(APP_DONE): $(EBIN_BEAMS) $(INCLUDE_HRL
+ 	mkdir -p $(APP_DIR)/ebin $(APP_DIR)/include
+ 	@echo [elided] copy beams to ebin
+ 	@$(call copy,$(EBIN_BEAMS),$(APP_DIR)/ebin)
+-	cp -a $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
++	cp -pR $(APP_FILE) $(APP_DIR)/ebin/$(APP_NAME).app
+ 	$(call copy,$(INCLUDE_HRLS),$(APP_DIR)/include)
+ 	$(construct_app_commands)
+ 	touch $$@
+@@ -414,8 +414,8 @@ $(DEPS_FILE): $(SOURCE_ERLS) $(INCLUDE_H
+ 	@echo [elided] generate deps
+ 	@$$(if $$^,echo $$(subst : ,:,$$(foreach F,$$^,$$(abspath $$(F)):)) | escript $(abspath $(UMBRELLA_BASE_DIR)/generate_deps) $$@ '$$$$(EBIN_DIR)',echo >$$@)
+ 	@echo [elided] fix test deps
+-	@$$(foreach F,$(TEST_EBIN_BEAMS),sed -i -e 's|^$$$$(EBIN_DIR)/$$(notdir $$(F)):|$$$$(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@ && ) :
+-	sed -i -e 's|$$@|$$$$(DEPS_FILE)|' $$@
++	@$$(foreach F,$(TEST_EBIN_BEAMS),sed -e 's|^$$$$(EBIN_DIR)/$$(notdir $$(F)):|$$$$(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@  > $$@.tmp && mv $$@.tmp $$@ && ) :
++	sed -e 's|$$@|$$$$(DEPS_FILE)|' $$@ > $$@.tmp && mv $$@.tmp $$@
+ 
+ $(eval $(call safe_include,$(DEPS_FILE)))
+ 
diff --git a/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile b/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile
new file mode 100644
index 00000000000..321095b9c59
--- /dev/null
+++ b/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins-src__rabbitmq-erlang-client__Makefile,v 1.1 2011/12/14 11:55:20 fhajny Exp $
+
+Drop dependency on gsed.
+--- plugins-src/rabbitmq-erlang-client/Makefile.orig	2011-11-08 16:55:55.000000000 +0000
++++ plugins-src/rabbitmq-erlang-client/Makefile
+@@ -39,7 +39,8 @@ distribution: documentation source_tarba
+ 
+ %.app: %.app.in $(SOURCES) $(BROKER_DIR)/generate_app
+ 	escript  $(BROKER_DIR)/generate_app $< $@ $(SOURCE_DIR)
+-	sed -i.save 's/%%VSN%%/$(VERSION)/' $@ && rm $@.save
++	sed 's/%%VSN%%/$(VERSION)/' $@ > $@.tmp && \
++		mv $@.tmp $@
+ 
+ ###############################################################################
+ ##  Dialyzer
diff --git a/net/rabbitmq/version.mk b/net/rabbitmq/version.mk
index 97dc9db4ffb..228fa93b1cb 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.3 2011/09/29 14:00:39 fhajny Exp $
+# $NetBSD: version.mk,v 1.4 2011/12/14 11:55:20 fhajny Exp $
 #
 
-RMQ_VERSION=	2.6.1
+RMQ_VERSION=	2.7.0