Hi, > attached update to latest RabbitMQ release (2.6.1). > > Tested on amd64.
Attached updated patch (after espie@'s "normalize pkgpath" bump). Anyone care to test or commit this? Best regards, Piotr Sikora < piotr.sik...@frickle.com >
Index: Makefile =================================================================== RCS file: /cvs/ports/net/rabbitmq/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 16 Sep 2011 11:13:40 -0000 1.11 +++ Makefile 26 Sep 2011 20:19:12 -0000 @@ -2,12 +2,10 @@ COMMENT = highly reliable Enterprise Messaging System -V = 2.5.0 +V = 2.6.1 DISTNAME = rabbitmq-server-$V PKGNAME = rabbitmq-$V CATEGORIES = net - -REVISION = 1 HOMEPAGE = http://www.rabbitmq.com/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/rabbitmq/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 15 Jun 2011 11:02:59 -0000 1.3 +++ distinfo 26 Sep 2011 20:19:12 -0000 @@ -1,5 +1,5 @@ -MD5 (rabbitmq-server-2.5.0.tar.gz) = tmW6ADqz+BGzBTCC/QBvqA== -RMD160 (rabbitmq-server-2.5.0.tar.gz) = ShxUS4uW+ITn0H1FOpIaiGswEFQ= -SHA1 (rabbitmq-server-2.5.0.tar.gz) = uBapuW59fPMGlsGVr2ppO+WK5ow= -SHA256 (rabbitmq-server-2.5.0.tar.gz) = XkiOEcjOn7KfekggEubbMIE9KGQRiebzWX4Ak+ZWnUs= -SIZE (rabbitmq-server-2.5.0.tar.gz) = 328333 +MD5 (rabbitmq-server-2.6.1.tar.gz) = yLhvLiqGUCkytU6c7S62PA== +RMD160 (rabbitmq-server-2.6.1.tar.gz) = gYzYv79Vk7DNtL1KcdS3EkRy81w= +SHA1 (rabbitmq-server-2.6.1.tar.gz) = Yo7HRTwO6Ow7rQeAUE4zW0j5tTM= +SHA256 (rabbitmq-server-2.6.1.tar.gz) = Cre0OmtMxYSCQs3Ugws8CQGM/ZIKK/sA67iSkcnN04U= +SIZE (rabbitmq-server-2.6.1.tar.gz) = 367491 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile --- patches/patch-Makefile 15 Jun 2011 11:02:59 -0000 1.4 +++ patches/patch-Makefile 26 Sep 2011 20:19:12 -0000 @@ -1,9 +1,9 @@ ---- Makefile.orig Thu Jun 9 16:24:13 2011 -+++ Makefile Wed Jun 15 01:04:35 2011 -@@ -20,21 +20,10 @@ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR - WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $(DOCS_DIR)/rabbitmq-service.xml) - USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml +--- Makefile.orig Fri Sep 9 13:50:55 2011 ++++ Makefile Thu Sep 15 08:51:57 2011 +@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) + QC_MODULES := rabbit_backing_queue_qc + QC_TRIALS ?= 100 +TARGET_DIR=$(PREFIX)/lib/rabbitmq +SBIN_DIR=$(PREFIX)/sbin +MAN_DIR=$(PREFIX)/man @@ -25,7 +25,7 @@ BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt -@@ -61,6 +50,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e +@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e ERL_EBIN=erl -noinput -pa $(EBIN_DIR) @@ -36,7 +36,7 @@ define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, $(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1)))) endef -@@ -71,7 +64,7 @@ endef +@@ -83,7 +76,7 @@ endef ifneq "$(SBIN_DIR)" "" ifneq "$(TARGET_DIR)" "" @@ -45,7 +45,7 @@ endif endif -@@ -132,7 +125,7 @@ clean: +@@ -144,7 +137,7 @@ clean: rm -f $(EBIN_DIR)/*.beam rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc @@ -54,9 +54,9 @@ rm -f $(RABBIT_PLT) rm -f $(DEPS_FILE) -@@ -165,6 +158,23 @@ run-tests: all - OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \ - echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' > /dev/null +@@ -180,6 +173,23 @@ run-tests: all + run-qc: all + $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD) $(QC_TRIALS)) +regress: + @[ "`id -u`" != "0" ] || (echo "Don't run tests as a superuser." && false) @@ -78,7 +78,7 @@ start-background-node: $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ -@@ -235,8 +245,7 @@ distclean: clean +@@ -250,8 +260,7 @@ distclean: clean %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \ xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \ @@ -88,7 +88,7 @@ rm -f $<.tmp # Use tmp files rather than a pipeline so that we get meaningful errors -@@ -279,7 +288,7 @@ install_bin: all install_dirs +@@ -294,7 +303,7 @@ install_bin: all install_dirs install_docs: docs_all install_dirs for section in 1 5; do \ mkdir -p $(MAN_DIR)/man$$section; \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 15 Jun 2011 11:02:59 -0000 1.4 +++ pkg/PLIST 26 Sep 2011 20:19:12 -0000 @@ -13,6 +13,9 @@ lib/rabbitmq/ebin/gm_soak_test.beam lib/rabbitmq/ebin/gm_speed_test.beam lib/rabbitmq/ebin/gm_tests.beam +lib/rabbitmq/ebin/mirrored_supervisor.beam +lib/rabbitmq/ebin/mirrored_supervisor_tests.beam +lib/rabbitmq/ebin/pg2_fixed.beam lib/rabbitmq/ebin/pg_local.beam lib/rabbitmq/ebin/priority_queue.beam lib/rabbitmq/ebin/rabbit.app @@ -30,6 +33,7 @@ lib/rabbitmq/ebin/rabbit_auth_mechanism_cr_demo.beam lib/rabbitmq/ebin/rabbit_auth_mechanism_plain.beam lib/rabbitmq/ebin/rabbit_backing_queue.beam +lib/rabbitmq/ebin/rabbit_backing_queue_qc.beam lib/rabbitmq/ebin/rabbit_basic.beam lib/rabbitmq/ebin/rabbit_binary_generator.beam lib/rabbitmq/ebin/rabbit_binary_parser.beam @@ -60,6 +64,11 @@ lib/rabbitmq/ebin/rabbit_limiter.beam lib/rabbitmq/ebin/rabbit_log.beam lib/rabbitmq/ebin/rabbit_memory_monitor.beam +lib/rabbitmq/ebin/rabbit_mirror_queue_coordinator.beam +lib/rabbitmq/ebin/rabbit_mirror_queue_master.beam +lib/rabbitmq/ebin/rabbit_mirror_queue_misc.beam +lib/rabbitmq/ebin/rabbit_mirror_queue_slave.beam +lib/rabbitmq/ebin/rabbit_mirror_queue_slave_sup.beam lib/rabbitmq/ebin/rabbit_misc.beam lib/rabbitmq/ebin/rabbit_mnesia.beam lib/rabbitmq/ebin/rabbit_msg_file.beam
