Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rabbitmq-server for openSUSE:Factory
checked in at 2022-02-19 19:21:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old)
and /work/SRC/openSUSE:Factory/.rabbitmq-server.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rabbitmq-server"
Sat Feb 19 19:21:16 2022 rev:77 rq:956005 version:3.9.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes
2022-01-07 12:47:25.783889141 +0100
+++
/work/SRC/openSUSE:Factory/.rabbitmq-server.new.1958/rabbitmq-server.changes
2022-02-19 19:21:27.501213867 +0100
@@ -1,0 +2,22 @@
+Sat Feb 19 10:44:15 UTC 2022 - Fusion Future <[email protected]>
+
+- Add zsh BuildRequires to fix "directories not owned by a package"
+ in zsh-completion.
+
+-------------------------------------------------------------------
+Wed Jan 19 09:51:06 UTC 2022 - Fusion Future <[email protected]>
+
+- Update to 3.9.13
+ * Core Server Bug Fixes and Enhancements
+ - Disk space monitor now correctly parses output on (at least
+ some) systems where non-ASCII characters are used in paths.
+ - Stream leader election is now deterministic when cluster is
+ undergoing a rolling upgrade.
+ - Queue and binding definition import can be delayed until a
+ moment when at least N nodes (e.g. three) have joined the
+ cluster.
+- Allow building with Elixir 1.13.x
+ * Support-Elixir-1.13.patch
+ * Elixir-1.13-OptionParser-no-longer-supports-atom-val.patch
+
+-------------------------------------------------------------------
Old:
----
rabbitmq-server-3.9.12.tar.xz
rabbitmq-server-3.9.12.tar.xz.asc
New:
----
Elixir-1.13-OptionParser-no-longer-supports-atom-val.patch
Support-Elixir-1.13.patch
rabbitmq-server-3.9.13.tar.xz
rabbitmq-server-3.9.13.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rabbitmq-server.spec ++++++
--- /var/tmp/diff_new_pack.MiC0QP/_old 2022-02-19 19:21:28.193213917 +0100
+++ /var/tmp/diff_new_pack.MiC0QP/_new 2022-02-19 19:21:28.197213917 +0100
@@ -39,7 +39,7 @@
%define _rabbitmq_group rabbitmq
Name: rabbitmq-server
-Version: 3.9.12
+Version: 3.9.13
Release: 0
Summary: A message broker supporting AMQP, STOMP and MQTT
License: MPL-2.0
@@ -52,6 +52,9 @@
Source6: rabbitmq-server.service
Source7:
https://raw.githubusercontent.com/rabbitmq/rabbitmq-packaging/v%{version}/RPMS/Fedora/rabbitmq-server.tmpfiles
Source8: README.SUSE
+# PATCH-FIX-UPSTREAM Allow building with elixir 1.13.x
gh#rabbitmq/rabbitmq-server#4019
+Patch0: Support-Elixir-1.13.patch
+Patch1: Elixir-1.13-OptionParser-no-longer-supports-atom-val.patch
BuildRequires: elixir
# https://www.rabbitmq.com/which-erlang.html
BuildRequires: erlang >= 23.2
@@ -117,8 +120,9 @@
%package zsh-completion
Summary: Zsh completion for %{name}
Group: System/Shells
-Requires: %{name} = %{version}
+BuildRequires: zsh
Requires: zsh
+Requires: %{name} = %{version}
Supplements: (%{name} and zsh)
BuildArch: noarch
@@ -126,7 +130,7 @@
Optional dependency offering zsh completion for %{name}.
%prep
-%setup -q
+%autosetup -p1
cp %{SOURCE8} .
%build
++++++ Elixir-1.13-OptionParser-no-longer-supports-atom-val.patch ++++++
>From d2b7b8a40275c24b271b7d806774fa813a883241 Mon Sep 17 00:00:00 2001
From: Michael Klishin <[email protected]>
Date: Fri, 4 Feb 2022 18:59:19 +0300
Subject: [PATCH 2/2] Elixir 1.13 OptionParser no longer supports :atom values
so coerce e.g. node names in our own code.
---
.../lib/rabbitmq/cli/core/command_modules.ex | 4 ++--
.../lib/rabbitmq/cli/core/helpers.ex | 12 +++++++++++-
.../rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex | 16 +++++++++-------
.../rabbitmq/cli/ctl/commands/decode_command.ex | 7 ++++---
.../rabbitmq/cli/ctl/commands/encode_command.ex | 7 ++++---
5 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex
b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex
index 006119cc7a..7343a139cc 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex
@@ -5,7 +5,7 @@
## Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights
reserved.
defmodule RabbitMQ.CLI.Core.CommandModules do
- alias RabbitMQ.CLI.Core.Config
+ alias RabbitMQ.CLI.Core.{Config, DataCoercion}
alias RabbitMQ.CLI.Plugins.Helpers, as: PluginsHelpers
alias RabbitMQ.CLI.CommandBehaviour
@@ -37,7 +37,7 @@ defmodule RabbitMQ.CLI.Core.CommandModules do
def script_scope(opts) do
scopes = Application.get_env(:rabbitmqctl, :scopes, [])
- scopes[Config.get_option(:script_name, opts)] || :none
+ scopes[DataCoercion.to_atom(Config.get_option(:script_name, opts))] ||
:none
end
def load_commands_core(scope) do
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex
b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex
index d9834f6cc5..4719af08d0 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex
@@ -5,7 +5,7 @@
## Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights
reserved.
defmodule RabbitMQ.CLI.Core.Helpers do
- alias RabbitMQ.CLI.Core.{Config, NodeName}
+ alias RabbitMQ.CLI.Core.{Config, DataCoercion, NodeName}
require Record
def get_rabbit_hostname(node_name_type \\ :shortnames) do
@@ -115,6 +115,16 @@ defmodule RabbitMQ.CLI.Core.Helpers do
)
end
+ def atomize_values(map, keys) do
+ Enum.reduce(map, %{},
+ fn({k, v}, acc) ->
+ case Enum.member?(keys, k) do
+ false -> Map.put(acc, k, v)
+ true -> Map.put(acc, k, DataCoercion.to_atom(v))
+ end
+ end)
+ end
+
def apply_if_exported(mod, fun, args, default) do
Code.ensure_loaded(mod)
case function_exported?(mod, fun, length(args)) do
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
index bd1aa45815..d8e2c8e4b7 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/parser.ex
@@ -6,11 +6,11 @@
defmodule RabbitMQ.CLI.Core.Parser do
alias RabbitMQ.CLI.{CommandBehaviour, FormatterBehaviour}
- alias RabbitMQ.CLI.Core.{CommandModules, Config}
+ alias RabbitMQ.CLI.Core.{CommandModules, Config, Helpers}
def default_switches() do
[
- node: :atom,
+ node: :string,
quiet: :boolean,
silent: :boolean,
dry_run: :boolean,
@@ -22,18 +22,20 @@ defmodule RabbitMQ.CLI.Core.Parser do
formatter: :string,
printer: :string,
file: :string,
- script_name: :atom,
+ script_name: :string,
rabbitmq_home: :string,
mnesia_dir: :string,
plugins_dir: :string,
enabled_plugins_file: :string,
aliases_file: :string,
- erlang_cookie: :atom,
+ erlang_cookie: :string,
help: :boolean,
print_stacktrace: :boolean
]
end
+ @atomized_options [:node, :script_name, :erlang_cookie]
+
def default_aliases() do
[
p: :vhost,
@@ -68,13 +70,13 @@ defmodule RabbitMQ.CLI.Core.Parser do
{[_alias_command_name | cmd_arguments], cmd_options, cmd_invalid} =
parse_alias(input, command_name, alias_module, alias_content,
options)
- {alias_module, command_name, cmd_arguments, cmd_options, cmd_invalid}
+ {alias_module, command_name, cmd_arguments,
Helpers.atomize_values(cmd_options, @atomized_options), cmd_invalid}
command_module when is_atom(command_module) ->
{[^command_name | cmd_arguments], cmd_options, cmd_invalid} =
parse_command_specific(input, command_module, options)
- {command_module, command_name, cmd_arguments, cmd_options, cmd_invalid}
+ {command_module, command_name, cmd_arguments,
Helpers.atomize_values(cmd_options, @atomized_options), cmd_invalid}
end
end
@@ -208,7 +210,7 @@ defmodule RabbitMQ.CLI.Core.Parser do
)
norm_options = normalize_options(options, switches) |> Map.new()
- {args, norm_options, invalid}
+ {args, Helpers.atomize_values(norm_options, @atomized_options), invalid}
end
defp build_switches(default, command, formatter) do
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
index 7c8da87d26..001d978c81 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/decode_command.ex
@@ -14,11 +14,12 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DecodeCommand do
def switches() do
[
- cipher: :atom,
- hash: :atom,
+ cipher: :string,
+ hash: :string,
iterations: :integer
]
end
+ @atomized_keys [:cipher, :hash]
def distribution(_), do: :none
@@ -28,7 +29,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DecodeCommand do
hash: :rabbit_pbe.default_hash(),
iterations: :rabbit_pbe.default_iterations()
}, opts)
- {args, with_defaults}
+ {args, Helpers.atomize_values(with_defaults, @atomized_keys)}
end
def validate(args, _) when length(args) < 2 do
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
index d18f948fce..ae65beae5b 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/encode_command.ex
@@ -12,11 +12,12 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EncodeCommand do
def switches() do
[
- cipher: :atom,
- hash: :atom,
+ cipher: :string,
+ hash: :string,
iterations: :integer
]
end
+ @atomized_keys [:cipher, :hash]
def distribution(_), do: :none
@@ -26,7 +27,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EncodeCommand do
hash: :rabbit_pbe.default_hash(),
iterations: :rabbit_pbe.default_iterations()
}, opts)
- {args, with_defaults}
+ {args, Helpers.atomize_values(with_defaults, @atomized_keys)}
end
def validate(args, _) when length(args) < 2 do
++++++ Support-Elixir-1.13.patch ++++++
>From 59e211d97eb57150714af9973a3dfc0baae86a13 Mon Sep 17 00:00:00 2001
From: Luke Bakken <[email protected]>
Date: Thu, 20 Jan 2022 09:53:51 -0800
Subject: [PATCH 1/2] Support Elixir 1.13
This is the build error prior to these changes:
```
* rabbit_common
(/home/bakkenl/development/rabbitmq/rabbitmq-server/deps/rabbit_common)
could not find an app file at
"_build/dev/lib/rabbit_common/ebin/rabbit_common.app". This may happen if the
dependency was not yet compiled or the dependency indeed has no app file (then
you can pass app: false as option)
** (Mix) Can't continue due to errors on dependencies
```
Telling `mix` to compile `rabbit_common` ensures that the following
links are created:
```
$ ll deps/rabbitmq_cli/_build/dev/lib/rabbit_common/
total 8
drwxr-xr-x 2 bakkenl bakkenl 4096 Jan 20 09:46 .
drwxr-xr-x 10 bakkenl bakkenl 4096 Jan 20 09:46 ..
lrwxrwxrwx 1 bakkenl bakkenl 33 Jan 20 09:46 ebin ->
../../../../../rabbit_common/ebin
lrwxrwxrwx 1 bakkenl bakkenl 36 Jan 20 09:46 include ->
../../../../../rabbit_common/include
```
---
deps/rabbitmq_cli/mix.exs | 6 +-----
deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk | 2 +-
deps/rabbitmq_ct_helpers/rabbitmq-components.mk | 2 +-
rabbitmq-components.mk | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
Index: rabbitmq-server-3.9.13/deps/rabbitmq_cli/mix.exs
===================================================================
--- rabbitmq-server-3.9.13.orig/deps/rabbitmq_cli/mix.exs
+++ rabbitmq-server-3.9.13/deps/rabbitmq_cli/mix.exs
@@ -11,7 +11,7 @@ defmodule RabbitMQCtl.MixfileBase do
[
app: :rabbitmqctl,
version: "3.8.0-dev",
- elixir: ">= 1.10.4 and < 1.13.0",
+ elixir: ">= 1.10.4 and < 1.14.0",
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
escript: [main_module: RabbitMQCtl,
@@ -149,19 +149,15 @@ defmodule RabbitMQCtl.MixfileBase do
end
end
- # We disable compilation for rabbit_common and amqp_client
- # because Erlang.mk already built them.
[
{
:rabbit_common,
path: Path.join(deps_dir, "rabbit_common"),
- compile: false,
override: true
},
{
:amqp_client,
path: Path.join(deps_dir, "amqp_client"),
- compile: false,
override: true,
only: :test
},
Index: rabbitmq-server-3.9.13/rabbitmq-components.mk
===================================================================
--- rabbitmq-server-3.9.13.orig/rabbitmq-components.mk
+++ rabbitmq-server-3.9.13/rabbitmq-components.mk
@@ -118,7 +118,7 @@ dep_looking_glass = git https://github.c
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl
06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
dep_ra = hex 2.0.3
dep_ranch = hex 2.1.0
-dep_recon = hex 2.5.1
+dep_recon = hex 2.5.2
dep_redbug = hex 2.0.7
dep_observer_cli = hex 1.7.1
dep_stdout_formatter = hex 0.2.4
++++++ rabbitmq-server-3.9.12.tar.xz -> rabbitmq-server-3.9.13.tar.xz ++++++
++++ 8873 lines of diff (skipped)
