Date: Mon, 1 Aug 2011 21:00:19 GMT From: Andrew <andrew@flarn.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159364: Update net/rabbitmq to 2.5.1 Message-ID: <201108012100.p71L0J1I078711@red.freebsd.org> Resent-Message-ID: <201108012110.p71LA95b070940@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159364 >Category: ports >Synopsis: Update net/rabbitmq to 2.5.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 01 21:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Andrew >Release: 8.2-STABLE >Organization: >Environment: >Description: Update net/rabbitmq to 2.5.1 NOTE: Patch removes rabbitmq-multi usage as it has been removed in upstream so and the rc script is adjusted to start as per docs (rabbitmq-server -detached) and use rabbitmqctl to stop, so this only supports a single instance per host with the rc script now. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ur ../rabbitmq.orig/Makefile ./Makefile --- ../rabbitmq.orig/Makefile 2011-06-14 20:34:49.000000000 +0100 +++ ./Makefile 2011-08-01 21:46:38.088094043 +0100 @@ -6,8 +6,7 @@ # PORTNAME= rabbitmq -PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTVERSION= 2.5.1 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -38,8 +37,8 @@ RABBITMQ_UID=${RABBITMQ_UID} \ RABBITMQ_USER=${RABBITMQ_USER} -MAN1= rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 -MAN5= rabbitmq.conf.5 +MAN1= rabbitmq-server.1 rabbitmqctl.1 +MAN5= rabbitmq-env.conf.5 MANCOMPRESSED= yes SCRIPTS_DIR= ${WRKSRC}/scripts/ @@ -48,7 +47,7 @@ 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-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env + ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env @${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM} pre-install: diff -ur ../rabbitmq.orig/distinfo ./distinfo --- ../rabbitmq.orig/distinfo 2011-02-09 20:12:01.000000000 +0000 +++ ./distinfo 2011-08-01 15:56:14.780010000 +0100 @@ -1,2 +1,2 @@ -SHA256 (rabbitmq-server-2.3.1.tar.gz) = 3bb6c4004031fc3e57c886452e03dd10e2c23cd64f1cca180f34aba5b30d9f24 -SIZE (rabbitmq-server-2.3.1.tar.gz) = 301044 +SHA256 (rabbitmq-server-2.5.1.tar.gz) = f5afeb8429508644738b68a158ed1f4a4dfc4bcbe1ebdab5ba818a75545e942f +SIZE (rabbitmq-server-2.5.1.tar.gz) = 332560 diff -ur ../rabbitmq.orig/files/patch-rabbitmqctl ./files/patch-rabbitmqctl --- ../rabbitmq.orig/files/patch-rabbitmqctl 2011-01-13 06:09:59.000000000 +0000 +++ ./files/patch-rabbitmqctl 2011-08-01 16:43:54.746292632 +0100 @@ -1,6 +1,6 @@ ---- scripts/rabbitmqctl.orig 2011-01-12 09:22:10.000000000 -0300 -+++ scripts/rabbitmqctl 2011-01-12 09:23:31.000000000 -0300 -@@ -38,7 +38,7 @@ +--- scripts/rabbitmqctl.orig 2011-08-01 15:59:26.057347310 +0100 ++++ scripts/rabbitmqctl 2011-08-01 16:00:07.303513263 +0100 +@@ -20,7 +20,7 @@ [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} Only in ../rabbitmq.orig/files: patch-src-rabbit_networking-erl diff -ur ../rabbitmq.orig/files/rabbitmq.in ./files/rabbitmq.in --- ../rabbitmq.orig/files/rabbitmq.in 2010-03-27 00:13:55.000000000 +0000 +++ ./files/rabbitmq.in 2011-08-01 21:49:50.516558604 +0100 @@ -20,13 +20,13 @@ # Set some defaults rabbitmq_enable=${rabbitmq_enable:-"NO"} rabbitmq_user=${rabbitmq_user:-"rabbitmq"} -rabbitmq_nodes=${rabbitmq_nodes:-"1"} -rabbitmq_multi="%%PREFIX%%/sbin/rabbitmq-multi" +rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server" +rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl" -start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} start_all ${rabbitmq_nodes}\"'" -stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} stop_all\"'" -rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'" -status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'" +start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_server} -detached\"'" +stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} stop\"'" +rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\"'" +status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'" extra_commands="rotate_logs status" load_rc_config $name diff -ur ../rabbitmq.orig/pkg-plist ./pkg-plist --- ../rabbitmq.orig/pkg-plist 2011-02-09 20:12:01.000000000 +0000 +++ ./pkg-plist 2011-08-01 16:28:59.182626174 +0100 @@ -1,5 +1,4 @@ sbin/rabbitmq-env -sbin/rabbitmq-multi sbin/rabbitmq-server sbin/rabbitmqctl lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL @@ -11,6 +10,10 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_soak_test.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_speed_test.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_tests.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app @@ -43,13 +46,13 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_direct.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_direct.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_fanout.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_8.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam @@ -60,8 +63,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi_usage.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_ets_index.beam @@ -82,10 +83,12 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests_event_receiver.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_trace.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_types.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade_functions.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_variable_queue.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_version.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vhost.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam @@ -98,6 +101,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/gm_specs.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_auth_backend_spec.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_auth_mechanism_spec.hrl @@ -108,7 +112,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store_index.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108012100.p71L0J1I078711>