Merge pull request #8909 from ThomasWaldmann/backports-1.4

Backports to 1.4-maint

docs/usage/serve.rst

@@ -29,13 +29,14 @@ locations like ``/etc/environment`` or in the forced command itself (example bel
 
     # Set a BORG_XXX environment variable on the "borg serve" side
     $ cat ~/.ssh/authorized_keys
-    command="export BORG_XXX=value; borg serve [...]",restrict ssh-rsa [...]
+    command="BORG_XXX=value borg serve [...]",restrict ssh-rsa [...]
 
 .. note::
-    The examples above use the ``restrict`` directive. This does automatically
-    block potential dangerous ssh features, even when they are added in a future
-    update. Thus, this option should be preferred.
-    
+    The examples above use the ``restrict`` directive and assume a POSIX
+    compliant shell set as the user's login shell.
+    This does automatically block potential dangerous ssh features, even when
+    they are added in a future update. Thus, this option should be preferred.
+
     If you're using openssh-server < 7.2, however, you have to explicitly specify
     the ssh features to restrict and cannot simply use the restrict option as it
     has been introduced in v7.2. We recommend to use

pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     # Please note:
     # using any other msgpack version is not supported by borg development and
     # any feedback related to issues caused by this will be ignored.
-    "msgpack >=1.0.3, <=1.1.0",
+    "msgpack >=1.0.3, <=1.1.1",
     "packaging",
 ]
 

src/borg/helpers/msgpack.py

@@ -137,7 +137,7 @@ def is_slow_msgpack():
 def is_supported_msgpack():
     # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml.
     import msgpack
-    return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \
+    return (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 1) and \
            msgpack.version not in []  # < add bad releases here to deny list