From 88fc10f1c9cd43bd4b3e6ef3d123435756b11253 Mon Sep 17 00:00:00 2001 From: Andrzej Telszewski Date: Tue, 16 Jul 2019 10:17:33 -0500 Subject: system/borgbackup: Updated for version 1.1.10. Signed-off-by: Robby Workman --- system/borgbackup/01-msgpack-python-renamed.patch | 19 ------------------- system/borgbackup/README | 15 +++++++++------ system/borgbackup/borgbackup.SlackBuild | 8 ++------ system/borgbackup/borgbackup.info | 6 +++--- 4 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 system/borgbackup/01-msgpack-python-renamed.patch diff --git a/system/borgbackup/01-msgpack-python-renamed.patch b/system/borgbackup/01-msgpack-python-renamed.patch deleted file mode 100644 index 00cf94c9ef..0000000000 --- a/system/borgbackup/01-msgpack-python-renamed.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- setup.py 2018-12-09 03:18:19.000000000 +0100 -+++ setup.py.new 2018-12-09 09:43:12.950202360 +0100 -@@ -39,7 +39,7 @@ - # 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 >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.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 ---- src/borgbackup.egg-info/requires.txt 2018-12-09 03:37:50.000000000 +0100 -+++ src/borgbackup.egg-info/requires.txt.new 2018-12-09 09:47:08.958294779 +0100 -@@ -1,4 +1,4 @@ --msgpack-python!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,!=0.5.4,!=0.5.5,<=0.5.6,>=0.4.6 -+msgpack!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,!=0.5.4,!=0.5.5,<=0.5.6,>=0.4.6 - - [fuse] - llfuse<2.0 diff --git a/system/borgbackup/README b/system/borgbackup/README index 26302d1265..4fd8d39ac5 100644 --- a/system/borgbackup/README +++ b/system/borgbackup/README @@ -9,10 +9,13 @@ targets. Borg is a fork of Attic and is maintained by "The Borg collective". +FIXME: + Due to outdated version of llfuse here at SBo, building borgbackup + with mount support using llfuse will fail. + Optional dependencies: -- llfuse (https://slackbuilds.org/apps/llfuse/) is required, - if you wish to mount an archive as a FUSE filesystem, -- Sphinx (https://slackbuilds.org/apps/Sphinx/) and guzzle_sphinx_theme - (https://slackbuilds.org/apps/guzzle_sphinx_theme/) are required if - you wish to build the docs (html, man). Please note that the build - will fail if Sphinx is installed, but guzzle_sphinx_theme is not. +- llfuse is required if you wish to mount an archive using FUSE, +- Sphinx, alabaster, guzzle_sphinx_theme, imagesize, python3-certifi + and python-urllib3 are required if you wish to build the docs (html, + man). Please note that the build will fail if Sphinx is installed, + but the other required packages are not. diff --git a/system/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild index 96bc56314b..93a2e84d8d 100644 --- a/system/borgbackup/borgbackup.SlackBuild +++ b/system/borgbackup/borgbackup.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for borgbackup -# Copyright 2018 Andrzej Telszewski, Szczecin +# Copyright 2019 Andrzej Telszewski, Szczecin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=borgbackup -VERSION=${VERSION:-1.1.8} +VERSION=${VERSION:-1.1.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,10 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix msgpack-python => msgpack package rename. -# Thanks to Audrius Kažukauskas. -patch -p0 < $CWD/01-msgpack-python-renamed.patch - python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info index ef49545e9d..5a963a72fb 100644 --- a/system/borgbackup/borgbackup.info +++ b/system/borgbackup/borgbackup.info @@ -1,8 +1,8 @@ PRGNAM="borgbackup" -VERSION="1.1.8" +VERSION="1.1.10" HOMEPAGE="https://borgbackup.readthedocs.io/" -DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.8/borgbackup-1.1.8.tar.gz" -MD5SUM="bad2c745d6f683e552cee3b48ee8f1ce" +DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.10/borgbackup-1.1.10.tar.gz" +MD5SUM="0a27e660ace162e41ea1d80e4b700808" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd" -- cgit v1.2.3