1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/guacamole_ynh.git synced 2024-09-03 19:16:03 +02:00

Update to tomcat 9.0.31-1~deb10u4 (#8)

* Update to tomcat 9.0.31-1~deb10u4

- It is annoying that older builds are getting removed from source server
- Let's rename the downloaded archive to simplify the code

* Silence make warnings

* Bump package version
This commit is contained in:
tituspijean 2021-07-14 18:27:49 +02:00 committed by GitHub
parent 1621e1fb22
commit 1f8d7cdd79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions

View file

@ -1,7 +1,7 @@
SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.31-1~deb10u3_all.deb
SOURCE_SUM=0f51e6e84f4045564d6c3b249b69e1a7cb10a8f737458003da701b52a2903970
SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.31-1~deb10u4_all.deb
SOURCE_SUM=42276CABAD11856553DD9265B8C7FBCCE245525BF80EAF180085AB74BB078619
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=ar
SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=tomcat9_9.0.31-1~deb10u3_all.deb
SOURCE_FILENAME=tomcat9.deb
SOURCE_EXTRACT=false

View file

@ -6,7 +6,7 @@
"en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.",
"fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH."
},
"version": "1.3.0~ynh3",
"version": "1.3.0~ynh4",
"url": "https://guacamole.apache.org/",
"license": "Apache-2.0",
"maintainer": {
@ -54,4 +54,4 @@
}
]
}
}
}

View file

@ -68,7 +68,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#=================================================
ynh_script_progression --message="Installing dependencies..." --weight=1
# Guacamole depends on Apache Tomcat.
# Guacamole depends on Apache Tomcat.
# But installing Tomcat from the Debian repos automatically enables and starts it.
# So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
@ -136,13 +136,13 @@ mv "$final_path/etc/guacamole/lib/mariadb-java-client-2.7.2.jar" "$final_path/et
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
pushd "$final_path" || ynh_die
ar x "$final_path/tomcat9_9.0.31-1~deb10u3_all.deb" "data.tar.xz"
ar x "$final_path/tomcat9.deb" "data.tar.xz"
popd || ynh_die
ynh_secure_remove --file="$final_path/tomcat9_9.0.31-1~deb10u3_all.deb"
ynh_secure_remove --file="$final_path/tomcat9.deb"
mkdir -p "$final_path/tomcat9-data"
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
ynh_secure_remove --file="$final_path/data.tar.xz"
ynh_secure_remove --file="$final_path/tomcat9-data"
@ -184,8 +184,8 @@ ynh_script_progression --message="Compiling guacd..." --weight=30
pushd "$final_path/.guacd-src" || ynh_die
./configure --enable-allow-freerdp-snapshots --prefix="$final_path" --datadir="$final_path" --with-freerdp-plugin-dir="$final_path/lib/x86_64-linux-gnu/freerdp2"
make
make install
ynh_exec_warn_less make
ynh_exec_warn_less make install
popd || ynh_die
#=================================================

View file

@ -92,13 +92,13 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
pushd "$final_path" || ynh_die
ar x "$final_path/tomcat9_9.0.31-1~deb10u3_all.deb" "data.tar.xz"
ar x "$final_path/tomcat9.deb" "data.tar.xz"
popd || ynh_die
ynh_secure_remove --file="$final_path/tomcat9_9.0.31-1~deb10u3_all.deb"
ynh_secure_remove --file="$final_path/tomcat9.deb"
mkdir -p "$final_path/tomcat9-data"
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
ynh_secure_remove --file="$final_path/data.tar.xz"
ynh_secure_remove --file="$final_path/tomcat9-data"
fi
@ -116,7 +116,7 @@ ynh_add_nginx_config
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=1
# Guacamole depends on Apache Tomcat.
# Guacamole depends on Apache Tomcat.
# But installing Tomcat from the Debian repos automatically enables and starts it.
# So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
@ -158,8 +158,8 @@ ynh_script_progression --message="Compiling guacd..." --weight=30
pushd "$final_path/.guacd-src" || ynh_die
./configure --enable-allow-freerdp-snapshots --prefix="$final_path" --datadir="$final_path" --with-freerdp-plugin-dir="$final_path/lib/x86_64-linux-gnu/freerdp2"
make
make install
ynh_exec_warn_less make
ynh_exec_warn_less make install
popd || ynh_die
#=================================================