cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.8.4

Browse Source 
from piotr sikora (MAINTAINER)
This commit is contained in:
jasper 2012-07-18 14:03:44 +00:00
parent 91d743a84d
commit 1082d1b985
10 changed files with 32 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/rabbitmq/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2012/01/13 20:54:25 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2012/07/18 14:03:44 jasper Exp $
COMMENT = highly reliable Enterprise Messaging System
V = 2.7.1
V = 2.8.4
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
@ -35,7 +35,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \
textproc/libxslt \
textproc/xmlto
RUN_DEPENDS = lang/erlang
RUN_DEPENDS = lang/erlang>=15b.01p0v0
MAKE_ENV = PYTHON=${MODPY_BIN} VERSION=${V}

7
net/rabbitmq/distinfo
View File

@ -1,5 +1,2 @@
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
SHA256 (rabbitmq-server-2.8.4.tar.gz) = QbjT0WKjo60/194GxbjV7+/CYjq/9M4rZgMiJRLLBd8=
SIZE (rabbitmq-server-2.8.4.tar.gz) = 2646689

11
net/rabbitmq/patches/patch-Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.6 2012/01/13 20:54:25 sthen Exp $
$OpenBSD: patch-Makefile,v 1.7 2012/07/18 14:03:44 jasper Exp $
--- 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
@ -26,15 +26,6 @@ $OpenBSD: patch-Makefile,v 1.6 2012/01/13 20:54:25 sthen Exp $
BASIC_PLT=basic.plt
RABBIT_PLT=rabbit.plt
@@ -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)

32
net/rabbitmq/patches/patch-plugins-src_do-package_mk
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-plugins-src_do-package_mk,v 1.1 2012/01/13 20:54:25 sthen Exp $
--- 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)))

6
net/rabbitmq/patches/patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk,v 1.1 2012/01/13 20:54:25 sthen Exp $
$OpenBSD: patch-plugins-src_rabbitmq-auth-backend-ldap_package_mk,v 1.2 2012/07/18 14:03:44 jasper Exp $
--- plugins-src/rabbitmq-auth-backend-ldap/package.mk.orig Fri Jan 13 20:23:17 2012
+++ plugins-src/rabbitmq-auth-backend-ldap/package.mk Fri Jan 13 20:23:20 2012
@@ -1,7 +1,7 @@
RELEASABLE:=true
DEPS:=rabbitmq-server rabbitmq-erlang-client eldap-wrapper
-ifeq ($(shell nmap -p 389 localhost | grep '389/tcp open' > /dev/null && echo true),true)
-ifeq ($(shell nc -z localhost 389 && echo true),true)
-WITH_BROKER_TEST_COMMANDS:=eunit:test(rabbit_auth_backend_ldap_test,[verbose])
-WITH_BROKER_TEST_CONFIG:=$(PACKAGE_DIR)/etc/rabbit-test
-endif
+#ifeq ($(shell nmap -p 389 localhost | grep '389/tcp open' > /dev/null && echo true),true)
+#ifeq ($(shell nc -z localhost 389 && echo true),true)
+#WITH_BROKER_TEST_COMMANDS:=eunit:test(rabbit_auth_backend_ldap_test,[verbose])
+#WITH_BROKER_TEST_CONFIG:=$(PACKAGE_DIR)/etc/rabbit-test
+#endif

12
net/rabbitmq/patches/patch-plugins-src_rabbitmq-erlang-client_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins-src_rabbitmq-erlang-client_Makefile,v 1.1 2012/01/13 20:54:25 sthen Exp $
--- 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 $@.save
+ perl -pi -e 's/%%VSN%%/$(VERSION)/' $@
###############################################################################
## Dialyzer

16
net/rabbitmq/patches/patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins-src_rabbitmq-management-agent_src_rabbit_mgmt_external_stats_erl,v 1.1 2012/01/13 20:54:25 sthen Exp $
--- 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();

12
net/rabbitmq/patches/patch-scripts_rabbitmq-defaults Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scripts_rabbitmq-defaults,v 1.1 2012/07/18 14:03:44 jasper Exp $
--- scripts/rabbitmq-defaults.orig Fri Jul 13 02:56:15 2012
+++ scripts/rabbitmq-defaults Fri Jul 13 02:56:46 2012
@@ -22,7 +22,7 @@
CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
-MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
+MNESIA_BASE=${SYS_PREFIX}/var/rabbitmq/mnesia
ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

12
net/rabbitmq/patches/patch-scripts_rabbitmq-server
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-scripts_rabbitmq-server,v 1.3 2012/01/13 20:54:25 sthen Exp $
--- scripts/rabbitmq-server.orig Fri Dec 16 12:24:15 2011
+++ scripts/rabbitmq-server Fri Jan 13 20:23:02 2012
@@ -19,7 +19,7 @@ SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
-kernel inet_default_connect_options [{nodelay,true}]"
CONFIG_FILE=/etc/rabbitmq/rabbitmq
LOG_BASE=/var/log/rabbitmq
-MNESIA_BASE=/var/lib/rabbitmq/mnesia
+MNESIA_BASE=/var/rabbitmq/mnesia
SERVER_START_ARGS=
ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins

17
net/rabbitmq/pkg/PLIST
View File

@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST,v 1.6 2012/01/13 20:54:25 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/07/18 14:03:44 jasper Exp $
@newgroup _rabbitmq:646
@newuser _rabbitmq:646:_rabbitmq:daemon:RabbitMQ account:/var/rabbitmq:/sbin/nologin
lib/rabbitmq/
lib/rabbitmq/ebin/
lib/rabbitmq/ebin/credit_flow.beam
lib/rabbitmq/ebin/delegate.beam
lib/rabbitmq/ebin/delegate_sup.beam
lib/rabbitmq/ebin/dtree.beam
lib/rabbitmq/ebin/file_handle_cache.beam
lib/rabbitmq/ebin/gatherer.beam
lib/rabbitmq/ebin/gen_server2.beam
@ -15,8 +17,10 @@ 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/mnesia_sync.beam
lib/rabbitmq/ebin/pg2_fixed.beam
lib/rabbitmq/ebin/pg_local.beam
lib/rabbitmq/ebin/pmon.beam
lib/rabbitmq/ebin/priority_queue.beam
lib/rabbitmq/ebin/rabbit.app
lib/rabbitmq/ebin/rabbit.beam
@ -47,6 +51,7 @@ lib/rabbitmq/ebin/rabbit_connection_sup.beam
lib/rabbitmq/ebin/rabbit_control.beam
lib/rabbitmq/ebin/rabbit_ctl_usage.beam
lib/rabbitmq/ebin/rabbit_direct.beam
lib/rabbitmq/ebin/rabbit_disk_monitor.beam
lib/rabbitmq/ebin/rabbit_error_logger.beam
lib/rabbitmq/ebin/rabbit_error_logger_file_h.beam
lib/rabbitmq/ebin/rabbit_event.beam
@ -55,6 +60,7 @@ lib/rabbitmq/ebin/rabbit_exchange_type.beam
lib/rabbitmq/ebin/rabbit_exchange_type_direct.beam
lib/rabbitmq/ebin/rabbit_exchange_type_fanout.beam
lib/rabbitmq/ebin/rabbit_exchange_type_headers.beam
lib/rabbitmq/ebin/rabbit_exchange_type_invalid.beam
lib/rabbitmq/ebin/rabbit_exchange_type_topic.beam
lib/rabbitmq/ebin/rabbit_file.beam
lib/rabbitmq/ebin/rabbit_framing.beam
@ -80,6 +86,7 @@ lib/rabbitmq/ebin/rabbit_msg_store_index.beam
lib/rabbitmq/ebin/rabbit_net.beam
lib/rabbitmq/ebin/rabbit_networking.beam
lib/rabbitmq/ebin/rabbit_node_monitor.beam
lib/rabbitmq/ebin/rabbit_nodes.beam
lib/rabbitmq/ebin/rabbit_plugins.beam
lib/rabbitmq/ebin/rabbit_plugins_usage.beam
lib/rabbitmq/ebin/rabbit_prelaunch.beam
@ -115,13 +122,8 @@ lib/rabbitmq/ebin/worker_pool_worker.beam
lib/rabbitmq/include/
lib/rabbitmq/include/gm_specs.hrl
lib/rabbitmq/include/rabbit.hrl
lib/rabbitmq/include/rabbit_auth_backend_spec.hrl
lib/rabbitmq/include/rabbit_auth_mechanism_spec.hrl
lib/rabbitmq/include/rabbit_backing_queue_spec.hrl
lib/rabbitmq/include/rabbit_exchange_type_spec.hrl
lib/rabbitmq/include/rabbit_framing.hrl
lib/rabbitmq/include/rabbit_msg_store.hrl
lib/rabbitmq/include/rabbit_msg_store_index.hrl
lib/rabbitmq/plugins/
lib/rabbitmq/plugins/README
lib/rabbitmq/plugins/amqp_client-${V}.ez
@ -132,6 +134,7 @@ 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_federation_management-${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
@ -146,6 +149,7 @@ 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-defaults
lib/rabbitmq/sbin/rabbitmq-env
lib/rabbitmq/sbin/rabbitmq-plugins
lib/rabbitmq/sbin/rabbitmq-server
@ -154,6 +158,7 @@ lib/rabbitmq/sbin/rabbitmqctl
@man man/man1/rabbitmq-server.1
@man man/man1/rabbitmqctl.1
@man man/man5/rabbitmq-env.conf.5
sbin/rabbitmq-defaults
sbin/rabbitmq-env
sbin/rabbitmq-plugins
sbin/rabbitmq-server