diff options
| author | Adam Ruzicka <a.ruzicka@outlook.com> | 2019-02-03 19:46:32 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-02-25 19:32:38 +0000 |
| commit | f06cccf2db67467a0685a77d5b05d1f25fcf2c55 (patch) | |
| tree | 6c5941b756cc2374cc7373938523c16fd0de4b31 | |
| parent | 08ab682249a645c4dc445a8400f60b73fc259d36 (diff) | |
| download | aports-f06cccf2db67467a0685a77d5b05d1f25fcf2c55.tar.bz2 aports-f06cccf2db67467a0685a77d5b05d1f25fcf2c55.tar.xz | |
community/borgbackup: backport patch to make borg work again
fixes #9927
(cherry picked from commit 3a0a741747a76ff24c7751c2aae27482bb9a0d35)
| -rw-r--r-- | community/borgbackup/APKBUILD | 8 | ||||
| -rw-r--r-- | community/borgbackup/msgpack-fix.patch | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/community/borgbackup/APKBUILD b/community/borgbackup/APKBUILD index 6cea0545ae..d92243ce98 100644 --- a/community/borgbackup/APKBUILD +++ b/community/borgbackup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=borgbackup pkgver=1.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="Deduplicating backup program" url="https://borgbackup.readthedocs.io/" arch="all" @@ -10,7 +10,8 @@ license="BSD-3-Clause" depends="python3 py3-msgpack py3-zmq" makedepends="python3-dev lz4-dev acl-dev attr-dev openssl-dev linux-headers py3-setuptools" -source="https://github.com/$pkgname/borg/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/$pkgname/borg/releases/download/$pkgver/$pkgname-$pkgver.tar.gz + msgpack-fix.patch" build() { cd "$builddir" @@ -26,4 +27,5 @@ package() { find . -name '*.h' -delete -o -name '*.c' -delete -o -name '*.pyx' -delete } -sha512sums="586420b9cad7e731f2f1b8b05f3cd3dc606691c5a5ec307e887035d941ac5ac6d4c988783660969960a1221e4d9f2b865ee5558d4007ea7524632d0a50a8a402 borgbackup-1.1.7.tar.gz" +sha512sums="586420b9cad7e731f2f1b8b05f3cd3dc606691c5a5ec307e887035d941ac5ac6d4c988783660969960a1221e4d9f2b865ee5558d4007ea7524632d0a50a8a402 borgbackup-1.1.7.tar.gz +0b30850df11124c7d699867a88852dc2c49c7e3b4025f1d75a3b4404ca5801d73ab21260f86a7725bb3b19650c8c0ddea05569f5696cb68b3e45c8faf54a97b6 msgpack-fix.patch" diff --git a/community/borgbackup/msgpack-fix.patch b/community/borgbackup/msgpack-fix.patch new file mode 100644 index 0000000000..102492abcc --- /dev/null +++ b/community/borgbackup/msgpack-fix.patch @@ -0,0 +1,13 @@ +--- borgbackup-1.1.7/setup.py.original ++++ borgbackup-1.1.7/setup.py +@@ -39,7 +39,9 @@ + # 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 + # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6: +- 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5', ++ 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5;python_version <"3.4"', ++ 'msgpack-python >=0.4.6, <0.5;python_version=="3.4"', ++ 'msgpack >=0.5.6;python_version >="3.5"', + # if you can't satisfy the above requirement, these are versions that might + # also work ok, IF you make sure to use the COMPILED version of msgpack-python, + # NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4 |