* Remove debian/patches/Upstream_PR2965_fixing_rabbitmqctl_parsing applied
upstream.
* Remove hunk from lets-use-python3-not-python-binary.patch as one upstream
file is gone.
Thomas Goirand
2 years ago
| 1 | 1 | |
| 2 | 2 | * New upstream release: |
| 3 | 3 | - Works with Erlang 24 (Closes: #992609). |
| 4 | * Remove debian/patches/Upstream_PR2965_fixing_rabbitmqctl_parsing applied | |
| 5 | upstream. | |
| 6 | * Remove hunk from lets-use-python3-not-python-binary.patch as one upstream | |
| 7 | file is gone. | |
| 4 | 8 | |
| 5 | 9 | -- Thomas Goirand <zigo@debian.org> Sun, 22 Aug 2021 17:32:09 +0200 |
| 6 | 10 |
| 0 | Description: Fix incorrect parsing of vm_memory_high_watermark | |
| 1 | Upstream bug: | |
| 2 | https://github.com/rabbitmq/rabbitmq-server/issues/2964 | |
| 3 | Author: Michael Klishin <michael@clojurewerkz.org> | |
| 4 | Origin: upstream, https://github.com/rabbitmq/rabbitmq-server/pull/2965 | |
| 5 | Bug-Debian: https://bugs.debian.org/986734 | |
| 6 | Reviewed-By: Adam Cecile <acecile@letz-it.lu> | |
| 7 | Last-Update: 2021-04-10 | |
| 8 | ||
| 9 | --- rabbitmq-server-3.8.9.orig/deps/rabbit/src/rabbit_disk_monitor.erl | |
| 10 | +++ rabbitmq-server-3.8.9/deps/rabbit/src/rabbit_disk_monitor.erl | |
| 11 | @@ -66,7 +66,7 @@ | |
| 12 | ||
| 13 | %%---------------------------------------------------------------------------- | |
| 14 | ||
| 15 | --type disk_free_limit() :: (integer() | string() | {'mem_relative', float() | integer()}). | |
| 16 | +-type disk_free_limit() :: integer() | {'absolute', integer()} | string() | {'mem_relative', float() | integer()}. | |
| 17 | ||
| 18 | %%---------------------------------------------------------------------------- | |
| 19 | %% Public API | |
| 20 | @@ -272,6 +272,8 @@ parse_free_win32(CommandResult) -> | |
| 21 | interpret_limit({mem_relative, Relative}) | |
| 22 | when is_number(Relative) -> | |
| 23 | round(Relative * vm_memory_monitor:get_total_memory()); | |
| 24 | +interpret_limit({absolute, Absolute}) -> | |
| 25 | + interpret_limit(Absolute); | |
| 26 | interpret_limit(Absolute) -> | |
| 27 | case rabbit_resource_monitor_misc:parse_information_unit(Absolute) of | |
| 28 | {ok, ParsedAbsolute} -> ParsedAbsolute; | |
| 29 | --- rabbitmq-server-3.8.9.orig/deps/rabbitmq_cli/lib/rabbitmq/cli/core/memory.ex | |
| 30 | +++ rabbitmq-server-3.8.9/deps/rabbitmq_cli/lib/rabbitmq/cli/core/memory.ex | |
| 31 | @@ -56,6 +56,12 @@ defmodule RabbitMQ.CLI.Core.Memory do | |
| 32 | def formatted_watermark(val) when is_float(val) do | |
| 33 | %{relative: val} | |
| 34 | end | |
| 35 | + def formatted_watermark({:relative, val}) when is_float(val) do | |
| 36 | + %{relative: val} | |
| 37 | + end | |
| 38 | + def formatted_watermark(:infinity) do | |
| 39 | + %{relative: 1.0} | |
| 40 | + end | |
| 41 | def formatted_watermark({:absolute, val}) do | |
| 42 | %{absolute: parse_watermark(val)} | |
| 43 | end |
| 98 | 98 | |
| 99 | 99 | import pika |
| 100 | 100 | import time |
| 101 | Index: rabbitmq-server/deps/rabbitmq_trust_store/examples/rabbitmq_trust_store_django/manage.py | |
| 102 | =================================================================== | |
| 103 | --- rabbitmq-server.orig/deps/rabbitmq_trust_store/examples/rabbitmq_trust_store_django/manage.py | |
| 104 | +++ rabbitmq-server/deps/rabbitmq_trust_store/examples/rabbitmq_trust_store_django/manage.py | |
| 105 | @@ -1,4 +1,4 @@ | |
| 106 | -#!/usr/bin/env python | |
| 107 | +#!/usr/bin/env python3 | |
| 108 | import os | |
| 109 | import sys | |
| 110 |
| 3 | 3 | Bug-Debian: https://bugs.debian.org/964636 |
| 4 | 4 | Last-Update: 2020-07-22 |
| 5 | 5 | |
| 6 | Index: rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 6 | Index: rabbitmq-server/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 7 | 7 | =================================================================== |
| 8 | --- rabbit_salsa_my_new.orig/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 9 | +++ rabbit_salsa_my_new/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 10 | @@ -78,8 +78,8 @@ $$(dist_$(1)_ez): $$(if $$(wildcard $(3) | |
| 8 | --- rabbitmq-server.orig/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 9 | +++ rabbitmq-server/deps/rabbit_common/mk/rabbitmq-dist.mk | |
| 10 | @@ -80,8 +80,8 @@ $$(dist_$(1)_ez): $$(if $$(wildcard $(3) | |
| 11 | 11 | ifeq ($$(shell test -f $(3)/rabbitmq-components.mk \ |
| 12 | 12 | && grep -q '^list-dist-deps::' $(3)/Makefile && echo yes),yes) |
| 13 | 13 | $$(dist_$(1)_ez): $$(patsubst %,$(3)/%, \ |