From f5a53ce853ec0aaaa169b975b9eaec7c5107c496 Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 7 Sep 2021 11:52:29 +0000 Subject: [PATCH 1/5] KASM-1896 update mesa to latest stable --- src/ubuntu/install/tools/install_tools.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index 17a8a27..074bc73 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -9,9 +9,13 @@ if [ "${DISTRO}" == "centos" ] ; then rm wmctrl*.rpm else apt-get update - apt-get install -y vim wget net-tools locales bzip2 wmctrl + apt-get install -y vim wget net-tools locales bzip2 wmctrl software-properties-common apt-get clean -y + #update mesa to latest + add-apt-repository ppa:kisak/kisak-mesa + apt full-upgrade -y + echo "generate locales für en_US.UTF-8" locale-gen en_US.UTF-8 fi From d86c82352027836962be995b30f88235b07cc954 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 10 Sep 2021 12:41:25 +0000 Subject: [PATCH 2/5] KASM-1805 KASM-1906 KASM-1834 KASM-1882 KASM-1881 --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index c25699e..af0f3e3 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -6,11 +6,11 @@ cd /tmp if [ "${DISTRO}" == "kali" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_kali-rolling_0.9.3_master_6f2805_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_kali-rolling_0.9.3_master_0cb2c0_amd64.deb" elif [ "${DISTRO}" == "centos" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_centos_core_0.9.3_master_6f2805_x86_64.rpm" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_centos_core_0.9.3_master_0cb2c0_x86_64.rpm" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_bionic_0.9.3_master_6f2805_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_bionic_0.9.3_master_0cb2c0_amd64.deb" fi From c185a941606f5d3465c12f8ae3278d7306bec5ba Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 10 Sep 2021 14:50:52 +0000 Subject: [PATCH 3/5] Update src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index af0f3e3..26bbdd3 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -8,7 +8,7 @@ if [ "${DISTRO}" == "kali" ] ; then BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_kali-rolling_0.9.3_master_0cb2c0_amd64.deb" elif [ "${DISTRO}" == "centos" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_centos_core_0.9.3_master_0cb2c0_x86_64.rpm" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm" else BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_bionic_0.9.3_master_0cb2c0_amd64.deb" fi From 49bca4c2167f66906227360bdc8c363d37a63fd2 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 10 Sep 2021 15:01:11 +0000 Subject: [PATCH 4/5] Fix Mesa install for Kali --- src/ubuntu/install/tools/install_tools.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index 074bc73..1b04ad4 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -12,10 +12,12 @@ else apt-get install -y vim wget net-tools locales bzip2 wmctrl software-properties-common apt-get clean -y - #update mesa to latest - add-apt-repository ppa:kisak/kisak-mesa - apt full-upgrade -y - echo "generate locales für en_US.UTF-8" locale-gen en_US.UTF-8 fi + +if [ "$DISTRO" = "ubuntu" ]; then + #update mesa to latest + add-apt-repository ppa:kisak/kisak-mesa + apt full-upgrade -y +fi From cc406645706233a76acb10835257c79a24ebe501 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 10 Sep 2021 18:37:31 +0000 Subject: [PATCH 5/5] Update KasmVNC Build --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index 26bbdd3..cdd2ede 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -6,11 +6,11 @@ cd /tmp if [ "${DISTRO}" == "kali" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_kali-rolling_0.9.3_master_0cb2c0_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/kasmvncserver_kali-rolling_0.9.3_master_159d75_amd64.deb" elif [ "${DISTRO}" == "centos" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/0cb2c0ba9f86c45a451e93548c99a45f1cd4b5c8/kasmvncserver_bionic_0.9.3_master_0cb2c0_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/kasmvncserver_bionic_0.9.3_master_159d75_amd64.deb" fi