aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoromni <omni+alpine@hack.org>2023-12-02 13:53:03 +0000
committerJakub Jirutka <jakub@jirutka.cz>2023-12-02 14:20:10 +0000
commit4f37654c7ecd007113675e0fcba67692766549b5 (patch)
tree747c52a89e3043b00a709bff697dfe57082e9110
parent2fa7c56d349d8159fc272360544bddddacae5427 (diff)
community/borgbackup: upgrade to 1.2.7
-rw-r--r--community/borgbackup/APKBUILD8
-rw-r--r--community/borgbackup/py3-msgpack-1.0.7.patch44
2 files changed, 3 insertions, 49 deletions
diff --git a/community/borgbackup/APKBUILD b/community/borgbackup/APKBUILD
index d936dd23034..207989df0ad 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.6
-pkgrel=1
+pkgver=1.2.7
+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.7.patch
"
# secfixes:
@@ -138,7 +137,6 @@ _delete_testsuite() {
}
sha512sums="
-264bf023f4a53f79d8359e1ed0678c7572ad24776e0ddbc5d3446f548629ecea1e0798c33df4464573b1258f47220c86ca964673501dd9b3018484f1f86280f7 borgbackup-1.2.6.tar.gz
+313f495d09bff9d2106a2354d02e8b5478dbce279ccfe863d22bbca40fe1bef94fc575e4ae45585a776689fa0058982c4c009c423ac948cc229e15bb5eb5f2bc borgbackup-1.2.7.tar.gz
d5aea79b8ff663ca87b845680a31ba75235f734f95a5cfa444e49813916e530754b98269bfbccfda800fbf102652ee4ed47bdb71f6cda831e76f0fae3b5433d8 test-fusermount3.patch
-58b7d898f1ab00991f289ac2c75857db49853db8bd6a92dba32f27c520b097745477d089521d5608ef214fe44e617fff26b5f8a1e373809c928f47ecf1ddbdf0 py3-msgpack-1.0.7.patch
"
diff --git a/community/borgbackup/py3-msgpack-1.0.7.patch b/community/borgbackup/py3-msgpack-1.0.7.patch
deleted file mode 100644
index 3f544272b45..00000000000
--- a/community/borgbackup/py3-msgpack-1.0.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Adapted from https://github.com/borgbackup/borg/commit/39761ebadc9325a7cc7e931144e2709effe8f0f0
-
-References:
-https://github.com/borgbackup/borg/issues/7810
-https://github.com/borgbackup/borg/pull/7840
-https://github.com/borgbackup/borg/pull/7850
-
---
-From 39761ebadc9325a7cc7e931144e2709effe8f0f0 Mon Sep 17 00:00:00 2001
-From: Thomas Waldmann <tw@waldmann-edv.de>
-Date: Thu, 28 Sep 2023 14:26:48 +0200
-Subject: [PATCH] allow msgpack 1.0.7
-
----
- 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 f207b6133d..9a03438164 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.5, !=1.0.1',
-+ 'msgpack >=0.5.6, <=1.0.7, !=1.0.1',
- 'packaging',
- ]
-
-diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
-index b9496696a9..197d2debd8 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, 5) and \
-+ return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \
- msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
-
-