From 7f18e6ca3c54614eb8c4e759cbc660d29da804ac Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 23 Jun 2022 17:45:40 -0400
Subject: [PATCH] Upgrade persistent login plugin to version 5.3.0

---
 conf/persistent_login-sqlite.sql | 14 --------------
 setup/webmail.sh                 |  7 ++-----
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 conf/persistent_login-sqlite.sql

diff --git a/conf/persistent_login-sqlite.sql b/conf/persistent_login-sqlite.sql
deleted file mode 100644
index 5bffc9a6..00000000
--- a/conf/persistent_login-sqlite.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS `auth_tokens` (
-    `token` TEXT NOT NULL,
-    `expires` TEXT NOT NULL,
-    `user_id` INTEGER NOT NULL,
-    `user_name` TEXT NOT NULL,
-    `user_pass` TEXT NOT NULL,
-    `host` TEXT NOT NULL,
-    PRIMARY KEY(`token`),
-    FOREIGN KEY(`user_id`) REFERENCES `users`(`user_id`) ON DELETE CASCADE
-);
-
-CREATE INDEX IF NOT EXISTS `user_id_fk_auth_tokens` ON `auth_tokens`(`user_id`);
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 1e1740c2..3079b099 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -38,7 +38,7 @@ apt_install \
 # the error message.
 VERSION=1.5.2
 HASH=208ce4ca0be423cc0f7070ff59bd03588b4439bf
-PERSISTENT_LOGIN_VERSION=59ca1b0d3a02cff5fa621c1ad581d15f9d642fe8
+PERSISTENT_LOGIN_VERSION=version-5.3.0
 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
 CARDDAV_VERSION=4.3.0
 CARDDAV_HASH=4ad7df8843951062878b1375f77c614f68bc5c61
@@ -245,10 +245,7 @@ chown www-data:www-data $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
 chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
 
 # Create persistent login plugin's database tables
-#   TODO: use sql from this PR if it gets committed (been waiting 2
-#         weeks and counting...):
-#     https://github.com/mfreiholz/persistent_login/pull/63
-sqlite3 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite < conf/persistent_login-sqlite.sql
+sqlite3 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite < ${RCM_PLUGIN_DIR}/persistent_login/sql/sqlite.sql
 
 # Enable PHP modules.
 phpenmod -v php mcrypt imap ldap