Update rabbitmq from 3.7.8 to 3.7.14
Created attachment 203922 [details] patch for elixir This is a patch to lang/elixir to use erlang-runtime20 instead of erlang package as it conflicts with erlang
Created attachment 203923 [details] patch for rabbitmq patch for rabbitmq - upgrades rabbitmq from 3.7.8 to 3.7.14 - updates erland-runtime dep to > 20.3 - updates pkg-plist
Comment on attachment 203923 [details] patch for rabbitmq Index: Makefile =================================================================== --- Makefile (revision 499741) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rabbitmq -PORTVERSION= 3.7.8 +PORTVERSION= 3.7.14 CATEGORIES= net MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -13,13 +13,13 @@ LICENSE= MPL11 LICENSE_FILE= ${WRKSRC}/LICENSE-MPL-RabbitMQ -BUILD_DEPENDS= erlang-runtime19>=19.3:lang/erlang-runtime19 \ +BUILD_DEPENDS= erlang-runtime20>=20.3:lang/erlang-runtime20\ elixir:lang/elixir \ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \ xmlto:textproc/xmlto \ zip:archivers/zip \ rsync:net/rsync -RUN_DEPENDS= erlang-runtime19>=19.3:lang/erlang-runtime19 +RUN_DEPENDS= erlang-runtime20>=20.3:lang/erlang-runtime20 OPTIONS_DEFINE= ADMIN OPTIONS_SUB= yes @@ -45,7 +45,7 @@ SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts SHEBANG_FILES= deps/rabbitmq_management/bin/rabbitmqadmin MAKE_ARGS+= PYTHON=${PYTHON_CMD} -MAKE_ENV+= PATH="${LOCALBASE}/lib/erlang19/bin:${PATH}" \ +MAKE_ENV+= PATH="${LOCALBASE}/lib/erlang20/bin:${PATH}" \ TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \ SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \ MAN_DIR="${STAGEDIR}${PREFIX}/man" \ @@ -56,8 +56,9 @@ .include <bsd.port.options.mk> + post-patch: - @${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang19/bin/erl|g' \ + @${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/erlang20/bin/erl|g' \ ${SCRIPTS_DIR}/rabbitmq-server \ ${SCRIPTS_DIR}/rabbitmqctl \ ${SCRIPTS_DIR}/rabbitmq-env \ @@ -71,6 +72,7 @@ @${MKDIR} ${STAGEDIR}/var/log/rabbitmq ${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \ ${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample + ${CP} -r ${WRKSRC}/deps/sysmon_handler/ebin/ ${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}/ebin/ .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 @@ -81,5 +83,4 @@ post-install-ADMIN-on: ${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin - .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 499741) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537721729 -SHA256 (rabbitmq-server-3.7.8.tar.xz) = bed39fd72b8c932fe5f356fbbc7d30a19d651213e1667d81f084bc31468f5a02 -SIZE (rabbitmq-server-3.7.8.tar.xz) = 2534936 +TIMESTAMP = 1556016096 +SHA256 (rabbitmq-server-3.7.14.tar.xz) = 6790812bd05c6c28314fc01f3813cfd29ffa645c89161c9d4d0fce8464249d8a +SIZE (rabbitmq-server-3.7.14.tar.xz) = 2606388 Index: pkg-plist =================================================================== --- pkg-plist (revision 499741) +++ pkg-plist (working copy) @@ -138,6 +138,8 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameters.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ssl.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sysmon_handler.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sysmon_minder.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_table.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_trace.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade.beam @@ -153,10 +155,15 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vhost_sup_wrapper.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vm.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler.app +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler_app.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler_example_handler.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler_filter.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler_sup.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/sysmon_handler_testhandler.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/term_to_binary_compat.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/truncate.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-diagnostics lib/erlang/lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-plugins lib/erlang/lib/rabbitmq_server-%%VERSION%%/escript/rabbitmqctl @@ -172,11 +179,11 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.2.2.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.1.0.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.6.1.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.7.0.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/goldrush-0.1.9.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/jsx-2.8.2.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/lager-3.6.3.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/jsx-2.9.0.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/lager-3.6.9.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbit_common-%%VERSION%%.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_cache-%%VERSION%%.ez @@ -211,10 +218,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt_examples-%%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/ranch-1.5.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch_proxy_protocol-1.5.0.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.3.2.ez -lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/syslog-3.4.3.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.7.1.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.4.0.ez +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/syslog-3.4.5.ez lib/erlang/lib/rabbitmq_server-%%VERSION%%/priv/schema/rabbit.schema lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/cuttlefish lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
updated patch to fix sysmon_handler startup issue
Hi David thanks for the contribution. Unfortunately we already have a couple of patches cooking in phabricator, as part of a longer move to OTP21 as the default erlang: https://reviews.freebsd.org/D19911 https://reviews.freebsd.org/D19912 https://reviews.freebsd.org/D19913 we'd love to have your comments and review on the patches there, and apologies for the double up with your patches.
committed in r4502791