Merge tag 'debian/0.5.5-1' into debian/buster-backports

interimap Debian release 0.5.5-1

1 files changed, 9 insertions, 8 deletions

diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch
index 837cbfc..14b4ba0 100644
--- a/debian/patches/Skip-randomized-tests.patch
+++ b/debian/patches/Skip-randomized-tests.patch
@@ -1,8 +1,6 @@
-commit 5bc242612a514d5091b1a05e5a087d54454e390a
-Author: Guilhem Moulin <guilhem@debian.org>
-Date:   Wed Jan 29 13:49:10 2020 +0100
-
-Avoid running randomized tests on the build daemons
+From: Guilhem Moulin <guilhem@debian.org>
+Date: Wed, 29 Jan 2020 13:49:10 +0100
+Subject: Avoid running randomized tests on the build daemons
 
 These tests are racy and can fail in subtle ways depending on the
 machine load and speed.  Basically `interimap --watch=1` is spawnedin
@@ -18,10 +16,13 @@ reached, then stop.
 These tests most sense in the context of upstream development, so for
 now we skip them in the Debian context.
 
+Forwarded: not-needed
 ---
- tests/list |   20 ++++++++++----------
+ tests/list | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
+diff --git a/tests/list b/tests/list
+index d1058ba..d6b3ec0 100644
 --- a/tests/list
 +++ b/tests/list
 @@ -41,8 +41,8 @@ repair  --repair
@@ -35,9 +36,9 @@ now we skip them in the Debian context.
  
  . SSL/TLS
      starttls-logindisabled  LOGINDISABLED STARTTLS
-@@ -55,11 +55,11 @@ split-set   Split large sets to avoid ex
-     tls-sni                 TLS servername extension (SNI)
+@@ -56,11 +56,11 @@ split-set   Split large sets to avoid extra-long command lines
      tls-protocols           force TLS protocol versions
+     tls-ciphers             force TLS cipher list/suites
  
 -. Live synchronization (60s)
 -    sync-live            local/remote simulation