Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package borgbackup for openSUSE:Factory checked in at 2025-07-20 15:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/borgbackup (Old) and /work/SRC/openSUSE:Factory/.borgbackup.new.8875 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgbackup" Sun Jul 20 15:29:00 2025 rev:51 rq:1294407 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/borgbackup/borgbackup.changes 2025-06-11 16:29:24.667694613 +0200 +++ /work/SRC/openSUSE:Factory/.borgbackup.new.8875/borgbackup.changes 2025-07-20 15:30:07.402679806 +0200 @@ -1,0 +2,7 @@ +Fri Jul 18 07:35:43 UTC 2025 - Benoît Monin <benoit.mo...@gmx.fr> + +- add msgpack-allow-1.1.1.patch: + backport of upstream commit f6724bfef +- change the maximum version of msgpack to 1.1.1 + +------------------------------------------------------------------- New: ---- msgpack-allow-1.1.1.patch ----------(New B)---------- New: - add msgpack-allow-1.1.1.patch: backport of upstream commit f6724bfef ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ borgbackup.spec ++++++ --- /var/tmp/diff_new_pack.493VAY/_old 2025-07-20 15:30:08.030705793 +0200 +++ /var/tmp/diff_new_pack.493VAY/_new 2025-07-20 15:30:08.030705793 +0200 @@ -57,6 +57,8 @@ # python3-guzzle_sphinx_theme isn't available everywhere, # fall back to Sphinx default theme for older distributions Patch0: borgbackup-1.1.4-sphinx-default-theme.patch +# PATCH-FIX-UPSTREAM msgpack-allow-1.1.1.patch -- backport of commit f6724bfef +Patch1: msgpack-allow-1.1.1.patch # SECTION build dependencies BuildRequires: bash BuildRequires: fdupes @@ -88,9 +90,9 @@ # msgpack is not included with borg version >= 1.2.0 anymore # The metadata is very specific about the version, the command will fail if msgpack is out of range -- boo#1198267 # See https://github.com/borgbackup/borg/blob/1.2.1/setup.py#L68 and update this for every version bump! -BuildRequires: (python3-msgpack >= 1.0.3 with python3-msgpack <= 1.1.0) +BuildRequires: (python3-msgpack >= 1.0.3 with python3-msgpack <= 1.1.1) Requires: python3-packaging -Requires: (python3-msgpack >= 1.0.3 with python3-msgpack <= 1.1.0) +Requires: (python3-msgpack >= 1.0.3 with python3-msgpack <= 1.1.1) %if 0%{?suse_version} > 1500 # upstream recommends a "Requires" if pyfuse3 is available Requires: python3-pyfuse3 >= 3.1.1 @@ -188,6 +190,7 @@ %if ! %{with borg_guzzle} %patch -P 0 -p1 %endif +%patch -P 1 -p1 %ifnarch %ix86 %arm # https://github.com/borgbackup/borg/issues/6996 ++++++ msgpack-allow-1.1.1.patch ++++++ >From f6724bfef2515ed5bf66c9a0434655c60a82aae2 Mon Sep 17 00:00:00 2001 Message-ID: <f6724bfef2515ed5bf66c9a0434655c60a82aae2.1752823239.git.benoit.mo...@bootlin.com> From: Thomas Waldmann <t...@waldmann-edv.de> Date: Fri, 6 Jun 2025 18:35:25 +0200 Subject: [PATCH] msgpack: allow 1.1.1 1.1.1rc1 looked good in testing, so hopefully 1.1.1 will also be ok. --- pyproject.toml | 2 +- src/borg/helpers/msgpack.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f1a3dffb..05102a0f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ # Please note: # using any other msgpack version is not supported by borg development and # any feedback related to issues caused by this will be ignored. - "msgpack >=1.0.3, <=1.1.0", + "msgpack >=1.0.3, <=1.1.1", "packaging", ] diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 5c8cedde..5c0d1a02 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -137,7 +137,7 @@ def is_slow_msgpack(): def is_supported_msgpack(): # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. import msgpack - return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \ + return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \ msgpack.version not in [] # < add bad releases here to deny list
