svn commit: r441685 - in head/net/rabbitmq: . files

Jimmy Olgeni olgeni at FreeBSD.org
Thu May 25 13:34:35 UTC 2017


Author: olgeni
Date: Thu May 25 13:34:32 2017
New Revision: 441685
URL: https://svnweb.freebsd.org/changeset/ports/441685

Log:
  Update net/rabbitmq to version 3.6.10.
  
  - Add support for creating RABBITMQ_LOG_BASE.
  
  PR:		219452 (+ version bump)
  Submitted by:	Reshad Patuck

Modified:
  head/net/rabbitmq/Makefile
  head/net/rabbitmq/distinfo
  head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
  head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
  head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
  head/net/rabbitmq/files/rabbitmq.in
  head/net/rabbitmq/pkg-plist

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/Makefile	Thu May 25 13:34:32 2017	(r441685)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.6.6
-PORTREVISION=	1
+PORTVERSION=	3.6.10
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -27,7 +26,7 @@ ADMIN_DESC=	Install rabbitmqadmin script
 ADMIN_USES=	python:run
 
 ALL_TARGET=	all manpages
-USES=		cpe gmake python:build tar:xz
+USES=		cpe gmake python:build shebangfix tar:xz
 USE_RC_SUBR=	rabbitmq
 NO_ARCH=	yes
 
@@ -40,6 +39,7 @@ CPE_VENDOR=	pivotal_software
 
 REINPLACE_ARGS=	-i ""
 SCRIPTS_DIR=	${WRKSRC}/deps/rabbit/scripts
+SHEBANG_FILES=	deps/rabbitmq_management/bin/rabbitmqadmin
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
 MAKE_ENV+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
 		SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \

Modified: head/net/rabbitmq/distinfo
==============================================================================
--- head/net/rabbitmq/distinfo	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/distinfo	Thu May 25 13:34:32 2017	(r441685)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479770211
-SHA256 (rabbitmq-server-3.6.6.tar.xz) = 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e
-SIZE (rabbitmq-server-3.6.6.tar.xz) = 2471724
+TIMESTAMP = 1495718138
+SHA256 (rabbitmq-server-3.6.10.tar.xz) = 0f478950a3e27b6b3b5aa57098eaf91822321d716a9b0bc30a4084a2c283394c
+SIZE (rabbitmq-server-3.6.10.tar.xz) = 1426900

Modified: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
==============================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins	Thu May 25 13:34:32 2017	(r441685)
@@ -1,4 +1,4 @@
---- deps/rabbit/scripts/rabbitmq-plugins.orig	2016-11-22 00:22:17 UTC
+--- deps/rabbit/scripts/rabbitmq-plugins.orig	2017-03-16 21:19:29 UTC
 +++ deps/rabbit/scripts/rabbitmq-plugins
 @@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the
  fi

Modified: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
==============================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server	Thu May 25 13:34:32 2017	(r441685)
@@ -1,9 +1,9 @@
---- deps/rabbit/scripts/rabbitmq-server.orig	2016-11-22 00:22:59 UTC
+--- deps/rabbit/scripts/rabbitmq-server.orig	2017-03-16 21:19:29 UTC
 +++ deps/rabbit/scripts/rabbitmq-server
-@@ -151,6 +151,7 @@ start_rabbitmq_server() {
-     ensure_thread_pool_size
+@@ -157,6 +157,7 @@ start_rabbitmq_server() {
      check_start_params &&
      RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+     ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
 +    HOME=/var/db/rabbitmq \
      exec ${ERL_DIR}erl \
          -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \

Modified: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
==============================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl	Thu May 25 13:34:32 2017	(r441685)
@@ -1,4 +1,4 @@
---- deps/rabbit/scripts/rabbitmqctl.orig	2016-11-22 00:23:32 UTC
+--- deps/rabbit/scripts/rabbitmqctl.orig	2017-05-22 09:52:24 UTC
 +++ deps/rabbit/scripts/rabbitmqctl
 @@ -28,6 +28,7 @@ fi
  # (e.g. forget_cluster_node --offline) require us to impersonate the

Modified: head/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- head/net/rabbitmq/files/rabbitmq.in	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/files/rabbitmq.in	Thu May 25 13:34:32 2017	(r441685)
@@ -54,9 +54,9 @@ rabbitmq_start()
 		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
 	fi
 
-	if [ -d ${RABBITMQ_LOG_BASE} ]; then
-		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
-	fi
+	mkdir -p ${RABBITMQ_LOG_BASE}
+ 
+	chown ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
 
 	if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
 		chmod 600 ${RABBITMQ_HOME}/.erlang.cookie

Modified: head/net/rabbitmq/pkg-plist
==============================================================================
--- head/net/rabbitmq/pkg-plist	Thu May 25 13:31:14 2017	(r441684)
+++ head/net/rabbitmq/pkg-plist	Thu May 25 13:34:32 2017	(r441685)
@@ -19,11 +19,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL2
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/background_gc.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/dtree.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache_stats.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
@@ -51,6 +47,12 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 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_control_pbe.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_core_metrics_gc.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validation.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_accept_everything.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_min_password_length.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_password_regexp.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_diagnostics.beam
@@ -66,6 +68,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_invalid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fhc_helpers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_file.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
@@ -73,6 +76,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_metrics.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_coordinator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_master.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_misc.beam
@@ -94,7 +98,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_md5.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha256.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha512.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_pbe.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_usage.beam
@@ -139,14 +142,14 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/old_builtin_types.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_cli.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_core_metrics.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_misc.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-1.0.3.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-1.0.1.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.13.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-1.0.4.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-1.0.2.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbit_common-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez
@@ -160,8 +163,8 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_mqtt-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-0.1.0.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_stomp-%%VERSION%%.ez
@@ -169,11 +172,12 @@ lib/erlang/lib/rabbitmq_server-%%VERSION
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_trust_store-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt_examples-%%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/ranch-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.3.0.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins


More information about the svn-ports-all mailing list