From owner-svn-ports-head@freebsd.org Tue Dec 6 15:50:45 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A76BBC6A4D2; Tue, 6 Dec 2016 15:50:45 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 683521CEC; Tue, 6 Dec 2016 15:50:45 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB6Foi2H045167; Tue, 6 Dec 2016 15:50:44 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB6Foig2045159; Tue, 6 Dec 2016 15:50:44 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201612061550.uB6Foig2045159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Tue, 6 Dec 2016 15:50:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427974 - in head/net/rabbitmq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2016 15:50:45 -0000 Author: olgeni Date: Tue Dec 6 15:50:43 2016 New Revision: 427974 URL: https://svnweb.freebsd.org/changeset/ports/427974 Log: Update net/rabbitmq to version 3.6.6. Added: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins (contents, props changed) head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server (contents, props changed) head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl (contents, props changed) Deleted: head/net/rabbitmq/files/patch-scripts_rabbitmq-plugins head/net/rabbitmq/files/patch-scripts_rabbitmq-server head/net/rabbitmq/files/patch-scripts_rabbitmqctl Modified: head/net/rabbitmq/Makefile head/net/rabbitmq/distinfo head/net/rabbitmq/pkg-plist Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Tue Dec 6 15:45:59 2016 (r427973) +++ head/net/rabbitmq/Makefile Tue Dec 6 15:50:43 2016 (r427974) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.6.5 -PORTREVISION= 1 +PORTVERSION= 3.6.6 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -39,12 +38,13 @@ PLIST_SUB= VERSION=${PORTVERSION} CPE_VENDOR= pivotal_software REINPLACE_ARGS= -i "" -SCRIPTS_DIR= ${WRKSRC}/scripts/ +SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts MAKE_ARGS+= PYTHON=${PYTHON_CMD} MAKE_ENV+= TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \ SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \ MAN_DIR="${STAGEDIR}${PREFIX}/man" \ - DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" + DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" \ + VERSION="${PORTVERSION}" MAKE_JOBS_UNSAFE= yes @@ -57,21 +57,21 @@ post-patch: ${SCRIPTS_DIR}/rabbitmq-env \ ${SCRIPTS_DIR}/rabbitmq-plugins \ ${SCRIPTS_DIR}/rabbitmq-defaults \ - ${WRKSRC}/docs/rabbitmq-env.conf.5.xml + ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5.xml post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq @${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia @${MKDIR} ${STAGEDIR}/var/log/rabbitmq - ${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \ + ${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \ ${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample .for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl ${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin .endfor .for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1 - ${INSTALL_MAN} ${WRKSRC}/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor - ${INSTALL_MAN} ${WRKSRC}/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 post-install-ADMIN-on: ${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin Modified: head/net/rabbitmq/distinfo ============================================================================== --- head/net/rabbitmq/distinfo Tue Dec 6 15:45:59 2016 (r427973) +++ head/net/rabbitmq/distinfo Tue Dec 6 15:50:43 2016 (r427974) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470418703 -SHA256 (rabbitmq-server-3.6.5.tar.xz) = 9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec -SIZE (rabbitmq-server-3.6.5.tar.xz) = 2923164 +TIMESTAMP = 1479770211 +SHA256 (rabbitmq-server-3.6.6.tar.xz) = 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e +SIZE (rabbitmq-server-3.6.6.tar.xz) = 2471724 Added: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins Tue Dec 6 15:50:43 2016 (r427974) @@ -0,0 +1,10 @@ +--- deps/rabbit/scripts/rabbitmq-plugins.orig 2016-11-22 00:22:17 UTC ++++ deps/rabbit/scripts/rabbitmq-plugins +@@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the + fi + + RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \ ++HOME=/var/db/rabbitmq \ + exec ${ERL_DIR}erl \ + -pa "${RABBITMQ_HOME}/ebin" \ + -noinput \ Added: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server Tue Dec 6 15:50:43 2016 (r427974) @@ -0,0 +1,10 @@ +--- deps/rabbit/scripts/rabbitmq-server.orig 2016-11-22 00:22:59 UTC ++++ deps/rabbit/scripts/rabbitmq-server +@@ -151,6 +151,7 @@ start_rabbitmq_server() { + ensure_thread_pool_size + check_start_params && + RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ ++ HOME=/var/db/rabbitmq \ + exec ${ERL_DIR}erl \ + -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \ + ${RABBITMQ_START_RABBIT} \ Added: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl Tue Dec 6 15:50:43 2016 (r427974) @@ -0,0 +1,10 @@ +--- deps/rabbit/scripts/rabbitmqctl.orig 2016-11-22 00:23:32 UTC ++++ deps/rabbit/scripts/rabbitmqctl +@@ -28,6 +28,7 @@ fi + # (e.g. forget_cluster_node --offline) require us to impersonate the + # real node. + RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \ ++HOME=/var/db/rabbitmq \ + exec ${ERL_DIR}erl \ + -pa "${RABBITMQ_HOME}/ebin" \ + -noinput +B \ Modified: head/net/rabbitmq/pkg-plist ============================================================================== --- head/net/rabbitmq/pkg-plist Tue Dec 6 15:45:59 2016 (r427973) +++ head/net/rabbitmq/pkg-plist Tue Dec 6 15:50:43 2016 (r427974) @@ -9,6 +9,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-EPL-OTP lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10 +lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Erlware-Commons lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochiweb @@ -28,8 +29,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochinum.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg2_fixed.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam @@ -51,6 +50,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam 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_ctl_usage.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam @@ -94,6 +94,7 @@ 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