From c853054067c65b101a0cea44be8f2870efe5494c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Mon, 30 Jun 2025 13:26:08 +0200
Subject: [PATCH] Apache Guacamole: Install auth-jdbc component that matches
 release version (#5563)

* Pull jdbc auth matching release version

* jdbc 9.3

---------

Co-authored-by: CanbiZ <47820557+MickLesk@users.noreply.github.com>
---
 install/apache-guacamole-install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/install/apache-guacamole-install.sh b/install/apache-guacamole-install.sh
index 6b8529bfc..cdedab7e6 100644
--- a/install/apache-guacamole-install.sh
+++ b/install/apache-guacamole-install.sh
@@ -64,12 +64,12 @@ $STD ldconfig
 RELEASE_CLIENT=$(curl -fsSL https://api.github.com/repos/apache/guacamole-client/tags | jq -r '.[].name' | grep -v -- '-RC' | head -n 1)
 curl -fsSL "https://downloads.apache.org/guacamole/${RELEASE_CLIENT}/binary/guacamole-${RELEASE_CLIENT}.war" -o "/opt/apache-guacamole/tomcat9/webapps/guacamole.war"
 cd /root
-curl -fsSL "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.26.tar.gz" -o "/root/mysql-connector-java-8.0.26.tar.gz"
-$STD tar -xf ~/mysql-connector-java-8.0.26.tar.gz
-mv ~/mysql-connector-java-8.0.26/mysql-connector-java-8.0.26.jar /etc/guacamole/lib/
-curl -fsSL "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-jdbc-1.5.5.tar.gz" -o "/root/guacamole-auth-jdbc-1.5.5.tar.gz"
-$STD tar -xf ~/guacamole-auth-jdbc-1.5.5.tar.gz
-mv ~/guacamole-auth-jdbc-1.5.5/mysql/guacamole-auth-jdbc-mysql-1.5.5.jar /etc/guacamole/extensions/
+curl -fsSL "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-9.3.0.tar.gz" -o "/root/mysql-connector-j-9.3.0.tar.gz"
+$STD tar -xf ~/mysql-connector-j-9.3.0.tar.gz
+mv ~/mysql-connector-j-9.3.0.tar.gz/mysql-connector-j-9.3.0.tar.gz /etc/guacamole/lib/
+curl -fsSL "https://downloads.apache.org/guacamole/${RELEASE_SERVER}/binary/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz" -o "/root/guacamole-auth-jdbc-${RELEASE_SERVER}.tar.gz"
+$STD tar -xf ~/guacamole-auth-jdbc-$RELEASE_SERVER.tar.gz
+mv ~/guacamole-auth-jdbc-$RELEASE_SERVER/mysql/guacamole-auth-jdbc-mysql-$RELEASE_SERVER.jar /etc/guacamole/extensions/
 msg_ok "Setup Apache Guacamole"
 
 msg_info "Setup Database"
@@ -147,8 +147,8 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf ~/mysql-connector-java-8.0.26{,.tar.gz}
-rm -rf ~/guacamole-auth-jdbc-1.5.5{,.tar.gz}
+rm -rf ~/mysql-connector-j-9.3.0{,.tar.gz}
+rm -rf ~/guacamole-auth-jdbc-$RELEASE_SERVER{,.tar.gz}
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"