diff options
| -rw-r--r-- | system/borgbackup/01-msgpack-python-renamed.patch | 19 | ||||
| -rw-r--r-- | system/borgbackup/borgbackup.SlackBuild | 6 | ||||
| -rw-r--r-- | system/borgbackup/borgbackup.info | 6 |
3 files changed, 27 insertions, 4 deletions
diff --git a/system/borgbackup/01-msgpack-python-renamed.patch b/system/borgbackup/01-msgpack-python-renamed.patch new file mode 100644 index 0000000000..00cf94c9ef --- /dev/null +++ b/system/borgbackup/01-msgpack-python-renamed.patch @@ -0,0 +1,19 @@ +--- 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/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild index 47d71bf748..96bc56314b 100644 --- a/system/borgbackup/borgbackup.SlackBuild +++ b/system/borgbackup/borgbackup.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=borgbackup -VERSION=${VERSION:-1.1.7} +VERSION=${VERSION:-1.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,10 @@ 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 b84f2e7f95..ef49545e9d 100644 --- a/system/borgbackup/borgbackup.info +++ b/system/borgbackup/borgbackup.info @@ -1,8 +1,8 @@ PRGNAM="borgbackup" -VERSION="1.1.7" +VERSION="1.1.8" HOMEPAGE="https://borgbackup.readthedocs.io/" -DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.7/borgbackup-1.1.7.tar.gz" -MD5SUM="b45ac57fbf5566811e5a37e61d3a9d7c" +DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.8/borgbackup-1.1.8.tar.gz" +MD5SUM="bad2c745d6f683e552cee3b48ee8f1ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd" |