From 646f971d8bac7671646e4167b71b45b4b609e048 Mon Sep 17 00:00:00 2001
From: kiekerjan <kiekerjan@users.noreply.github.com>
Date: Sun, 31 Oct 2021 17:49:26 +0100
Subject: [PATCH 1/2] Update mailinabox.yml (#2054)

The examples for login and logout use GET instead of POST. GET gives me an error when using it, while POST seems to work.
---
 api/mailinabox.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/mailinabox.yml b/api/mailinabox.yml
index 6e289f30..f3290fb9 100644
--- a/api/mailinabox.yml
+++ b/api/mailinabox.yml
@@ -71,7 +71,7 @@ paths:
       x-codeSamples:
         - lang: curl
           source: |
-            curl -X GET "https://{host}/admin/login" \
+            curl -X POST "https://{host}/admin/login" \
               -u "<email>:<password>"
       responses:
         200:
@@ -103,7 +103,7 @@ paths:
       x-codeSamples:
         - lang: curl
           source: |
-            curl -X GET "https://{host}/admin/logout" \
+            curl -X POST "https://{host}/admin/logout" \
               -u "<email>:<session_key>"
       responses:
         200:

From 58b0323b3626d29a8c8a419f72fecf32ee4509c5 Mon Sep 17 00:00:00 2001
From: jvolkenant <jeff@volkenant.net>
Date: Thu, 4 Nov 2021 15:59:10 -0700
Subject: [PATCH 2/2] Update persistent_login for Roundcube 1.5 (#2055)

---
 CHANGELOG.md     | 7 +++++++
 setup/webmail.sh | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67fcdd94..bff4d661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+
+In Development
+--------------
+
+Mail:
+* Roundcube's persistent_login plugin update to better support Roundcube 1.5
+
 Version 55 (October 18, 2021)
 -----------------------------
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 21142c4a..957fd2e3 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -31,7 +31,7 @@ apt_install \
 
 VERSION=1.5.0
 HASH=2a9d11d9c10c8e8756120606c47eef702f00fe6d
-PERSISTENT_LOGIN_VERSION=6b3fc450cae23ccb2f393d0ef67aa319e877e435 # version 5.2.0
+PERSISTENT_LOGIN_VERSION=59ca1b0d3a02cff5fa621c1ad581d15f9d642fe8
 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
 CARDDAV_VERSION=3.0.3
 CARDDAV_HASH=d1e3b0d851ffa2c6bd42bf0c04f70d0e1d0d78f8