Update py-borgbackup to 1.1.10.

Note that we do not use the bundled msgpack (see below) in pkgsrc.

Version 1.1.10 (2019-05-16)

Fixes:

  * extract: hang on partial extraction with ssh: repo, when hardlink master is
    not matched/extracted and borg hangs on related slave hardlink, #4350
  * lrucache: regularly remove old FDs, #4427
  * avoid stale filehandle issues, #3265
  * freebsd: make xattr platform code api compatible with linux, #3952
  * use whitelist approach for borg serve, #4097
  * borg command shall terminate with rc 2 for ImportErrors, #4424
  * create: only run stat_simple_attrs() once, this increases backup with lots
    of unchanged files performance by ~ 5%.
  * prune: fix incorrect borg prune --stats output with --dry-run, #4373
  * key export: emit user-friendly error if repo key is exported to a
    directory, #4348

New features:

  * bundle latest supported msgpack-python release (0.5.6), remove
    msgpack-python from setup.py install_requires - by default we use the
    bundled code now. optionally, we still support using an external msgpack
    (see hints in setup.py), but this requires solid requirements management
    within distributions and is not recommended. borgbackup will break if you
    upgrade msgpack to an unsupported version.
  * display msgpack version as part of sysinfo (e.g. in tracebacks)
  * timestamp for borg delete --info added, #4359
  * enable placeholder usage in --comment and --glob-archives, #4559, #4495

Other:

  * serve: do not check python/libc for borg serve, #4483
  * shell completions: borg diff second archive
  * release scripts: signing binaries with Qubes OS support
  * testing:
      + vagrant: upgrade openbsd box to 6.4
      + travis-ci: lock test env to py 3.4 compatible versions, #4343
      + get rid of confusing coverage warning, #2069
      + rename test_mount_hardlinks to test_fuse_mount_hardlinks, so both can
        be excluded by "not test_fuse".
      + pure-py msgpack warning shall not make a lot of tests fail, #4558
  * docs:
      + add "SSH Configuration" section to "borg serve", #3988, #636, #4485
      + README: new URL for funding options
      + add a sample logging.conf in docs/misc, #4380
      + elaborate on append-only mode docs, #3504
      + installation: added Alpine Linux to distribution list, #4415
      + usage.html: only modify window.location when redirecting, #4133
      + add msgpack license to docs/3rd_party/msgpack
  * vagrant / binary builds:
      + use python 3.5.7 for builds
      + use osxfuse 3.8.3

5 files changed, 44 insertions, 24 deletions

diff --git a/sysutils/py-borgbackup/Makefile b/sysutils/py-borgbackup/Makefile
index 3d42cc80ef3..a5ac4efadc3 100644
--- a/sysutils/py-borgbackup/Makefile
+++ b/sysutils/py-borgbackup/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2019/02/11 18:40:37 bsiegert Exp $
+# $NetBSD: Makefile,v 1.23 2020/01/01 18:21:49 bsiegert Exp $
 
-DISTNAME=	borgbackup-1.1.9
+DISTNAME=	borgbackup-1.1.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/borgbackup/}
@@ -9,6 +9,7 @@ MAINTAINER=	bsiegert@NetBSD.org
 HOMEPAGE=	https://github.com/borgbackup/borg
 COMMENT=	Deduplicating backup program with compression and encryption
 LICENSE=	modified-bsd
+USE_LANGUAGES=	c c++
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 DEPENDS+=	${PYPKGPREFIX}-msgpack>=0.4.6:../../devel/py-msgpack
@@ -17,12 +18,17 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 MAKE_ENV+=	BORG_OPENSSL_PREFIX=${SSLBASE:Q}
 MAKE_ENV+=	BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4}
+MAKE_ENV+=	BORG_LIBZSTD_PREFIX=${BUILDLINK_PREFIX.lz4}
+MAKE_ENV+=	BORG_LIBB2_PREFIX=${BUILDLINK_PREFIX.libb2}
+
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} borg borg-${PYVERSSUFFIX} || ${TRUE}
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} borgfs borgfs-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../archivers/lz4/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../security/libb2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/sysutils/py-borgbackup/PLIST b/sysutils/py-borgbackup/PLIST
index 710474696c8..3641e241cb0 100644
--- a/sysutils/py-borgbackup/PLIST
+++ b/sysutils/py-borgbackup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/12/02 08:53:10 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/01/01 18:21:49 bsiegert Exp $
 bin/borg-${PYVERSSUFFIX}
 bin/borgfs-${PYVERSSUFFIX}
 ${PYSITELIB}/borg/__init__.py
@@ -50,6 +50,20 @@ ${PYSITELIB}/borg/algorithms/__init__.py
 ${PYSITELIB}/borg/algorithms/__init__.pyo
 ${PYSITELIB}/borg/algorithms/__init__.pyc
 ${PYSITELIB}/borg/algorithms/checksums.so
+${PYSITELIB}/borg/algorithms/msgpack/__init__.py
+${PYSITELIB}/borg/algorithms/msgpack/__init__.pyo
+${PYSITELIB}/borg/algorithms/msgpack/__init__.pyc
+${PYSITELIB}/borg/algorithms/msgpack/_version.pyo
+${PYSITELIB}/borg/algorithms/msgpack/_version.pyc
+${PYSITELIB}/borg/algorithms/msgpack/exceptions.pyo
+${PYSITELIB}/borg/algorithms/msgpack/exceptions.pyc
+${PYSITELIB}/borg/algorithms/msgpack/fallback.pyo
+${PYSITELIB}/borg/algorithms/msgpack/fallback.pyc
+${PYSITELIB}/borg/algorithms/msgpack/_packer.so
+${PYSITELIB}/borg/algorithms/msgpack/_unpacker.so
+${PYSITELIB}/borg/algorithms/msgpack/_version.py
+${PYSITELIB}/borg/algorithms/msgpack/exceptions.py
+${PYSITELIB}/borg/algorithms/msgpack/fallback.py
 ${PYSITELIB}/borg/archive.py
 ${PYSITELIB}/borg/archiver.py
 ${PYSITELIB}/borg/cache.py
diff --git a/sysutils/py-borgbackup/distinfo b/sysutils/py-borgbackup/distinfo
index 6cc20a5fb18..5d9dd3154f8 100644
--- a/sysutils/py-borgbackup/distinfo
+++ b/sysutils/py-borgbackup/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2019/02/11 18:40:37 bsiegert Exp $
+$NetBSD: distinfo,v 1.17 2020/01/01 18:21:49 bsiegert Exp $
 
-SHA1 (borgbackup-1.1.9.tar.gz) = 6028a5b867b0a7d87e1ca67b1e4f60a15e048bfd
-RMD160 (borgbackup-1.1.9.tar.gz) = b40a6bf068d557bd7359ca77da53417fe403092e
-SHA512 (borgbackup-1.1.9.tar.gz) = 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
-Size (borgbackup-1.1.9.tar.gz) = 3468259 bytes
-SHA1 (patch-setup.py) = 00e64219203374efccc2b0260b5d2fde482d61dc
+SHA1 (borgbackup-1.1.10.tar.gz) = 0e9a7ae059117ebb69009d55b5250f29bddf5e46
+RMD160 (borgbackup-1.1.10.tar.gz) = 4d02f9363b585a703c90854f22f8260cc596c84a
+SHA512 (borgbackup-1.1.10.tar.gz) = 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
+Size (borgbackup-1.1.10.tar.gz) = 3610011 bytes
+SHA1 (patch-src_borg_helpers.py) = 3c918f2f280406d16da0d8aba993b0e264508be2
diff --git a/sysutils/py-borgbackup/patches/patch-setup.py b/sysutils/py-borgbackup/patches/patch-setup.py
deleted file mode 100644
index 8e9e7e51756..00000000000
--- a/sysutils/py-borgbackup/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.4 2018/06/12 14:22:25 bsiegert Exp $
-
-Use latest msgpack version
-
---- setup.py.orig	2018-06-11 10:55:36.000000000 +0000
-+++ setup.py
-@@ -39,7 +39,7 @@ install_requires = [
-     # 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
diff --git a/sysutils/py-borgbackup/patches/patch-src_borg_helpers.py b/sysutils/py-borgbackup/patches/patch-src_borg_helpers.py
new file mode 100644
index 00000000000..643ba11ab28
--- /dev/null
+++ b/sysutils/py-borgbackup/patches/patch-src_borg_helpers.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_borg_helpers.py,v 1.1 2020/01/01 18:21:49 bsiegert Exp $
+
+Do not use the bundled msgpack.
+
+--- src/borg/helpers.py.orig	2019-05-16 02:58:15.000000000 +0000
++++ src/borg/helpers.py
+@@ -55,7 +55,7 @@ from shutil import get_terminal_size
+ #   any feedback related to issues caused by this will be ignored.
+ # - especially, it is known that msgpack 0.6.x does NOT work for borg 1.1.x.
+ 
+-prefer_system_msgpack = False
++prefer_system_msgpack = True
+ 
+ try:
+     if prefer_system_msgpack: