Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Aug 2018 08:18:11 +0000 (UTC)
From:      =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r476496 - in head/net/rabbitmq: . files
Message-ID:  <201808060818.w768IBTu013041@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dumbbell
Date: Mon Aug  6 08:18:10 2018
New Revision: 476496
URL: https://svnweb.freebsd.org/changeset/ports/476496

Log:
  net/rabbitmq: Fix build with Elixir 1.7.x
  
  Patches were backported from the upcoming RabbitMQ 3.7.8.
  
  Obtained from:	https://github.com/rabbitmq/rabbitmq-cli/tree/v3.7.x
  Sponsored by:	Pivotal Software, Inc.

Added:
  head/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex   (contents, props changed)
  head/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs   (contents, props changed)
Modified:
  head/net/rabbitmq/Makefile

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Mon Aug  6 08:07:53 2018	(r476495)
+++ head/net/rabbitmq/Makefile	Mon Aug  6 08:18:10 2018	(r476496)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.7.7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}

Added: head/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/rabbitmq/files/patch-deps_rabbitmq__cli_lib_rabbitmq_cli_core_parser.ex	Mon Aug  6 08:18:10 2018	(r476496)
@@ -0,0 +1,26 @@
+--- deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex.orig	2018-06-14 08:10:14 UTC
++++ deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
+@@ -142,7 +142,12 @@ defmodule RabbitMQ.CLI.Core.Parser do
+     switches = default_switches()
+     aliases = default_aliases()
+     {options, tail, invalid} =
+-      OptionParser.parse_head(input, strict: switches, aliases: aliases)
++      OptionParser.parse_head(
++        input,
++        strict: switches,
++        aliases: aliases,
++        allow_nonexistent_atoms: true,
++      )
+     norm_options = normalize_options(options, switches) |> Map.new
+     {norm_options, tail, invalid}
+   end
+@@ -157,7 +162,8 @@ defmodule RabbitMQ.CLI.Core.Parser do
+     {options, args, invalid} = OptionParser.parse(
+       input,
+       strict: switches,
+-      aliases: aliases
++      aliases: aliases,
++      allow_nonexistent_atoms: true,
+     )
+     norm_options = normalize_options(options, switches) |> Map.new
+     {args, norm_options, invalid}

Added: head/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs	Mon Aug  6 08:18:10 2018	(r476496)
@@ -0,0 +1,13 @@
+--- deps/rabbitmq_cli/mix.exs.orig	2018-06-14 08:10:14 UTC
++++ deps/rabbitmq_cli/mix.exs
+@@ -19,8 +19,8 @@ defmodule RabbitMQCtl.MixfileBase do
+   def project do
+     [
+       app: :rabbitmqctl,
+-      version: "3.7.5",
+-      elixir: "~> 1.6.0",
++      version: "3.7.8",
++      elixir: ">= 1.6.6 and < 1.8.0",
+       build_embedded: Mix.env == :prod,
+       start_permanent: Mix.env == :prod,
+       escript: [main_module: RabbitMQCtl,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808060818.w768IBTu013041>