Hey, on the second thought, attached version with patch for the management plugin to use "fstat" instead of "lsof" to get number of open file descriptors.
Best regards, Piotr Sikora < [email protected] >
Index: Makefile =================================================================== RCS file: /cvs/ports/net/rabbitmq/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 17 Dec 2011 22:01:13 -0000 1.13 +++ Makefile 20 Dec 2011 23:48:36 -0000 @@ -2,8 +2,7 @@ COMMENT = highly reliable Enterprise Messaging System -V = 2.6.1 -REVISION = 0 +V = 2.7.1 DISTNAME = rabbitmq-server-$V PKGNAME = rabbitmq-$V CATEGORIES = net @@ -21,7 +20,7 @@ MASTER_SITES = http://www.rabbitmq.com/releases/rabbitmq-server/v${V}/ MODULES = lang/python -MODPY_RUNDEPS = No +MODPY_RUNDEP = No USE_GMAKE = Yes USE_GROFF = Yes @@ -30,23 +29,26 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \ ${MODPY_JSON} \ + archivers/unzip \ + archivers/zip \ + textproc/docbook \ textproc/libxslt \ textproc/xmlto RUN_DEPENDS = lang/erlang -MAKE_ENV = PYTHON=${MODPY_BIN} +MAKE_ENV = PYTHON=${MODPY_BIN} VERSION=${V} RABBITUSER = _rabbitmq -SUBST_VARS += RABBITUSER +SUBST_VARS += RABBITUSER V pre-build: ${SUBST_CMD} ${WRKSRC}/scripts/rabbitmqctl post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rabbitmq - @for file in INSTALL LICENSE LICENSE-MPL-RabbitMQ ; do \ + @for file in INSTALL LICENSE*; do \ mv ${PREFIX}/lib/rabbitmq/$$file \ ${PREFIX}/share/doc/rabbitmq; \ done Index: distinfo =================================================================== RCS file: /cvs/ports/net/rabbitmq/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 1 Oct 2011 08:30:37 -0000 1.4 +++ distinfo 20 Dec 2011 23:48:36 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (rabbitmq-server-2.7.1.tar.gz) = ROsJ0t/4zmQaH+fyVaTFRg== +RMD160 (rabbitmq-server-2.7.1.tar.gz) = kDuozEdFUXT/1+LfiTfJO/mAdwY= +SHA1 (rabbitmq-server-2.7.1.tar.gz) = dpUVvjifQThXqTKpRGEclXyD2i4= +SHA256 (rabbitmq-server-2.7.1.tar.gz) = sMbn0jXmrpGebNcI0FgKUrZ9CGFfXhcXCMLyd0L8Se0= +SIZE (rabbitmq-server-2.7.1.tar.gz) = 2616386 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/net/rabbitmq/patches/patch-Makefile,v retrieving revision 1.5 diff -u -r1.5 patch-Makefile --- patches/patch-Makefile 1 Oct 2011 08:30:37 -0000 1.5 +++ patches/patch-Makefile 20 Dec 2011 23:48:36 -0000 @@ -1,6 +1,7 @@ ---- 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 +$OpenBSD$ +--- Makefile.orig Fri Dec 16 12:24:15 2011 ++++ Makefile Tue Dec 20 18:50:37 2011 +@@ -22,21 +22,10 @@ USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml $(DOCS_DIR)/r USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) QC_MODULES := rabbit_backing_queue_qc QC_TRIALS ?= 100 @@ -25,7 +26,16 @@ BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt -@@ -69,6 +58,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e +@@ -56,7 +45,7 @@ endif + #other args: +native +"{hipe,[o3,verbose]}" -Ddebug=true +debug_info +no_strict_record_tests + ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_macro,$(USE_SPECS),use_specs) $(call boolean_macro,$(USE_PROPER_QC),use_proper_qc) + +-VERSION=0.0.0 ++VERSION?=0.0.0 + PLUGINS_SRC_DIR?=$(shell [ -d "plugins-src" ] && echo "plugins-src" || echo ) + PLUGINS_DIR=plugins + TARBALL_NAME=rabbitmq-server-$(VERSION) +@@ -71,6 +60,10 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e ERL_EBIN=erl -noinput -pa $(EBIN_DIR) @@ -36,7 +46,7 @@ define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, $(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1)))) endef -@@ -83,7 +76,7 @@ endef +@@ -85,7 +78,7 @@ endef ifneq "$(SBIN_DIR)" "" ifneq "$(TARGET_DIR)" "" @@ -45,16 +55,16 @@ endif endif -@@ -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 +@@ -161,7 +154,7 @@ clean: + rm -f $(PLUGINS_DIR)/*.ez + [ -d "$(PLUGINS_SRC_DIR)" ] && PLUGINS_SRC_DIR="" PRESERVE_CLONE_DIR=1 make -C $(PLUGINS_SRC_DIR) clean || true rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc - rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL) + rm -f $(DOCS_DIR)/*.[0-9] $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL) rm -f $(RABBIT_PLT) rm -f $(DEPS_FILE) -@@ -180,6 +173,23 @@ run-tests: all +@@ -203,6 +196,25 @@ run-tests: all run-qc: all $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD) $(QC_TRIALS)) @@ -67,6 +77,8 @@ + RABBITMQ_NODE_PORT="45672" \ + RABBITMQ_LOG_BASE="$(CHECK_DIR)/logs" \ + RABBITMQ_MNESIA_BASE="$(CHECK_DIR)/mnesia" \ ++ RABBITMQ_PLUGINS_EXPAND_DIR="$(CHECK_DIR)/plugins" \ ++ RABBITMQ_ENABLED_PLUGINS_FILE="$(CHECK_DIR)/none" \ + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ + ./scripts/rabbitmq-server + @sleep 5 @@ -75,10 +87,10 @@ + ($(CHECK_CALL) -q && rm -rf $(CHECK_DIR) && false) + $(CHECK_CALL) -q && rm -rf $(CHECK_DIR) && echo "Passed." + - start-background-node: - $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ - RABBITMQ_NODE_ONLY=true \ -@@ -250,8 +260,7 @@ distclean: clean + start-background-node: all + -rm -f $(RABBITMQ_MNESIA_DIR).pid + mkdir -p $(RABBITMQ_MNESIA_DIR) +@@ -281,8 +293,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 +100,7 @@ rm -f $<.tmp # Use tmp files rather than a pipeline so that we get meaningful errors -@@ -294,7 +303,7 @@ install_bin: all install_dirs +@@ -326,7 +337,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: patches/patch-plugins-src-do-package_mk =================================================================== RCS file: patches/patch-plugins-src_do-package_mk diff -N patches/patch-plugins-src_do-package_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins-src_do-package_mk 20 Dec 2011 23:48:36 -0000 @@ -0,0 +1,32 @@ +$OpenBSD$ +--- plugins-src/do-package.mk.orig Fri Dec 16 12:24:15 2011 ++++ plugins-src/do-package.mk Tue Dec 20 16:52:19 2011 +@@ -286,7 +286,7 @@ $(eval $(foreach D,$(TEST_SOURCE_DIRS),$(call package_ + 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 -Rp $(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_HRLS) $(APP_FILE) + 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 -Rp $(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_HRLS) $(TEST_SO + @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),perl -pi -e 's|^$$$$(EBIN_DIR)/$$(notdir $$(F)):|$$$$(TEST_EBIN_DIR)/$$(notdir $$(F)):|' $$@ && ) : ++ perl -pi -e 's|$$@|$$$$(DEPS_FILE)|' $$@ + + $(eval $(call safe_include,$(DEPS_FILE))) + Index: patches/patch-plugins-src-rabbitmq-erlang-client-Makefile =================================================================== RCS file: patches/patch-plugins-src_rabbitmq-erlang-client_Makefile diff -N patches/patch-plugins-src_rabbitmq-erlang-client_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins-src_rabbitmq-erlang-client_Makefile 20 Dec 2011 23:48:36 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins-src/rabbitmq-erlang-client/Makefile.orig Tue Dec 20 16:35:38 2011 ++++ plugins-src/rabbitmq-erlang-client/Makefile Tue Dec 20 16:36:13 2011 +@@ -39,7 +39,7 @@ distribution: documentation source_tarball package + + %.app: %.app.in $(SOURCES) $(BROKER_DIR)/generate_app + escript $(BROKER_DIR)/generate_app $< $@ $(SOURCE_DIR) +- sed -i.save 's/%%VSN%%/$(VERSION)/' $@ && rm [email protected] ++ perl -pi -e 's/%%VSN%%/$(VERSION)/' $@ + + ############################################################################### + ## Dialyzer Index: patches/patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl =================================================================== RCS file: patches/patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl diff -N patches/patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl 20 Dec 2011 23:48:36 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ +--- plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl.orig Tue Dec 20 23:10:43 2011 ++++ plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl Tue Dec 20 23:28:20 2011 +@@ -69,6 +69,12 @@ get_used_fd({unix, linux}) -> + {error, _} -> get_used_fd({unix, generic}) + end; + ++get_used_fd({unix, openbsd}) -> ++ length(lists:filter( ++ fun (Line) -> hd(lists:nth(4, string:tokens(Line, " "))) < 58 end, ++ string:tokens(os:cmd("fstat -p " ++ os:getpid()), "\n") ++ )); ++ + get_used_fd({unix, _}) -> + get_used_fd_lsof(); + Index: patches/patch-scripts_rabbitmq-server =================================================================== RCS file: /cvs/ports/net/rabbitmq/patches/patch-scripts_rabbitmq-server,v retrieving revision 1.2 diff -u -r1.2 patch-scripts_rabbitmq-server --- patches/patch-scripts_rabbitmq-server 16 Apr 2011 09:11:07 -0000 1.2 +++ patches/patch-scripts_rabbitmq-server 20 Dec 2011 23:48:36 -0000 @@ -1,3 +1,4 @@ +$OpenBSD$ --- scripts/rabbitmq-server.orig Tue Mar 22 18:43:29 2011 +++ scripts/rabbitmq-server Mon Apr 4 20:19:59 2011 @@ -19,7 +19,7 @@ SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ Index: patches/patch-scripts_rabbitmqctl =================================================================== RCS file: /cvs/ports/net/rabbitmq/patches/patch-scripts_rabbitmqctl,v retrieving revision 1.3 diff -u -r1.3 patch-scripts_rabbitmqctl --- patches/patch-scripts_rabbitmqctl 28 Apr 2011 11:28:43 -0000 1.3 +++ patches/patch-scripts_rabbitmqctl 20 Dec 2011 23:48:36 -0000 @@ -1,3 +1,4 @@ +$OpenBSD$ --- scripts/rabbitmqctl.orig Thu Apr 7 17:55:08 2011 +++ scripts/rabbitmqctl Thu Apr 28 03:59:37 2011 @@ -20,7 +20,7 @@ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v retrieving revision 1.5 diff -u -r1.5 PLIST --- pkg/PLIST 1 Oct 2011 08:30:37 -0000 1.5 +++ pkg/PLIST 20 Dec 2011 23:48:36 -0000 @@ -3,7 +3,6 @@ @newuser _rabbitmq:646:_rabbitmq:daemon:RabbitMQ account:/var/rabbitmq:/sbin/nologin lib/rabbitmq/ lib/rabbitmq/ebin/ -lib/rabbitmq/ebin/bpqueue.beam lib/rabbitmq/ebin/delegate.beam lib/rabbitmq/ebin/delegate_sup.beam lib/rabbitmq/ebin/file_handle_cache.beam @@ -13,6 +12,7 @@ lib/rabbitmq/ebin/gm_soak_test.beam lib/rabbitmq/ebin/gm_speed_test.beam lib/rabbitmq/ebin/gm_tests.beam +lib/rabbitmq/ebin/lqueue.beam lib/rabbitmq/ebin/mirrored_supervisor.beam lib/rabbitmq/ebin/mirrored_supervisor_tests.beam lib/rabbitmq/ebin/pg2_fixed.beam @@ -56,6 +56,7 @@ lib/rabbitmq/ebin/rabbit_exchange_type_fanout.beam lib/rabbitmq/ebin/rabbit_exchange_type_headers.beam lib/rabbitmq/ebin/rabbit_exchange_type_topic.beam +lib/rabbitmq/ebin/rabbit_file.beam lib/rabbitmq/ebin/rabbit_framing.beam lib/rabbitmq/ebin/rabbit_framing_amqp_0_8.beam lib/rabbitmq/ebin/rabbit_framing_amqp_0_9_1.beam @@ -79,6 +80,8 @@ lib/rabbitmq/ebin/rabbit_net.beam lib/rabbitmq/ebin/rabbit_networking.beam lib/rabbitmq/ebin/rabbit_node_monitor.beam +lib/rabbitmq/ebin/rabbit_plugins.beam +lib/rabbitmq/ebin/rabbit_plugins_usage.beam lib/rabbitmq/ebin/rabbit_prelaunch.beam lib/rabbitmq/ebin/rabbit_queue_collector.beam lib/rabbitmq/ebin/rabbit_queue_index.beam @@ -121,19 +124,50 @@ lib/rabbitmq/include/rabbit_msg_store_index.hrl lib/rabbitmq/plugins/ lib/rabbitmq/plugins/README +lib/rabbitmq/plugins/amqp_client-${V}.ez +lib/rabbitmq/plugins/eldap-${V}-git.ez +lib/rabbitmq/plugins/erlando-${V}.ez +lib/rabbitmq/plugins/mochiweb-1.3-rmq${V}-git.ez +lib/rabbitmq/plugins/rabbitmq_auth_backend_ldap-${V}.ez +lib/rabbitmq/plugins/rabbitmq_auth_mechanism_ssl-${V}.ez +lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}.ez +lib/rabbitmq/plugins/rabbitmq_federation-${V}.ez +lib/rabbitmq/plugins/rabbitmq_jsonrpc-${V}.ez +lib/rabbitmq/plugins/rabbitmq_jsonrpc_channel-${V}.ez +lib/rabbitmq/plugins/rabbitmq_jsonrpc_channel_examples-${V}.ez +lib/rabbitmq/plugins/rabbitmq_management-${V}.ez +lib/rabbitmq/plugins/rabbitmq_management_agent-${V}.ez +lib/rabbitmq/plugins/rabbitmq_management_visualiser-${V}.ez +lib/rabbitmq/plugins/rabbitmq_mochiweb-${V}.ez +lib/rabbitmq/plugins/rabbitmq_shovel-${V}.ez +lib/rabbitmq/plugins/rabbitmq_shovel_management-${V}.ez +lib/rabbitmq/plugins/rabbitmq_stomp-${V}.ez +lib/rabbitmq/plugins/rabbitmq_tracing-${V}.ez +lib/rabbitmq/plugins/rfc4627_jsonrpc-${V}-git.ez +lib/rabbitmq/plugins/webmachine-1.7.0-rmq${V}-hg.ez lib/rabbitmq/sbin/ lib/rabbitmq/sbin/rabbitmq-env +lib/rabbitmq/sbin/rabbitmq-plugins lib/rabbitmq/sbin/rabbitmq-server lib/rabbitmq/sbin/rabbitmqctl +@man man/man1/rabbitmq-plugins.1 @man man/man1/rabbitmq-server.1 @man man/man1/rabbitmqctl.1 @man man/man5/rabbitmq-env.conf.5 sbin/rabbitmq-env +sbin/rabbitmq-plugins sbin/rabbitmq-server sbin/rabbitmqctl share/doc/rabbitmq/ share/doc/rabbitmq/INSTALL share/doc/rabbitmq/LICENSE +share/doc/rabbitmq/LICENSE-Apache-Basho +share/doc/rabbitmq/LICENSE-BSD-glMatrix +share/doc/rabbitmq/LICENSE-MIT-EJS10 +share/doc/rabbitmq/LICENSE-MIT-Mochi +share/doc/rabbitmq/LICENSE-MIT-Sammy060 +share/doc/rabbitmq/LICENSE-MIT-eldap +share/doc/rabbitmq/LICENSE-MIT-jQuery164 share/doc/rabbitmq/LICENSE-MPL-RabbitMQ share/examples/rabbitmq/ @sample ${SYSCONFDIR}/rabbitmq/
