3 files changed, 41 insertions, 25 deletions
diff --git a/archivers/py-borgbackup/files/patch-msgpack b/archivers/py-borgbackup/files/patch-msgpack
deleted file mode 100644
index 509fce82fdb8..000000000000
--- a/archivers/py-borgbackup/files/patch-msgpack
+++ /dev/null
@@ -1,25 +0,0 @@
-Obtained from:	https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f9319d915751d0024f
-		https://github.com/borgbackup/borg/commit/e7d8fba1df8409f5aa71faa16f97935aea802171
-
---- pyproject.toml.orig	2025-04-18 19:16:24 UTC
-+++ 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.2",
-     "packaging",
- ]
- 
---- src/borg/helpers/msgpack.py.orig	2025-04-18 19:16:24 UTC
-+++ src/borg/helpers/msgpack.py
-@@ -137,7 +137,7 @@ def is_supported_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, 2) and \
-            msgpack.version not in []  # < add bad releases here to deny list
- 
- 
diff --git a/archivers/py-borgbackup/files/patch-pyproject.toml b/archivers/py-borgbackup/files/patch-pyproject.toml
new file mode 100644
index 000000000000..4fa47884b424
--- /dev/null
+++ b/archivers/py-borgbackup/files/patch-pyproject.toml
@@ -0,0 +1,31 @@
+This file shall be removed once we install a new enough setuptools as our default version.
+
+--- pyproject.toml.orig	2025-10-31 18:16:12 UTC
++++ pyproject.toml
+@@ -12,6 +12,7 @@ classifiers = [
+     "Development Status :: 4 - Beta",
+     "Environment :: Console",
+     "Intended Audience :: System Administrators",
++    "License :: OSI Approved :: BSD License",
+     "Operating System :: POSIX :: BSD :: FreeBSD",
+     "Operating System :: POSIX :: BSD :: OpenBSD",
+     "Operating System :: POSIX :: BSD :: NetBSD",
+@@ -28,8 +29,7 @@ classifiers = [
+     "Topic :: Security :: Cryptography",
+     "Topic :: System :: Archiving :: Backup",
+ ]
+-license = "BSD-3-Clause"
+-license-files = ["LICENSE", "AUTHORS"]
++license = {text="BSD"}
+ dependencies = [
+     # We are rather picky about msgpack versions, because a good working msgpack is
+     # very important for Borg, see: https://github.com/borgbackup/borg/issues/3753
+@@ -73,7 +73,7 @@ where = ["src"]
+ "*" = ["*.c", "*.h", "*.pyx"]
+ 
+ [build-system]
+-requires = ["setuptools>=78.1.1", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"]
++requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"]
+ build-backend = "setuptools.build_meta"
+ 
+ [tool.setuptools_scm]
diff --git a/archivers/py-borgbackup/files/patch-requirements.d_development.txt b/archivers/py-borgbackup/files/patch-requirements.d_development.txt
new file mode 100644
index 000000000000..c348f6c9e86c
--- /dev/null
+++ b/archivers/py-borgbackup/files/patch-requirements.d_development.txt
@@ -0,0 +1,10 @@
+This file shall be removed once we install a new enough setuptools as our default version.
+
+--- requirements.d/development.txt.orig	2025-10-31 18:16:12 UTC
++++ requirements.d/development.txt
+@@ -1,4 +1,4 @@
+-setuptools>=78.1.1
++setuptools>=64
+ setuptools_scm>=8
+ pip
+ virtualenv