Update rabbitmq to 2.8.0.

Changes in 2.8.0:

* Dead lettering
* Internal flow control

7 files changed, 17 insertions, 73 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 423dd6e755a..028917e92c0 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/03/16 04:31:14 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/22 11:58:58 fhajny Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
 DISTNAME=		rabbitmq-server-${RMQ_VERSION}
-PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/
 
@@ -58,6 +57,7 @@ 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-plugins ${SCRIPTS_DIR}/rabbitmq-server
+SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-defaults
 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'
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index c739d25004b..cb112e095b4 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/12/14 11:55:20 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/22 11:58:58 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
@@ -9,6 +9,7 @@ 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/credit_flow.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
@@ -22,6 +23,7 @@ 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
+lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mnesia_sync.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg2_fixed.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/priority_queue.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit.app
@@ -61,6 +63,7 @@ lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type.beam
 lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_direct.beam
 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_invalid.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
@@ -86,6 +89,7 @@ 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_nodes.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
@@ -149,6 +153,7 @@ 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-defaults
 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
@@ -157,6 +162,7 @@ man/man1/rabbitmq-plugins.1
 man/man1/rabbitmq-server.1
 man/man1/rabbitmqctl.1
 man/man5/rabbitmq-env.conf.5
+sbin/rabbitmq-defaults
 sbin/rabbitmq-env
 sbin/rabbitmq-plugins
 sbin/rabbitmq-server
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 67a52d0f265..622a643cf55 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2012/01/04 19:08:29 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2012/03/22 11:58:58 fhajny Exp $
 
-SHA1 (rabbitmq-server-2.7.1.tar.gz) = 769515be389f413857a932a944611c957c83da2e
-RMD160 (rabbitmq-server-2.7.1.tar.gz) = 903ba8cc47455174ffd7e2df8937c93bf9807706
-Size (rabbitmq-server-2.7.1.tar.gz) = 2616386 bytes
-SHA1 (patch-aa) = e0fcde26ba38851d990f1a680f22ffa8af3f7bea
-SHA1 (patch-plugins-src__do-package.mk) = 9f0432be5ceb41f3291b565de0abccec40e4aec5
-SHA1 (patch-plugins-src__rabbitmq-erlang-client__Makefile) = bc8ad7e52a2a38c8ebbd231a1f699bcf43f94b3e
+SHA1 (rabbitmq-server-2.8.0.tar.gz) = c2578847b2ac383b1bd5a4d387ecd5fd53d19776
+RMD160 (rabbitmq-server-2.8.0.tar.gz) = 77dd0d8a86efdd8a541decce1a7f5eb93a5042dc
+Size (rabbitmq-server-2.8.0.tar.gz) = 2644169 bytes
+SHA1 (patch-aa) = 16a822321caacb0e4588791ec4dc1e909d0be4de
diff --git a/net/rabbitmq/patches/patch-aa b/net/rabbitmq/patches/patch-aa
index 8b4663fceb7..457f431a8dc 100644
--- a/net/rabbitmq/patches/patch-aa
+++ b/net/rabbitmq/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2012/01/04 19:08:30 fhajny Exp $
+$NetBSD: patch-aa,v 1.6 2012/03/22 11:58:58 fhajny Exp $
 
 Support for Python 2.7, drop dependency on gsed.
 --- Makefile.orig	2011-12-16 12:24:15.000000000 +0000
@@ -26,14 +26,3 @@ Support for Python 2.7, drop dependency on gsed.
  
  BASIC_PLT=basic.plt
  RABBIT_PLT=rabbit.plt
-@@ -246,7 +251,9 @@ stop-cover: all
- srcdist: distclean
- 	mkdir -p $(TARGET_SRC_DIR)/codegen
- 	cp -r ebin src include LICENSE LICENSE-MPL-RabbitMQ INSTALL README $(TARGET_SRC_DIR)
--	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
deleted file mode 100644
index c29508fced1..00000000000
--- a/net/rabbitmq/patches/patch-plugins-src__do-package.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-$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
deleted file mode 100644
index 321095b9c59..00000000000
--- a/net/rabbitmq/patches/patch-plugins-src__rabbitmq-erlang-client__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 b3ea975b8ba..30fdcc14cb4 100644
--- a/net/rabbitmq/version.mk
+++ b/net/rabbitmq/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.5 2012/01/04 19:08:29 fhajny Exp $
+# $NetBSD: version.mk,v 1.6 2012/03/22 11:58:58 fhajny Exp $
 #
 
-RMQ_VERSION=	2.7.1
+RMQ_VERSION=	2.8.0