From b4df004b85e5954b071780adb8cf55436da5041b Mon Sep 17 00:00:00 2001 From: fhajny Date: Fri, 2 Dec 2016 11:00:39 +0000 Subject: [PATCH] Update net/rabbitmq to 3.6.6. - Security vulnerability fix - Bug fixes See full release notes: https://github.com/rabbitmq/rabbitmq-server/releases/tag/rabbitmq_v3_6_6 --- net/rabbitmq/Makefile | 9 +++++---- net/rabbitmq/PLIST | 7 ++++--- net/rabbitmq/distinfo | 12 ++++++------ ...mq-env => patch-deps_rabbit_scripts_rabbitmq-env} | 6 +++--- 4 files changed, 18 insertions(+), 16 deletions(-) rename net/rabbitmq/patches/{patch-scripts_rabbitmq-env => patch-deps_rabbit_scripts_rabbitmq-env} (84%) diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index d6d68945b68b..1bbd4854a70e 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2016/08/14 11:17:44 fhajny Exp $ +# $NetBSD: Makefile,v 1.27 2016/12/02 11:00:39 fhajny Exp $ -DISTNAME= rabbitmq-server-3.6.5 +DISTNAME= rabbitmq-server-3.6.6 PKGNAME= ${DISTNAME:S/-server//} CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PKGVERSION_NOREV}/ @@ -52,7 +52,7 @@ RABBITMQ_HOME= ${PREFIX}/lib/erlang/lib/rabbitmq_server-${PKGVERSION_NOREV} INSTALLATION_DIRS+= share/examples/rabbitmq -SCRIPTS_DIR= ${WRKSRC}/scripts +SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Setting standard paths @@ -76,11 +76,12 @@ MAKE_ENV+= MANDIR="${PREFIX}/${PKGMANDIR}" MAKE_ENV+= RMQ_BINDIR="${PREFIX}/sbin" MAKE_ENV+= RMQ_LIBDIR="${PREFIX}/lib/erlang/lib" MAKE_ENV+= RSYNC="${PREFIX}/bin/rsync" +MAKE_ENV+= VERSION="${PKGVERSION_NOREV}" INSTALL_TARGET= install-erlapp install-scripts install-bin install-man post-install: - ${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \ + ${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \ ${DESTDIR}${PREFIX}/share/examples/rabbitmq ${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf \ ${DESTDIR}${PREFIX}/share/examples/rabbitmq diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST index 4d957e27cc46..e5e0c83afcc1 100644 --- a/net/rabbitmq/PLIST +++ b/net/rabbitmq/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2016/08/14 11:17:44 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.23 2016/12/02 11:00:39 fhajny Exp $ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-APACHE2-ExplorerCanvas @@ -8,6 +8,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-BSD-base64js lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-BSD-glMatrix lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-EPL-OTP lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-EJS10 +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Erlware-Commons lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Flot lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Mochi lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Mochiweb @@ -27,8 +28,6 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/lqueue.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor_sups.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mnesia_sync.beam -lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mochinum.beam -lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pg2_fixed.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pg_local.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.app lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.beam @@ -50,6 +49,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_client_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_helper_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_sup.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_main.beam +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_pbe.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ctl_usage.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_dead_letter.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_diagnostics.beam @@ -93,6 +93,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_md5.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha256.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha512.beam +lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_pbe.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_main.beam lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins_usage.beam diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo index eedf9392f698..a8304d72c88b 100644 --- a/net/rabbitmq/distinfo +++ b/net/rabbitmq/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.30 2016/08/14 11:17:44 fhajny Exp $ +$NetBSD: distinfo,v 1.31 2016/12/02 11:00:39 fhajny Exp $ -SHA1 (rabbitmq-server-3.6.5.tar.xz) = 92d49c752398f7de80c2374628b6680046931eb5 -RMD160 (rabbitmq-server-3.6.5.tar.xz) = d21c54d2dc41c97bc3946554f6286efe57f55320 -SHA512 (rabbitmq-server-3.6.5.tar.xz) = 50751a25b39a96a8b0665c9316d8a603050807597f932e0b3cc74f63fbd73a5668865ad7e7c58de5bef80295a5a3c472731446e4e07c530812a6275703ce2388 -Size (rabbitmq-server-3.6.5.tar.xz) = 2923164 bytes +SHA1 (rabbitmq-server-3.6.6.tar.xz) = fc6dbb566981e7810c14fe04521bed2acc3f85ca +RMD160 (rabbitmq-server-3.6.6.tar.xz) = 3f2fd7edf3bdc599ae9b054de47c5991da22bd5c +SHA512 (rabbitmq-server-3.6.6.tar.xz) = 6a79226ffa61103d237a8978587df966141c17d6f6348cc6c0971ffbd7a1adc593b3eecfec327ffe589d5fd3029fe045fbd80ed0d5a0f24ffb478cc8de5c124b +Size (rabbitmq-server-3.6.6.tar.xz) = 2471724 bytes SHA1 (patch-Makefile) = 088a3ed04dc72215f1ca3b34b49bb4047a531e89 -SHA1 (patch-scripts_rabbitmq-env) = 0b94c8b3987408b7a6291e3797f9d0e31fca64d6 +SHA1 (patch-deps_rabbit_scripts_rabbitmq-env) = e2b9846e9b161ea73d7338a162699efc06340215 diff --git a/net/rabbitmq/patches/patch-scripts_rabbitmq-env b/net/rabbitmq/patches/patch-deps_rabbit_scripts_rabbitmq-env similarity index 84% rename from net/rabbitmq/patches/patch-scripts_rabbitmq-env rename to net/rabbitmq/patches/patch-deps_rabbit_scripts_rabbitmq-env index db93d46c11ae..8409153707e8 100644 --- a/net/rabbitmq/patches/patch-scripts_rabbitmq-env +++ b/net/rabbitmq/patches/patch-deps_rabbit_scripts_rabbitmq-env @@ -1,9 +1,9 @@ -$NetBSD: patch-scripts_rabbitmq-env,v 1.2 2015/12/31 22:16:33 fhajny Exp $ +$NetBSD: patch-deps_rabbit_scripts_rabbitmq-env,v 1.1 2016/12/02 11:00:39 fhajny Exp $ Remove cumbersome symlink handling, we know where stuff is. ---- scripts/rabbitmq-env.orig 2015-11-12 16:42:49.000000000 +0000 -+++ scripts/rabbitmq-env +--- deps/rabbit/scripts/rabbitmq-env.orig 2015-11-12 16:42:49.000000000 +0000 ++++ deps/rabbit/scripts/rabbitmq-env @@ -20,29 +20,7 @@ if [ "$RABBITMQ_ENV_LOADED" = 1 ]; then fi