aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2024-03-30 11:30:44 +0100
committerJakub Jirutka <jakub@jirutka.cz>2024-03-30 12:07:12 +0100
commit99337da9b996643adeecd4178b83323246c73a29 (patch)
tree0e95b171e553853756f1f2543e87bae408c88998
parentce2cae0b527853a7e40e2433fb3d45a2cbbb85e9 (diff)
community/borgbackup: upgrade to 1.2.8
-rw-r--r--community/borgbackup/APKBUILD8
-rw-r--r--community/borgbackup/py3-msgpack-1.0.8.patch38
2 files changed, 3 insertions, 43 deletions
diff --git a/community/borgbackup/APKBUILD b/community/borgbackup/APKBUILD
index b41728e42a1..b9eb3a812cc 100644
--- a/community/borgbackup/APKBUILD
+++ b/community/borgbackup/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=borgbackup
_pkgname=borg
-pkgver=1.2.7
-pkgrel=1
+pkgver=1.2.8
+pkgrel=0
pkgdesc="Deduplicating backup program"
url="https://www.borgbackup.org/"
arch="all"
@@ -42,7 +42,6 @@ subpackages="
"
source="https://github.com/borgbackup/borg/releases/download/$pkgver/borgbackup-$pkgver.tar.gz
test-fusermount3.patch
- py3-msgpack-1.0.8.patch
"
# secfixes:
@@ -138,7 +137,6 @@ _delete_testsuite() {
}
sha512sums="
-313f495d09bff9d2106a2354d02e8b5478dbce279ccfe863d22bbca40fe1bef94fc575e4ae45585a776689fa0058982c4c009c423ac948cc229e15bb5eb5f2bc borgbackup-1.2.7.tar.gz
+9a62e5eec894ebffe928a08c9a0cceebde084f16524d363a3c3be01d908a7eceaea8fa11eac422acc0fdb2534d79d1ee5ec5d9167e1086f334af6a28887616d5 borgbackup-1.2.8.tar.gz
d5aea79b8ff663ca87b845680a31ba75235f734f95a5cfa444e49813916e530754b98269bfbccfda800fbf102652ee4ed47bdb71f6cda831e76f0fae3b5433d8 test-fusermount3.patch
-70b5eb0de8ad06a3b6d98d73eddc2b370642be3b1925bb774b2ec19a78155d15c861ad68ea8353e669dc01b266869ae5598e276b3809fadaf3524867ef6a9d70 py3-msgpack-1.0.8.patch
"
diff --git a/community/borgbackup/py3-msgpack-1.0.8.patch b/community/borgbackup/py3-msgpack-1.0.8.patch
deleted file mode 100644
index 94ceba8ecc8..00000000000
--- a/community/borgbackup/py3-msgpack-1.0.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Patch-Source: https://github.com/borgbackup/borg/commit/faa0705ddab99e527b8591375df9c999a2e59a69.patch
---
-From faa0705ddab99e527b8591375df9c999a2e59a69 Mon Sep 17 00:00:00 2001
-From: Thomas Waldmann <tw@waldmann-edv.de>
-Date: Sat, 2 Mar 2024 13:34:35 +0100
-Subject: [PATCH] allow msgpack 1.0.8, fixes #8133
-
----
- setup.py | 2 +-
- src/borg/helpers/msgpack.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9a03438164..dee8b0caa6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -70,7 +70,7 @@
- # 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 >=0.5.6, <=1.0.7, !=1.0.1',
-+ 'msgpack >=0.5.6, <=1.0.8, !=1.0.1',
- 'packaging',
- ]
-
-diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
-index 197d2debd8..790a27eb78 100644
---- a/src/borg/helpers/msgpack.py
-+++ b/src/borg/helpers/msgpack.py
-@@ -182,7 +182,7 @@ def is_slow_msgpack():
- def is_supported_msgpack():
- # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
- import msgpack
-- return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \
-+ return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \
- msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
-
-