aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING15
-rw-r--r--net/rabbitmq/Makefile16
-rw-r--r--net/rabbitmq/distinfo4
-rw-r--r--net/rabbitmq/pkg-plist11
4 files changed, 39 insertions, 7 deletions
diff --git a/UPDATING b/UPDATING
index 1c03fd945de0..c6de054e2f75 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,21 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20140403:
+ AFFECTS: users of net/rabbitmq
+ AUTHOR: olgeni@FreeBSD.org
+
+ This release changes the behaviour of the default "guest" user.
+
+ Previously the guest user could be accessed from any network
+ location. In RabbitMQ 3.3.0 and later, the guest user can only
+ be accessed via localhost by default.
+
+ Any other users you create will not (by default) be restricted
+ in this way.
+
+ See http://www.rabbitmq.com/access-control.html for more information.
+
+20140403:
AFFECTS: users of net/kdnssd
AUTHOR: kde@FreeBSD.org
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index c42dfb1a9dde..48498cd076d5 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rabbitmq
-PORTVERSION= 3.2.4
+PORTVERSION= 3.3.0
CATEGORIES= net
MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
@@ -19,6 +19,11 @@ BUILD_DEPENDS= erl:${PORTSDIR}/lang/erlang \
zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
+OPTIONS_DEFINE= ADMIN
+OPTIONS_SUB= yes
+
+ADMIN_DESC= Install rabbitmqadmin script
+
USES= gmake shebangfix
USE_PYTHON_BUILD=yes
USE_RC_SUBR= rabbitmq
@@ -38,6 +43,12 @@ MAKE_ENV+= TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${POR
MAN_DIR="${STAGEDIR}${PREFIX}/man" \
DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MADMIN}
+USE_PYTHON_RUN= yes
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \
${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
@@ -56,5 +67,8 @@ post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
+.if ${PORT_OPTIONS:MADMIN}
+ ${INSTALL} ${WRKSRC}/plugins-src/rabbitmq-management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
+.endif
.include <bsd.port.mk>
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index c5045e2db4c7..a510b059aff0 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.2.4.tar.gz) = a930f92b362df2f292ec5f0281aa2011eb0c668faf6e24c4653a9fc53ec43b9f
-SIZE (rabbitmq-server-3.2.4.tar.gz) = 3588097
+SHA256 (rabbitmq-server-3.3.0.tar.gz) = 2f0e2584becfd9826a79f44484db9bda853ffaefbdcc47cbc4065d88c2fd8623
+SIZE (rabbitmq-server-3.3.0.tar.gz) = 3468885
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 3ddae3771605..901ef89598b8 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,3 +1,4 @@
+%%ADMIN%%bin/rabbitmqadmin
sbin/rabbitmq-defaults
sbin/rabbitmq-env
sbin/rabbitmq-server
@@ -49,6 +50,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_app.in
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend_dummy.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend_internal.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_amqplain.beam
@@ -62,6 +64,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binding.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_interceptor.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
@@ -70,6 +73,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.bea
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_main.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_direct.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_disk_monitor.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam
@@ -122,9 +126,11 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy_validator.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prelaunch.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_consumers.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_decorator.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_index.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_recovery_terms.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_registry.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
@@ -154,6 +160,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/test_sup.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/truncate.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam
@@ -173,9 +180,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation_management-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jsonrpc_channel_examples-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-%%VERSION%%.ez
@@ -187,7 +191,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-%%VERSION%%.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rfc4627_jsonrpc-%%VERSION%%-git5e67120.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq%%VERSION%%-git3132eb9.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq%%VERSION%%-gite9359c7.ez
lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults