Update py-borgbackup to 1.1.6.

Version 1.1.6 (2018-06-11)
--------------------------

Compatibility notes:

- When upgrading from borg 1.0.x to 1.1.x, please note:

  - read all the compatibility notes for 1.1.0*, starting from 1.1.0b1.
  - borg upgrade: you do not need to and you also should not run it.
  - borg might ask some security-related questions once after upgrading.
    You can answer them either manually or via environment variable.
    One known case is if you use unencrypted repositories, then it will ask
    about a unknown unencrypted repository one time.
  - your first backup with 1.1.x might be significantly slower (it might
    completely read, chunk, hash a lot files) - this is due to the
    --files-cache mode change (and happens every time you change mode).
    You can avoid the one-time slowdown by using the pre-1.1.0rc4-compatible
    mode (but that is less safe for detecting changed files than the default).
    See the --files-cache docs for details.
- 1.1.6 changes:

  - also allow msgpack-python 0.5.6.

Fixes:

- fix borg exception handling on ENOSPC error with xattrs, #3808
- prune: fix/improve overall progress display
- borg config repo ... does not need cache/manifest/key, #3802
- debug dump-repo-objs should not depend on a manifest obj
- pypi package:

  - include .coveragerc, needed by tox.ini
  - fix package long description, #3854

New features:

- mount: add uid, gid, umask mount options
- delete:

  - only commit once, #3823
  - implement --dry-run, #3822
- check:

  - show progress while rebuilding missing manifest, #3787
  - more --repair output
- borg config --list <repo>, #3612

Other changes:

- update msgpack requirement, #3753
- update bundled zstd to 1.3.4, #3745
- update bundled lz4 code to 1.8.2, #3870
- docs:

  - describe what BORG_LIBZSTD_PREFIX does
  - fix and deduplicate encryption quickstart docs, #3776
- vagrant:

  - FUSE for macOS: upgrade 3.7.1 to 3.8.0
  - exclude macOS High Sierra upgrade on the darwin64 machine
  - remove borgbackup.egg-info dir in fs_init (after rsync)
  - use pyenv-based build/test on jessie32/62
  - use local 32 and 64bit debian jessie boxes
  - use "vagrant" as username for new xenial box
- travis OS X: use xcode 8.3 (not broken)

3 files changed, 18 insertions, 19 deletions

diff --git a/sysutils/py-borgbackup/Makefile b/sysutils/py-borgbackup/Makefile
index 02bcb4c4b22..79f5ecd9a02 100644
--- a/sysutils/py-borgbackup/Makefile
+++ b/sysutils/py-borgbackup/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2018/04/21 12:36:17 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/06/12 14:22:25 bsiegert Exp $
 
-DISTNAME=	borgbackup-1.1.5
+DISTNAME=	borgbackup-1.1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/borgbackup/}
 
diff --git a/sysutils/py-borgbackup/distinfo b/sysutils/py-borgbackup/distinfo
index acb382530f0..f0935b61a1b 100644
--- a/sysutils/py-borgbackup/distinfo
+++ b/sysutils/py-borgbackup/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2018/04/21 12:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2018/06/12 14:22:25 bsiegert Exp $
 
-SHA1 (borgbackup-1.1.5.tar.gz) = 0dec8c69617eb5a3ea9a4d340df5116dd1d434ea
-RMD160 (borgbackup-1.1.5.tar.gz) = 80b7a068c851da9fcb39d48fa97aef79e5cf262a
-SHA512 (borgbackup-1.1.5.tar.gz) = 22071e4b37059d816592baff852772720769b3d86eb1d071abba67f9d13de809066aa29cdf18f1aaef127d1f24288913a7b0b63d157fb98840b1a71606dc0554
-Size (borgbackup-1.1.5.tar.gz) = 3392774 bytes
-SHA1 (patch-setup.py) = d2d4db2270b1c357f3b14b23aebc5661d786e0a6
+SHA1 (borgbackup-1.1.6.tar.gz) = cfc0ff8d9a55c68e8de0b2536bbfb21fbf7cd4d3
+RMD160 (borgbackup-1.1.6.tar.gz) = f13b9a2428980b60c329431bb6c6a1170b1a0db2
+SHA512 (borgbackup-1.1.6.tar.gz) = 5741c48bdb70a26d40bd583f207460e35bb7dd560424889d37eb4d90ee96947457faf09bae0fa2b26b42ec71ef6eeaec1b770ba3257223a2637fcb55266e4a17
+Size (borgbackup-1.1.6.tar.gz) = 3441523 bytes
+SHA1 (patch-setup.py) = 00e64219203374efccc2b0260b5d2fde482d61dc
diff --git a/sysutils/py-borgbackup/patches/patch-setup.py b/sysutils/py-borgbackup/patches/patch-setup.py
index e5df7b5bbcc..8e9e7e51756 100644
--- a/sysutils/py-borgbackup/patches/patch-setup.py
+++ b/sysutils/py-borgbackup/patches/patch-setup.py
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.3 2018/04/21 12:37:46 wiz Exp $
+$NetBSD: patch-setup.py,v 1.4 2018/06/12 14:22:25 bsiegert Exp $
 
 Use latest msgpack version
 
---- setup.py.orig	2018-03-30 07:08:16.000000000 +0000
+--- setup.py.orig	2018-06-11 10:55:36.000000000 +0000
 +++ setup.py
 @@ -39,7 +39,7 @@ install_requires = [
-     # msgpack pure python data corruption was fixed in 0.4.6.
-     # msgpack 0.5.0 was a bit of a troublemaker.
-     # also, msgpack dropped py34 support at 0.5.0.
--    'msgpack-python>=0.4.6,<0.5.0',
-+    'msgpack',
- ]
- 
- # note for package maintainers: if you package borgbackup for distribution,
+     # 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