From ded3c1f839e651a5863fc12a871e8d1947c21290 Mon Sep 17 00:00:00 2001
From: Satoshi Yasuda <yasuda@fixpoint.co.jp>
Date: Tue, 26 Sep 2023 01:34:04 +0900
Subject: [PATCH 1/3] Build Docker image with openssl3

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ff96cde2c..a556b4334 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ RUN apk add --no-cache                \
         libtool                       \
         libwebp-dev                   \
         make                          \
-        openssl1.1-compat-dev         \
+        openssl-dev                   \
         pango-dev                     \
         pulseaudio-dev                \
         util-linux-dev

From 42a0cc9105899ce9980d6ff08e266aaf5b52c4f8 Mon Sep 17 00:00:00 2001
From: Satoshi Yasuda <yasuda@fixpoint.co.jp>
Date: Wed, 26 Oct 2022 17:58:35 +0900
Subject: [PATCH 2/3] Ensure file closing when stream released

---
 src/common-ssh/sftp.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/common-ssh/sftp.c b/src/common-ssh/sftp.c
index 0100cc161..dd54805aa 100644
--- a/src/common-ssh/sftp.c
+++ b/src/common-ssh/sftp.c
@@ -515,9 +515,16 @@ static int guac_common_ssh_sftp_ack_handler(guac_user* user,
     }
 
     /* Otherwise, return stream to user */
-    else
+    else {
         guac_user_free_stream(user, stream);
 
+        /* Close file */
+        if (libssh2_sftp_close(file) == 0)
+            guac_user_log(user, GUAC_LOG_DEBUG, "File closed");
+        else
+            guac_user_log(user, GUAC_LOG_INFO, "Unable to close file");
+    }
+
     return 0;
 }
 

From 4ca6676db25ab990951201af960404fd2eca498d Mon Sep 17 00:00:00 2001
From: Satoshi Yasuda <yasuda@fixpoint.co.jp>
Date: Fri, 25 Aug 2023 22:49:37 +0900
Subject: [PATCH 3/3] Bump version numbers to 1.5.3-fp.0

---
 bin/guacctl  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/guacctl b/bin/guacctl
index 287c59c69..f7a6ec15b 100755
--- a/bin/guacctl
+++ b/bin/guacctl
@@ -117,7 +117,7 @@ error() {
 ##
 usage() {
     cat >&2 <<END
-guacctl 1.5.3, Apache Guacamole terminal session control utility.
+guacctl 1.5.3-fp.0, Apache Guacamole terminal session control utility.
 Usage: guacctl [OPTION] [FILE or NAME]...
 
     -d, --download         download each of the files listed.
diff --git a/configure.ac b/configure.ac
index d4db3b6d7..b1dcdc9ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 #
 
 AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [1.5.3])
+AC_INIT([guacamole-server], [1.5.3-fp.0])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])