Date: Sun, 17 Nov 2013 16:37:35 +0100 (CET) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: pneumann@gmail.com Subject: ports/184036: net/rabbitmq: upgrade to version 3.2.1 Message-ID: <201311171537.rAHFbZoG028474@olgeni.olgeni> Resent-Message-ID: <201311171540.rAHFe0Ft028601@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184036 >Category: ports >Synopsis: net/rabbitmq: upgrade to version 3.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 17 15:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: >Description: The attached patch upgrades net/rabbitmq to version 3.2.1 and adds staging support. >How-To-Repeat: >Fix: --- Makefile (revision 333741) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.1.5 +PORTVERSION= 3.2.1 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -22,20 +22,17 @@ USE_RC_SUBR= rabbitmq SHEBANG_FILES= plugins-src/rabbitmq-amqp1.0/codegen.py -USERS= rabbitmq -GROUPS= rabbitmq +USERS= rabbitmq +GROUPS= rabbitmq -PLIST_SUB= "VERSION=${PORTVERSION}" +PLIST_SUB= VERSION=${PORTVERSION} -MAN1= rabbitmq-server.1 rabbitmqctl.1 rabbitmq-plugins.1 -MAN5= rabbitmq-env.conf.5 -MANCOMPRESSED= yes - SCRIPTS_DIR= ${WRKSRC}/scripts/ -MAKE_ENV+= TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" \ - MAN_DIR="${PREFIX}/man" +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}" -NO_STAGE= yes 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 \ @@ -50,17 +47,9 @@ ${WRKSRC}/Makefile @${FIND} ${WRKSRC} -name "*.bak" -delete -pre-install: - @${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type d | \ - ${XARGS} ${CHMOD} 0755 - @${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type f | \ - ${XARGS} ${CHMOD} 0644 - @${MKDIR} ${PREFIX}/etc/rabbitmq - post-install: - @${MKDIR} /var/db/rabbitmq/mnesia - @${MKDIR} /var/log/rabbitmq - @${CHOWN} -R rabbitmq:rabbitmq /var/db/rabbitmq - @${CHOWN} -R rabbitmq:rabbitmq /var/log/rabbitmq + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq + @${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia + @${MKDIR} ${STAGEDIR}/var/log/rabbitmq .include <bsd.port.mk> --- distinfo (revision 333741) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (rabbitmq-server-3.1.5.tar.gz) = c6952bdd0f0d9551fa4a068e65ad6506583a3e81babbb4e4747e0073366a6c35 -SIZE (rabbitmq-server-3.1.5.tar.gz) = 3562221 +SHA256 (rabbitmq-server-3.2.1.tar.gz) = 0e30f6a1368c819a4c1f0d9a08cae6dc3c25942a46cb0f04047bbea689e93e49 +SIZE (rabbitmq-server-3.2.1.tar.gz) = 3583903 --- pkg-plist (revision 333741) +++ pkg-plist (working copy) @@ -66,6 +66,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_command_assembler.beam +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_ctl_usage.beam @@ -88,7 +89,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_intermediate_sup.beam 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 @@ -117,10 +117,12 @@ 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 +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policies.beam 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_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_registry.beam @@ -162,9 +164,9 @@ 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-0.5.0-rmq3.1.5-git4b93c2d.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-3.1.5-gite309de4.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq3.1.5-git680dba8.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq%%VERSION%%-git4b93c2d.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-%%VERSION%%-gite309de4.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq%%VERSION%%-git680dba8.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 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez @@ -185,25 +187,31 @@ 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-3.1.5-git5e67120.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq3.1.5-git3132eb9.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq3.1.5-gite9359c7.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 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl +man/man1/rabbitmq-plugins.1.gz +man/man1/rabbitmq-server.1.gz +man/man1/rabbitmqctl.1.gz +man/man5/rabbitmq-env.conf.5.gz @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%% +@exec mkdir -p %D/etc/rabbitmq @dirrmtry etc/rabbitmq -@unexec rmdir /var/log/rabbitmq 2>/dev/null || true -@unexec rmdir /var/db/rabbitmq/mnesia 2>/dev/null || true -@unexec rmdir /var/db/rabbitmq 2>/dev/null || true +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example +@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%% @exec mkdir -p /var/log/rabbitmq @exec chown -R rabbitmq:rabbitmq /var/log/rabbitmq @exec mkdir -p /var/db/rabbitmq/mnesia @exec chown -R rabbitmq:rabbitmq /var/db/rabbitmq -@exec mkdir -p %D/etc/rabbitmq +@dirrmtry /var/log/rabbitmq +@dirrmtry /var/db/rabbitmq/mnesia +@dirrmtry /var/db/rabbitmq >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311171537.rAHFbZoG028474>