Thu Sep 29 14:00:39 2011 UTC ()
Updated net/rabbitmq to 2.6.1.

Various pkgsrc fixes:

- Fix mangled PLIST from the previous commit.
- Depend on coreutils for readlink, which is used in rabbitmq-env.
- Depend on bash, which is assumed throughout the scripts.
- Make sure the shell is passed properly to make/install targets.
- Fix Python usage (add Python 2.7) and clean up other bits.

RabbitMQ changelog:

2.6.1 bug fixes
- The broker failed to (re)start on reboot on systems that keep
  /var/run on a temporary file systems, e.g. Ubuntu.
- The Windows service failed to increase the Erlang process limit,
  limiting the broker to a few thousand queues, connections and
  channels.

2.6.0 bug fixes
- Upgrading from RabbitMQ 2.1.1 to any later release could break if
  there were durable queues with persistent messages present.
- On very slow machines, starting rabbit via the supplied init scripts
  could fail with a timeout.
- Rabbit could fail to stop (when asked to do so) in the presence of
  some plug-ins (e.g. shovel).
- 'ram' nodes in a cluster could consume ever increasing amounts of
  disk space.
- The presence of fast consumers on a queue could significantly delay
  the addition of new consumers.
- When a client was issuing a tx.commit in one channel, and
  simultaneously, in another channel, deleted a durable queue with
  persistent messages involved in that tx, rabbit could terminate with
  an error.
- When a client was using both basic.qos and channel.flow, the latter
  would fail to re-enable message flow.
- When using 'confirm' mode, the deletion of queues could cause nacks
  to be issued (incorrectly).
- In extremely rare circumstances (never observed in the wild), a
  queue with a per-queue message ttl could break during sudden changes
  in rabbit memory usage.

2.6.0 enhancements
- Introduce active-active HA, with queues getting mirrored on nodes in
  a cluster. See http://www.rabbitmq.com/ha.html.
- Revamp the handling of AMQP's tx (transaction) class and clarify its
  behaviour See http://www.rabbitmq.com/specification.html#tx.
- Replace the 'administrator' flag, as used by the management plugin,
  with a more general 'user tags' mechanism. See
  http://www.rabbitmq.com/man/rabbitmqctl.1.man.html#set_user_tags.
- Do not require 'configure' permissions for passive queue/exchange
  declaration.
- Optimise of message delivery on channels with a basic.qos
  prefetch limit that are consuming from many queues.
- In 'rabbitmqctl list_channels', do not show the tx mode by default.
- When a cluster 'degrades' to only containing ram nodes - through
  'rabbitmqctl' actions or node failure - display/log a warning.
- Eliminate some spurious errors from the sasl log.


(fhajny)
diff -r1.1.1.1 -r1.2 pkgsrc/net/rabbitmq/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/rabbitmq/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/PLIST
diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/distinfo
diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/version.mk
diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/patches/patch-aa

cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/rabbitmq/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/Makefile 2010/09/21 11:47:32 1.1.1.1
+++ pkgsrc/net/rabbitmq/Makefile 2011/09/29 14:00:39 1.2
@@ -1,85 +1,87 @@ @@ -1,85 +1,87 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $ 1# $NetBSD: Makefile,v 1.2 2011/09/29 14:00:39 fhajny Exp $
2# 2#
3 3
4PKGNAME= rabbitmq-${RMQ_VERSION} 4PKGNAME= rabbitmq-${RMQ_VERSION}
5DISTNAME= rabbitmq-server-${RMQ_VERSION} 5DISTNAME= rabbitmq-server-${RMQ_VERSION}
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/ 7MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${RMQ_VERSION}/
8 8
9MAINTAINER= filip@joyent.com 9MAINTAINER= filip@joyent.com
10HOMEPAGE= http://www.rabbitmq.com/server.html 10HOMEPAGE= http://www.rabbitmq.com/server.html
11COMMENT= Implementation of AMQP that provides robust messaging for applications 11COMMENT= Implementation of AMQP that provides robust messaging for applications
12LICENSE= mpl-1.1 12LICENSE= mpl-1.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake bash:run
17 17
18BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 18BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
19BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 19BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
 20DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils
20DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson 21DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
21 22
22.include "version.mk" 23.include "version.mk"
23.include "../../lang/python/pyversion.mk" 24.include "../../lang/python/pyversion.mk"
24 25
25BUILD_DEFS+= VARBASE 26BUILD_DEFS+= VARBASE GNU_PROGRAM_PREFIX
26 
27.if !empty(TOOLS_PLATFORM.bash) 
28RMQ_SHELL= ${TOOLS_PLATFORM.bash} 
29.else 
30RMQ_SHELL= /bin/sh 
31.endif 
32 27
33.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
34 29
35RMQ_USER?= rabbitmq 30RMQ_USER?= rabbitmq
36RMQ_GROUP?= ${RMQ_USER} 31RMQ_GROUP?= ${RMQ_USER}
 32RMQ_SHELL?= ${TOOLS_PATH.bash}
37RMQ_DIR?= ${VARBASE}/db/rabbitmq 33RMQ_DIR?= ${VARBASE}/db/rabbitmq
38RMQ_LOG?= ${VARBASE}/log/rabbitmq 34RMQ_LOG?= ${VARBASE}/log/rabbitmq
39 35
40OWN_DIRS+= ${RMQ_DIR} ${RMQ_LOG} 36OWN_DIRS+= ${RMQ_DIR} ${RMQ_LOG}
41OWN_DIRS_PERMS+= ${RMQ_DIR} ${RMQ_USER} ${RMQ_GROUP} 0770 37OWN_DIRS_PERMS+= ${RMQ_DIR} ${RMQ_USER} ${RMQ_GROUP} 0770
42OWN_DIRS_PERMS+= ${RMQ_LOG} ${RMQ_USER} ${RMQ_GROUP} 0770 38OWN_DIRS_PERMS+= ${RMQ_LOG} ${RMQ_USER} ${RMQ_GROUP} 0770
43 39
44PKG_GROUPS+= ${RMQ_GROUP} 40PKG_GROUPS+= ${RMQ_GROUP}
45PKG_USERS+= ${RMQ_USER}:${RMQ_GROUP} 41PKG_USERS+= ${RMQ_USER}:${RMQ_GROUP}
46PKG_GECOS.${RMQ_USER}= RabbitMQ Server User 42PKG_GECOS.${RMQ_USER}= RabbitMQ Server User
47PKG_HOME.${RMQ_USER}= ${RMQ_DIR} 43PKG_HOME.${RMQ_USER}= ${RMQ_DIR}
48PKG_SHELL.${RMQ_USER}= ${RMQ_SHELL} 44PKG_SHELL.${RMQ_USER}= ${RMQ_SHELL}
49 45
50PKG_SYSCONFSUBDIR?= ${PKGBASE} 46PKG_SYSCONFSUBDIR= ${PKGBASE}
51CONF_FILES+= ${PREFIX}/share/examples/rabbitmq/rabbitmq.conf ${PKG_SYSCONFDIR}/rabbitmq.conf 47CONF_FILES+= ${PREFIX}/share/examples/rabbitmq/rabbitmq.conf ${PKG_SYSCONFDIR}/rabbitmq.conf
52 48
53INSTALLATION_DIRS+= share/examples/rabbitmq 49INSTALLATION_DIRS+= share/examples/rabbitmq
54 50
55SCRIPTS_DIR= ${WRKSRC}/scripts 51SCRIPTS_DIR= ${WRKSRC}/scripts
56 52
57PLIST_SUBST+= RMQ_VERSION=${RMQ_VERSION} 53PLIST_SUBST+= RMQ_VERSION=${RMQ_VERSION}
58 54
59SUBST_CLASSES+= paths 55SUBST_CLASSES+= paths
60SUBST_MESSAGE.paths= Setting standard paths 56SUBST_MESSAGE.paths= Setting standard paths
61SUBST_STAGE.paths= post-patch 57SUBST_STAGE.paths= post-patch
62SUBST_FILES.paths= ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env 58SUBST_FILES.paths= ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
63SUBST_FILES.paths+= ${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server 59SUBST_FILES.paths+= ${SCRIPTS_DIR}/rabbitmq-server
64SUBST_SED.paths= -e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}/rabbitmq|g' 60SUBST_SED.paths= -e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
65SUBST_SED.paths+= -e 's|/var/lib|${VARBASE}/db|g' 61SUBST_SED.paths+= -e 's|/var/lib|${VARBASE}/db|g'
66SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g' 62SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g'
 63SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g'
67SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g' 64SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g'
68SUBST_SED.paths+= -e 's|/bin/sh|/bin/ksh|g' 65SUBST_SED.paths+= -e 's|/bin/sh|/bin/ksh|g'
69 66SUBST_SED.paths+= -e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g'
70SUBST_CLASSES+= shell 
71SUBST_MESSAGE.shell= Setting Makefile shell 
72SUBST_STAGE.shell= post-patch 
73SUBST_FILES.shell= Makefile 
74SUBST_SED.shell= -e 's|@SHELL@|${RMQ_SHELL}|g' 
75 67
76MAKE_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}" 68MAKE_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
77MAKE_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/" 69MAKE_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
78MAKE_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man" 70MAKE_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man"
79MAKE_ENV+= RMQ_VERSION=${RMQ_VERSION} 71MAKE_ENV+= RMQ_VERSION=${RMQ_VERSION}
 72MAKE_ENV+= MAKE_SHELL="${RMQ_SHELL}"
 73
 74INSTALL_ENV+= TARGET_DIR="${DESTDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}"
 75INSTALL_ENV+= SBIN_DIR="${DESTDIR}${PREFIX}/sbin/"
 76INSTALL_ENV+= MAN_DIR="${DESTDIR}${PREFIX}/man"
 77INSTALL_ENV+= RMQ_VERSION=${RMQ_VERSION}
 78INSTALL_ENV+= MAKE_SHELL="${RMQ_SHELL}"
 79
 80REPLACE_PYTHON+= calculate-relative
80 81
81post-install: 82post-install:
82 ${INSTALL_DATA} ${FILESDIR}/rabbitmq.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq.conf 83 ${INSTALL_DATA} ${FILESDIR}/rabbitmq.conf ${DESTDIR}${PREFIX}/share/examples/rabbitmq/rabbitmq.conf
83 84
84.include "../../lang/erlang/buildlink3.mk" 85.include "../../lang/erlang/buildlink3.mk"
 86.include "../../lang/python/application.mk"
85.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/rabbitmq/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/Attic/buildlink3.mk 2010/09/21 11:47:32 1.1.1.1
+++ pkgsrc/net/rabbitmq/Attic/buildlink3.mk 2011/09/29 14:00:39 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/21 11:47:32 fhajny Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2011/09/29 14:00:39 fhajny Exp $
2 2
3BUILDLINK_TREE+= rabbitmq 3BUILDLINK_TREE+= rabbitmq
4 4
5.if !defined(RABBITMQ_BUILDLINK3_MK) 5.if !defined(RABBITMQ_BUILDLINK3_MK)
6RABBITMQ_BUILDLINK3_MK:= 6RABBITMQ_BUILDLINK3_MK:=
7 7
8.include "version.mk" 8.include "version.mk"
 9RABBITMQ_PLUGINS= lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins
9 10
10BUILDLINK_API_DEPENDS.rabbitmq+= rabbitmq>=2.1.0 11BUILDLINK_API_DEPENDS.rabbitmq+= rabbitmq>=2.1.0
11BUILDLINK_PKGSRCDIR.rabbitmq?= ../../net/rabbitmq 12BUILDLINK_PKGSRCDIR.rabbitmq?= ../../net/rabbitmq
12 13
13BUILDLINK_INCDIRS.rabbitmq?= lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include 14BUILDLINK_INCDIRS.rabbitmq?= lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include
14.endif # RABBITMQ_BUILDLINK3_MK 15.endif # RABBITMQ_BUILDLINK3_MK
15 16
16BUILDLINK_TREE+= -rabbitmq 17BUILDLINK_TREE+= -rabbitmq

cvs diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/PLIST (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/PLIST 2011/07/05 13:09:04 1.2
+++ pkgsrc/net/rabbitmq/PLIST 2011/09/29 14:00:39 1.3
@@ -1,121 +1,130 @@ @@ -1,121 +1,130 @@
1@comment $NetBSD: PLIST,v 1.2 2011/07/05 13:09:04 mspo Exp $ 1@comment $NetBSD: PLIST,v 1.3 2011/09/29 14:00:39 fhajny Exp $
2lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/INSTALL 2lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/INSTALL
3lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/LICENSE 3lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE
4lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/LICENSE-MPL-RabbitMQ 4lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/LICENSE-MPL-RabbitMQ
5lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/bpqueue.beam 5lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/bpqueue.beam
6lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/delegate.beam 6lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate.beam
7lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/delegate_sup.beam 7lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/delegate_sup.beam
8lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/file_handle_cache.beam 8lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/file_handle_cache.beam
9lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gatherer.beam 9lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gatherer.beam
10lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gen_server2.beam 10lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gen_server2.beam
11lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm.beam 11lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm.beam
12lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_soak_test.beam 12lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_soak_test.beam
13lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_speed_test.beam 13lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_speed_test.beam
14lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/gm_tests.beam 14lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/gm_tests.beam
15lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/pg_local.beam 15lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg_local.beam
16lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/priority_queue.beam 16lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor.beam
17lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit.app 17lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/mirrored_supervisor_tests.beam
18lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit.beam 18lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/pg2_fixed.beam
19lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_access_control.beam 19lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/priority_queue.beam
20lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_alarm.beam 20lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit.app
21lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue.beam 21lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit.beam
22lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue_process.beam 22lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_access_control.beam
23lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_amqqueue_sup.beam 23lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_alarm.beam
24lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_app.in 24lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue.beam
25lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_backend.beam 25lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue_process.beam
26lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_backend_internal.beam 26lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_amqqueue_sup.beam
27lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism.beam 27lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_app.in
28lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_amqplain.beam 28lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_backend.beam
29lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam 29lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_backend_internal.beam
30lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_auth_mechanism_plain.beam 30lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism.beam
31lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_backing_queue.beam 31lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_amqplain.beam
32lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_basic.beam 32lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam
33lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binary_generator.beam 33lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_auth_mechanism_plain.beam
34lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binary_parser.beam 34lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_backing_queue.beam
35lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_binding.beam 35lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_backing_queue_qc.beam
36lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel.beam 36lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_basic.beam
37lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel_sup.beam 37lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binary_generator.beam
38lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_channel_sup_sup.beam 38lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binary_parser.beam
39lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_client_sup.beam 39lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_binding.beam
40lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_command_assembler.beam 40lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel.beam
41lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_connection_sup.beam 41lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel_sup.beam
42lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_control.beam 42lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_channel_sup_sup.beam
43lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_ctl_usage.beam 43lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_client_sup.beam
44lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_direct.beam 44lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_command_assembler.beam
45lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_error_logger.beam 45lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_connection_sup.beam
46lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_error_logger_file_h.beam 46lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_control.beam
47lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_event.beam 47lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_ctl_usage.beam
48lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange.beam 48lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_direct.beam
49lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type.beam 49lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_error_logger.beam
50lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_direct.beam 50lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_error_logger_file_h.beam
51lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_fanout.beam 51lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_event.beam
52lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_headers.beam 52lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange.beam
53lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_exchange_type_topic.beam 53lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type.beam
54lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing.beam 54lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_direct.beam
55lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing_amqp_0_8.beam 55lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_fanout.beam
56lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_framing_amqp_0_9_1.beam 56lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_headers.beam
57lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_guid.beam 57lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_exchange_type_topic.beam
58lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_heartbeat.beam 58lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing.beam
59lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_limiter.beam 59lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_8.beam
60lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_log.beam 60lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_framing_amqp_0_9_1.beam
61lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_memory_monitor.beam 61lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_guid.beam
62lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_misc.beam 62lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_heartbeat.beam
63lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_mnesia.beam 63lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_limiter.beam
64lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_file.beam 64lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_log.beam
65lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store.beam 65lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_memory_monitor.beam
66lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_ets_index.beam 66lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_coordinator.beam
67lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_gc.beam 67lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_master.beam
68lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_msg_store_index.beam 68lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_misc.beam
69lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_net.beam 69lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_slave.beam
70lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_networking.beam 70lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mirror_queue_slave_sup.beam
71lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_node_monitor.beam 71lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_misc.beam
72lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_prelaunch.beam 72lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_mnesia.beam
73lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_queue_collector.beam 73lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_file.beam
74lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_queue_index.beam 74lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store.beam
75lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_reader.beam 75lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_ets_index.beam
76lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_registry.beam 76lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_gc.beam
77lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_restartable_sup.beam 77lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_msg_store_index.beam
78lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_router.beam 78lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_net.beam
79lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_sasl_report_file_h.beam 79lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_networking.beam
80lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_ssl.beam 80lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_node_monitor.beam
81lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_sup.beam 81lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_prelaunch.beam
82lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_tests.beam 82lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_collector.beam
83lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_tests_event_receiver.beam 83lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_queue_index.beam
84lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_trace.beam 84lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_reader.beam
85lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_types.beam 85lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_registry.beam
86lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_upgrade.beam 86lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_restartable_sup.beam
87lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_upgrade_functions.beam 87lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_router.beam
88lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_variable_queue.beam 88lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_sasl_report_file_h.beam
89lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_version.beam 89lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_ssl.beam
90lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_vhost.beam 90lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_sup.beam
91lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/rabbit_writer.beam 91lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_tests.beam
92lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/supervisor2.beam 92lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_tests_event_receiver.beam
93lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_acceptor.beam 93lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_trace.beam
94lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_acceptor_sup.beam 94lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_types.beam
95lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_listener.beam 95lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_upgrade.beam
96lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/tcp_listener_sup.beam 96lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_upgrade_functions.beam
97lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/test_sup.beam 97lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_variable_queue.beam
98lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/vm_memory_monitor.beam 98lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_version.beam
99lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool.beam 99lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_vhost.beam
100lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool_sup.beam 100lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/rabbit_writer.beam
101lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/ebin/worker_pool_worker.beam 101lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/supervisor2.beam
102lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/gm_specs.hrl 102lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_acceptor.beam
103lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit.hrl 103lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_acceptor_sup.beam
104lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_auth_backend_spec.hrl 104lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_listener.beam
105lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_auth_mechanism_spec.hrl 105lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/tcp_listener_sup.beam
106lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_backing_queue_spec.hrl 106lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/test_sup.beam
107lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_exchange_type_spec.hrl 107lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/vm_memory_monitor.beam
108lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_framing.hrl 108lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool.beam
109lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_msg_store.hrl 109lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool_sup.beam
110lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/include/rabbit_msg_store_index.hrl 110lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/ebin/worker_pool_worker.beam
111lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/plugins/README 111lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/gm_specs.hrl
112lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmq-env 112lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit.hrl
113lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmq-server 113lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_auth_backend_spec.hrl
114lib/erlang/lib/rabbitmq_server-2.${OS_VERSION}/sbin/rabbitmqctl 114lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_auth_mechanism_spec.hrl
 115lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_backing_queue_spec.hrl
 116lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_exchange_type_spec.hrl
 117lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_framing.hrl
 118lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_msg_store.hrl
 119lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/include/rabbit_msg_store_index.hrl
 120lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/plugins/README
 121lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-env
 122lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmq-server
 123lib/erlang/lib/rabbitmq_server-${RMQ_VERSION}/sbin/rabbitmqctl
115man/man1/rabbitmq-server.1 124man/man1/rabbitmq-server.1
116man/man1/rabbitmqctl.1 125man/man1/rabbitmqctl.1
117man/man5/rabbitmq-env.conf.5.gz 126man/man5/rabbitmq-env.conf.5
118sbin/rabbitmq-env 127sbin/rabbitmq-env
119sbin/rabbitmq-server 128sbin/rabbitmq-server
120sbin/rabbitmqctl 129sbin/rabbitmqctl
121share/examples/rabbitmq/rabbitmq.conf 130share/examples/rabbitmq/rabbitmq.conf

cvs diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/distinfo 2011/07/05 13:09:04 1.2
+++ pkgsrc/net/rabbitmq/distinfo 2011/09/29 14:00:39 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2011/07/05 13:09:04 mspo Exp $ 1$NetBSD: distinfo,v 1.3 2011/09/29 14:00:39 fhajny Exp $
2 2
3SHA1 (rabbitmq-server-2.5.1.tar.gz) = 25a14f4bb931b0772f0001b4b6e0c3e12d936593 3SHA1 (rabbitmq-server-2.6.1.tar.gz) = 628ec7453c0ee8ec3bad0780504e335b48f9b533
4RMD160 (rabbitmq-server-2.5.1.tar.gz) = d2e2e5e2f0c88afceb5c56cda088340b6e624ad3 4RMD160 (rabbitmq-server-2.6.1.tar.gz) = 818cd8bfbf5593b0cdb4bd4a71d4b7124472f35c
5Size (rabbitmq-server-2.5.1.tar.gz) = 332560 bytes 5Size (rabbitmq-server-2.6.1.tar.gz) = 367491 bytes
6SHA1 (patch-aa) = 09f8353228a78e314b212fdbd82bccf3cf300e20 6SHA1 (patch-aa) = 70d02da132630369cfce53555a0aab614a26c88a

cvs diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/Attic/version.mk (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/Attic/version.mk 2011/07/05 13:09:04 1.2
+++ pkgsrc/net/rabbitmq/Attic/version.mk 2011/09/29 14:00:39 1.3
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
1# $NetBSD: version.mk,v 1.2 2011/07/05 13:09:04 mspo Exp $ 1# $NetBSD: version.mk,v 1.3 2011/09/29 14:00:39 fhajny Exp $
2# 2#
3 3
4RMQ_VERSION= 2.5.1 4RMQ_VERSION= 2.6.1

cvs diff -r1.2 -r1.3 pkgsrc/net/rabbitmq/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/rabbitmq/patches/Attic/patch-aa 2011/07/05 13:09:05 1.2
+++ pkgsrc/net/rabbitmq/patches/Attic/patch-aa 2011/09/29 14:00:39 1.3
@@ -1,10 +1,28 @@ @@ -1,10 +1,28 @@
1$NetBSD: patch-aa,v 1.2 2011/07/05 13:09:05 mspo Exp $ 1$NetBSD: patch-aa,v 1.3 2011/09/29 14:00:39 fhajny Exp $
2 2
3--- Makefile.orig 2011-07-05 12:03:54.000000000 +0000 3Fix shell and add Python 2.7.
 4--- Makefile.orig 2011-02-03 12:47:36.000000000 +0000
4+++ Makefile 5+++ Makefile
5@@ -1,4 +1,5 @@ 6@@ -1,3 +1,4 @@
 7+SHELL=$(MAKE_SHELL)
6 TMPDIR ?= /tmp 8 TMPDIR ?= /tmp
7+SHELL=@SHELL@ 
8  9
9 RABBITMQ_NODENAME ?= rabbit 10 RABBITMQ_NODENAME ?= rabbit
10 RABBITMQ_SERVER_START_ARGS ?= 11@@ -24,6 +25,9 @@ USAGES_ERL=$(foreach XML, $(USAGES_XML),
 12 ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
 13 PYTHON=python
 14 else
 15+ifeq ($(shell python2.7 -c 'import simplejson' 2>/dev/null && echo yes),yes)
 16+PYTHON=python2.7
 17+else
 18 ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
 19 PYTHON=python2.6
 20 else
 21@@ -35,6 +39,7 @@ PYTHON=python
 22 endif
 23 endif
 24 endif
 25+endif
 26
 27 BASIC_PLT=basic.plt
 28 RABBIT_PLT=rabbit.plt