More XDG work I'll probably never need

Proof of concept xdg-portal KDE + Firefox
2021-07-01 20:08:49 +12:00 · 2021-06-18 07:53:27 +12:00
271 changed files with 2239 additions and 27086 deletions
--- a/.ci/upload.sh
+++ b/.ci/upload.sh
@@ -1,72 +1,34 @@
 #!/bin/bash

-is_kasmvnc() {
-  local package="$1";
-
-  echo "$package" | grep -qP 'kasmvncserver(_|-)[0-9]'
-}
-
-detect_deb_package_arch() {
-  local deb_package="$1"
-  echo "$deb_package" | sed -e 's/.\+_\([^.]\+\)\.\(d\?\)deb/\1/'
-}
-
-find_deb_package() {
-  local dbgsym_package="$1"
-
-  echo "$dbgsym_package" | sed -e 's/-dbgsym//; s/ddeb/deb/'
-}
-
-fetch_xvnc_md5sum() {
-  local deb_package="$1"
-  deb_package=$(realpath "$deb_package")
-
-  local tmpdir=$(mktemp -d)
-  cd "$tmpdir"
-  dpkg-deb -e "$deb_package"
-  cat DEBIAN/md5sums | grep bin/Xkasmvnc | cut -d' ' -f 1
-}
-
 function prepare_upload_filename() {
  local package="$1";

-  if ! is_kasmvnc "$package"; then
-    export upload_filename="$package"
-    return
-  fi
-
  .ci/detect_os_arch_package_format "$package" > /tmp/os_arch_package_format;
  source /tmp/os_arch_package_format;
  detect_release_branch
-
-  detect_revision "$package" "$OS_ARCH"
-  if [ -n "$REVISION" ]; then
-    REVISION="_${REVISION}"
-  fi
-
  if [ -n "$RELEASE_BRANCH" ]; then
-    export upload_filename="kasmvncserver_${PACKAGE_OS}_${RELEASE_VERSION}${REVISION}_${OS_ARCH}.${PACKAGE_FORMAT}";
+    export upload_filename="kasmvncserver_${PACKAGE_OS}_${RELEASE_VERSION}_${OS_ARCH}.${PACKAGE_FORMAT}";
  else
    export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed 's/\//_/g')";
-    export upload_filename="kasmvncserver_${PACKAGE_OS}_${RELEASE_VERSION}_${SANITIZED_BRANCH}_${CI_COMMIT_SHA:0:6}${REVISION}_${OS_ARCH}.${PACKAGE_FORMAT}";
+    export upload_filename="kasmvncserver_${PACKAGE_OS}_${RELEASE_VERSION}_${SANITIZED_BRANCH}_${CI_COMMIT_SHA:0:6}_${OS_ARCH}.${PACKAGE_FORMAT}";
  fi
 };

 function upload_to_s3() {
  local package="$1";
  local upload_filename="$2";
-  local s3_bucket="$3";

  # Transfer to S3
-  python3 amazon-s3-bitbucket-pipelines-python/s3_upload.py "${s3_bucket}" "$package" "${upload_filename}";
+  python3 amazon-s3-bitbucket-pipelines-python/s3_upload.py "${S3_BUCKET}" "$package" "${S3_BUILD_DIRECTORY}/${upload_filename}";
  # Use the Gitlab API to tell Gitlab where the artifact was stored
-  export S3_URL="https://${s3_bucket}.s3.amazonaws.com/${upload_filename}";
+  export S3_URL="https://${S3_BUCKET}.s3.amazonaws.com/${S3_BUILD_DIRECTORY}/${upload_filename}";
+  export BUILD_STATUS="{\"key\":\"doc\", \"state\":\"SUCCESSFUL\", \"name\":\"${upload_filename}\", \"url\":\"${S3_URL}\"}";
+  curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=build-url&target_url=${S3_URL}";
 };
-
 function prepare_to_run_scripts_and_s3_uploads() {
  export DEBIAN_FRONTEND=noninteractive;
  apt-get update;
-  apt-get install -y ruby2.7 git wget;
+  apt-get install -y ruby2.7 git;
  apt-get install -y python3 python3-pip python3-boto3 curl pkg-config libxmlsec1-dev;
  git clone https://bitbucket.org/awslabs/amazon-s3-bitbucket-pipelines-python.git;
 };
@@ -76,16 +38,3 @@ detect_release_branch() {
    export RELEASE_BRANCH=1;
  fi
 }
-
-detect_revision() {
-  local package="$1"
-  local arch="$2"
-
-  REVISION=
-
-  if ! echo "$package" | grep -q '+'; then
-    return
-  fi
-
-  REVISION=$(echo "$package" | sed "s/_${arch}.\+//" | sed 's/.\++//')
-}
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+builder/build
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/installation-issue.md
+++ b/.github/ISSUE_TEMPLATE/installation-issue.md
@@ -1,27 +0,0 @@
---
-name: Installation Issue
-about: Create a report about an installation issue
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the issue is.
-
-**System Description**
-Provide the output of 
-```bash
-cat /etc/os-release
-uname -a
-```
-
-**KasmVNC Details**
-Provide the filename of the package you installed KasmVNC with. The filename includes important details like the OS, architecture, and commit sha.
-
-**Installation Details**
-Provide the commands used to install the KasmVNC package and the output of those commands.
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/report-a-bug-or-issue-with-kasmvnc.md
+++ b/.github/ISSUE_TEMPLATE/report-a-bug-or-issue-with-kasmvnc.md
@@ -1,46 +0,0 @@
---
-name: Report a bug or issue with KasmVNC
-about: Create a bug/issue report on KasmVNC
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the issue is.
-
-**System Description**
-Provide the output of 
-```bash
-cat /etc/os-release
-uname -a
-```
-
-**KasmVNC Details**
-Provide the filename of the package you installed KasmVNC with. The filename includes important details like the OS, architecture, and commit sha.
-
-Provide the output of this command.
-```bash
-Xvnc -version
-```
-
-**To Reproduce**
-Steps to reproduce the behavior (for non-installation issues):
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Browser**
-If this is a problem with the KasmVNC client, provide details about the browser you are accessing KasmVNC from.
- - Device: [e.g. iPhone6]
- - OS: [e.g. Windows 11]
- - Browser [e.g. chrome, safari, edge]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ config.h

 builder/build/
 builder/www/
-spec/tmp

 # Deb building artefacts
 debian/.debhelper/
@@ -22,4 +21,3 @@ debian/files
 debian/kasmvncserver.substvars
 debian/kasmvncserver/
 .pc
-.vscode/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,511 +3,109 @@ services:
  - docker:dind

 variables:
-  KASMVNC_COMMIT_ID: $CI_COMMIT_SHA
  GITLAB_SHARED_DIND_DIR: /builds/$CI_PROJECT_PATH/shared
  GIT_SUBMODULE_STRATEGY: normal
  GIT_FETCH_EXTRA_FLAGS: --tags
-  # E.g. BUILD_JOBS: build_debian_buster,build_ubuntu_bionic. This will include
-  # arm builds, because build_debian_buster_arm matches build_debian_buster.
-  # "BUILD_JOBS: none" won't build any build jobs, nor www.
-  BUILD_JOBS: all
-  DOCKER_HOST: unix://
-
-workflow:
-  rules:
-    # Disable tag builds.
-    - if: $CI_COMMIT_TAG != $CI_COMMIT_REF_NAME

 stages:
-  - www
  - build
-  - test
  - upload

 .prepare_build: &prepare_build
+  - ls -l
  - pwd
  - apk add bash
  - mkdir -p "$GITLAB_SHARED_DIND_DIR" && chmod 777 "$GITLAB_SHARED_DIND_DIR"

-.prepare_www: &prepare_www
-  - tar -zxf output/www/kasm_www.tar.gz -C builder/
-
 .prepare_artfacts: &prepare_artfacts
+  - mkdir output
  - cp -r builder/build/* output/
  - rm output/*.tar.gz

-default:
-  tags:
-    - oci-fixed-amd64
-
-build_www:
-  stage: www
-  allow_failure: false
-  before_script:
-    - *prepare_build
-  script:
-    - webpacked_www=$PWD/builder/www
-    - src_www=kasmweb
-    - docker build -t kasmweb/www -f builder/dockerfile.www.build .
-    - docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
-    - mkdir -p output/www
-    - cd builder
-    - echo $PWD
-    - ls -l
-    - ls -l ../output
-    - tar -zcvf ../output/www/kasm_www.tar.gz www
-  only:
-    variables:
-      - $BUILD_JOBS !~ /^none$/
-  artifacts:
-    paths:
-      - output/
-
 build_ubuntu_bionic:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_bionic_arm:
-  stage: build
-  allow_failure: false
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

 build_ubuntu_focal:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package ubuntu focal;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_focal_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu focal;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_jammy:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu jammy;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_jammy_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu jammy;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

 build_debian_buster:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package debian buster;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_debian_buster_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package debian buster;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

 build_debian_bullseye:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package debian bullseye;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_debian_bullseye_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package debian bullseye;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

 build_kali_rolling:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package kali kali-rolling;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_kali_rolling_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package kali kali-rolling;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

 build_centos7:
  stage: build
-  allow_failure: true
  before_script:
    - *prepare_build
-    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package centos core
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

-build_oracle_8:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 8;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_8_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 8;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_9:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 9;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_9_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 9;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_opensuse_15:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package opensuse 15;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_opensuse_15_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package opensuse 15;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtyseven:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtyseven;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtyseven_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtyseven;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_317:
-  stage: build
-  allow_failure: true
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 317;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_317_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm64
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 317;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-test:
-  stage: test
-  before_script:
-    - *prepare_build
-  script:
-    - bash builder/test-vncserver
-
 upload:
  stage: upload
  image: ubuntu:focal
  before_script:
    - . .ci/upload.sh
  script:
-    - prepare_to_run_scripts_and_s3_uploads
-    - S3_CRASHPAD_BUILD_DIRECTORY="kasmvnc/crashpad/${CI_COMMIT_SHA}"
-    - for dbgsym_package in `find output/ -type f -name '*dbgsym*deb'`; do
-        deb_package=$(find_deb_package "$dbgsym_package");
-        xvnc_md5sum=$(fetch_xvnc_md5sum "$deb_package");
-        upload_filename="${S3_CRASHPAD_BUILD_DIRECTORY}/${xvnc_md5sum}/kasmvncserver-dbgsym.deb";
-        echo;
-        echo "File to upload $upload_filename";
-        upload_to_s3 "$dbgsym_package" "$upload_filename" "$S3_BUCKET";
-        rm "$dbgsym_package";
-      done
    - export S3_BUILD_DIRECTORY="kasmvnc/${CI_COMMIT_SHA}"
+    - prepare_to_run_scripts_and_s3_uploads
    - export RELEASE_VERSION=$(.ci/next_release_version "$CI_COMMIT_REF_NAME")
-    - for package in `find output/ -type f -name '*.deb' -or -name '*.rpm' -or -name '*.tgz'`; do
+    - for package in `find output/ -type f -name 'kasmvncserver_*.deb' -or -name '*.rpm'`; do
        prepare_upload_filename "$package";
-        upload_filename="${S3_BUILD_DIRECTORY}/$upload_filename";
        echo;
        echo "File to upload $upload_filename";
-        upload_to_s3 "$package" "$upload_filename" "$S3_BUCKET";
-        UPLOAD_NAME=$(basename $upload_filename | sed 's#kasmvncserver_##' | sed -r 's#_([0-9]{1,3}\.){2}[0-9]{1,2}_\S+?([a-f0-9]{6})##' | sed -r 's#\.(deb|rpm|tgz)##');
-        curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=${UPLOAD_NAME}&target_url=${S3_URL}";
+        upload_to_s3 "$package" "$upload_filename";
      done
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = release/1.1.0
+	branch = master
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,6 @@ include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCSourceCompiles)
 include(CheckCXXSourceCompiles)
-include(CheckCXXCompilerFlag)
 include(CheckCSourceRuns)

 include(CMakeMacroLibtoolFile)
@@ -79,9 +78,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")

-# Enable C++ 11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
 # Tell the compiler to be stringent
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat=2")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat=2")
@@ -148,14 +144,9 @@ endif()
 # Check for zlib
 find_package(ZLIB REQUIRED)

-# Check for libpng
-find_package(PNG REQUIRED)
-
 # Check for libjpeg
 find_package(JPEG REQUIRED)

-# Staticly link libjpeg-turbo
-set(JPEG_LIBRARIES "-Wl,-Bstatic -lturbojpeg -Wl,-Bdynamic")
 # Warn if it doesn't seem to be the accelerated libjpeg that's found
 set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
 set(CMAKE_REQUIRED_FLAGS -I${JPEG_INCLUDE_DIR})
@@ -217,9 +208,6 @@ if(ENABLE_PAM)
 endif()
 set(HAVE_PAM ${ENABLE_PAM})

-# Check for SSE2
-check_cxx_compiler_flag(-msse2 COMPILER_SUPPORTS_SSE2)
-
 # Generate config.h and make sure the source finds it
 configure_file(config.h.in config.h)
 add_definitions(-DHAVE_CONFIG_H)
--- a/DEBUGGING.md
+++ b/DEBUGGING.md
@@ -1,108 +0,0 @@
-# Debugging
-In the case where KasmVNC crashes and a backtrace is produced. Developers need a way to make the backtrace useful for debugging. This document covers where the backtrace is logged and how to use a debug symbol package and gdb to gain more information from the backtrace, such as filename, function name, and line number.
-
-## Test Symbolization
-If you want to induce a crash to test that you can symbolize a backtrace you can start KasmVNC and then issue the following command.
-
-    killall -SEGV Xvnc
-
-This will cause KasmVNC to terminate with a backtrace similar to the following. You will find the backtrace in the log file at $HOME/.vnc/$HOSTNAME:$DISPLAY.log where HOME is your user's profile path, HOSTNAME is the hostname of the system, and DISPLAY is the assigned display number for the session.
-
-    (EE) 
-    (EE) Backtrace:
-    (EE) 0: /usr/bin/Xvnc (xorg_backtrace+0x4d) [0x5e48dd]
-    (EE) 1: /usr/bin/Xvnc (0x400000+0x1e8259) [0x5e8259]
-    (EE) 2: /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f5a57ef6000+0x12980) [0x7f5a57f08980]
-    (EE) 3: /lib/x86_64-linux-gnu/libc.so.6 (epoll_wait+0x57) [0x7f5a552eca47]
-    (EE) 4: /usr/bin/Xvnc (ospoll_wait+0x37) [0x5e8d07]
-    (EE) 5: /usr/bin/Xvnc (WaitForSomething+0x1c3) [0x5e2813]
-    (EE) 6: /usr/bin/Xvnc (Dispatch+0xa7) [0x597007]
-    (EE) 7: /usr/bin/Xvnc (dix_main+0x36e) [0x59b1fe]
-    (EE) 8: /lib/x86_64-linux-gnu/libc.so.6 (__libc_start_main+0xe7) [0x7f5a551ecbf7]
-    (EE) 9: /usr/bin/Xvnc (_start+0x2a) [0x46048a]
-    (EE) 
-    (EE) Received signal 11 sent by process 17182, uid 0
-    (EE) 
-    Fatal server error:
-    (EE) Caught signal 11 (Segmentation fault). Server aborting
-    (EE) 
-
-## Debug Symbol Package
-In order to make use of this backtrace, you will need to symbolize the backtrace. Each build of KasmVNC produced by our pipelines comes with a corresponding debug symbol package that can be downloaded. You need two pieces of information to get the package, the git commit ID of KasmVNC and the MD5 sum of Xkasmvnc binary on your system. 
-
-The git commit ID can be found using Xvnc -version:
-
-    ubuntu@matt-dev-vm-1:~$ Xvnc -version
-    Xvnc KasmVNC 0.9.94002f39917dca0ad82ac0c29a75c723b538b32b - built Feb 17 2022 15:21:01
-    Copyright (C) 1999-2018 KasmVNC Team and many others (see README.me)
-    See http://kasmweb.com for information on KasmVNC.
-    Underlying X server release 12010000, The X.Org Foundation
-
-The MD5 sum can be obtained using the md5sum command:
-
-    md5sum /usr/bin/Xkasmvnc
-    57ee7028239c5a737c0aeee4a34138c3  /usr/bin/Xkasmvnc
-    
-With these two pieces of information, you can get the debug symbol package at https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/[COMMITID]/[MD5SUM]/kasmvncserver-dbgsym.deb, in the above example it would be.
-
-[https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb](https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb "https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb")
-
-Use wget or curl to download the debug symbol package and then install it.
-
-    wget  https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb
-    sudo dpkg -i kasmvncserver-dbgsym.deb
-
-## Symbolize a Backtrace
-With the KasmVNC binary and debug symbol package installed on the system, you can use gdb or addr2line to get more information, such as the filename, function name, and line number that the backtrace line is referring to. 
-
-Here is a single line from a backtrace. The following example shows how to retrieve additional information that can help with debugging the crash.
-(EE) 8: /usr/bin/Xvnc (0x400000+0x13e674) [**0x53e674**]
-
-    echo info line ***0x53eaaa** | gdb -q /usr/bin/Xkasmvnc
-    (gdb) Line 223 of "/src/common/network/webudp/Wu.cpp" starts at address 0x53e674 <WuClientSendPendingDTLS(WuClient*, Wu const*, Wu const*)+68>
-
-The following script will search the provide file for a backtrace and symbolize the entire backtrace.
-
-    #!/bin/bash
-      
-    FILENAME=$1
-    grep "(EE)" $FILENAME | while read -r line ; do
-            BACKTRACE=$(echo $line | grep -Po '\[[0-9a-f]x[a-f0-9]{1,}' | sed -r 's#\[##')
-            echo $line
-            if ! [ -z $BACKTRACE ] ; then
-                    SYMBOLIZED=$(echo "info line *${BACKTRACE}" | gdb /usr/bin/Xkasmvnc | grep "(gdb)" | grep -vP "\(gdb\)\s*quit$")
-                    echo "    ${SYMBOLIZED}"
-            fi
-    done
-
-Using this script on the above example backtrace produces the following output.
-
-    ubuntu@hostname-1:~$ bash symbolize.sh ~/.vnc/hostname-1\:10.log
-    (EE)
-    (EE) Backtrace:
-    (EE) 0: /usr/bin/Xvnc (xorg_backtrace+0x4d) [0x5e48dd]
-        (gdb) Line 130 of "backtrace.c" starts at address 0x5e48dd <xorg_backtrace+77> and ends at 0x5e4900 <xorg_backtrace+112>.
-    (EE) 1: /usr/bin/Xvnc (0x400000+0x1e8259) [0x5e8259]
-        (gdb) Line 138 of "osinit.c" starts at address 0x5e8259 <OsSigHandler+41> and ends at 0x5e8275 <OsSigHandler+69>.
-    (EE) 2: /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f5a57ef6000+0x12980) [0x7f5a57f08980]
-        (gdb) No line number information available for address 0x7f5a57f08980
-    (EE) 3: /lib/x86_64-linux-gnu/libc.so.6 (epoll_wait+0x57) [0x7f5a552eca47]
-        (gdb) No line number information available for address 0x7f5a552eca47
-    (EE) 4: /usr/bin/Xvnc (ospoll_wait+0x37) [0x5e8d07]
-        (gdb) Line 643 of "ospoll.c" starts at address 0x5e8d07 <ospoll_wait+55> and ends at 0x5e8d09 <ospoll_wait+57>.
-    (EE) 5: /usr/bin/Xvnc (WaitForSomething+0x1c3) [0x5e2813]
-        (gdb) Line 210 of "WaitFor.c" starts at address 0x5e2813 <WaitForSomething+451> and ends at 0x5e2819 <WaitForSomething+457>.
-    (EE) 6: /usr/bin/Xvnc (Dispatch+0xa7) [0x597007]
-        (gdb) Line 421 of "dispatch.c" starts at address 0x596ffb <Dispatch+155> and ends at 0x59700b <Dispatch+171>.
-    (EE) 7: /usr/bin/Xvnc (dix_main+0x36e) [0x59b1fe]
-        (gdb) Line 278 of "main.c" starts at address 0x59b1fe <dix_main+878> and ends at 0x59b203 <dix_main+883>.
-    (EE) 8: /lib/x86_64-linux-gnu/libc.so.6 (__libc_start_main+0xe7) [0x7f5a551ecbf7]
-        (gdb) No line number information available for address 0x7f5a551ecbf7
-    (EE) 9: /usr/bin/Xvnc (_start+0x2a) [0x46048a]
-        (gdb) No line number information available for address 0x46048a <_start+42>
-    (EE)
-    (EE) Received signal 11 sent by process 17182, uid 0
-    (EE)
-    (EE) Caught signal 11 (Segmentation fault). Server aborting
-    (EE)
-
--- a/15
+++ b/15
@@ -1,15 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-mamba = "*"
-expects = "*"
-"path.py" = "*"
-pexpect = "*"
-
-[dev-packages]
-
-[requires]
-python_version = "3.8"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,136 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "6745d5e5d90e44a18d73a0e23bc3d3e68acb950af0b87df50b45272d25b9e615"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.8"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.python.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "args": {
-            "hashes": [
-                "sha256:a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814"
-            ],
-            "version": "==0.1.0"
-        },
-        "clint": {
-            "hashes": [
-                "sha256:05224c32b1075563d0b16d0015faaf9da43aa214e4a2140e51f08789e7a4c5aa"
-            ],
-            "version": "==0.5.1"
-        },
-        "coverage": {
-            "hashes": [
-                "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c",
-                "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6",
-                "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45",
-                "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a",
-                "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03",
-                "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529",
-                "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a",
-                "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a",
-                "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2",
-                "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6",
-                "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759",
-                "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53",
-                "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a",
-                "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4",
-                "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff",
-                "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502",
-                "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793",
-                "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb",
-                "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905",
-                "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821",
-                "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b",
-                "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81",
-                "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0",
-                "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b",
-                "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3",
-                "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184",
-                "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701",
-                "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a",
-                "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82",
-                "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638",
-                "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5",
-                "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083",
-                "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6",
-                "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90",
-                "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465",
-                "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a",
-                "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3",
-                "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e",
-                "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066",
-                "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf",
-                "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b",
-                "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae",
-                "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669",
-                "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873",
-                "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b",
-                "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6",
-                "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb",
-                "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160",
-                "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c",
-                "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079",
-                "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d",
-                "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==5.5"
-        },
-        "expects": {
-            "hashes": [
-                "sha256:419902ccafe81b7e9559eeb6b7a07ef9d5c5604eddb93000f0642b3b2d594f4c"
-            ],
-            "index": "pypi",
-            "version": "==0.9.0"
-        },
-        "mamba": {
-            "hashes": [
-                "sha256:75cfc6dfd287dcccaf86dd753cf48e0a7337487c7c3fafda05a6a67ded6da496"
-            ],
-            "index": "pypi",
-            "version": "==0.11.2"
-        },
-        "path": {
-            "hashes": [
-                "sha256:2de925e8d421f93bcea80d511b81accfb6a7e6b249afa4a5559557b0cf817097",
-                "sha256:340054c5bb459fc9fd40e7eb6768c5989f3e599d18224238465b5333bc8faa7d"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==16.2.0"
-        },
-        "path.py": {
-            "hashes": [
-                "sha256:8d885e8b2497aed005703d94e0fd97943401f035e42a136810308bff034529a8",
-                "sha256:a43e82eb2c344c3fd0b9d6352f6b856f40b8b7d3d65cc05978b42c3715668496"
-            ],
-            "index": "pypi",
-            "version": "==12.5.0"
-        },
-        "pexpect": {
-            "hashes": [
-                "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937",
-                "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"
-            ],
-            "index": "pypi",
-            "version": "==4.8.0"
-        },
-        "ptyprocess": {
-            "hashes": [
-                "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35",
-                "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"
-            ],
-            "version": "==0.7.0"
-        }
-    },
-    "develop": {}
-}
--- a/README.md
+++ b/README.md
@@ -1,246 +1,21 @@
 # KasmVNC - Linux Web Remote Desktop

-<a href="https://kasmweb.com"><img src="https://kasm-static-content.s3.amazonaws.com/logo_kasm.png" width="300"><a/>
+[![Kasm Technologies](https://kasm-static-content.s3.amazonaws.com/368_kasm_logo_.jpg "Kasm Logo")](https://kasmweb.com)

-KasmVNC provides remote web-based access to a Desktop or application. While VNC is in the name, KasmVNC differs from other VNC variants such as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB specification which defines VNC, in order to support modern technologies and increase security. KasmVNC is accessed by users from any modern browser and does not support legacy VNC viewer applications. KasmVNC uses a modern YAML based configuration at the server and user level, allowing for ease of management.
-
-[Kasm Technologies](https://www.kasmweb.com) developed Kasm Workspaces, the Containerized Streaming Platform. Kasm has open-sourced the Workspace docker images, which include containerized [full desktops and apps](https://github.com/kasmtech/workspaces-images) and [base images](https://github.com/kasmtech/workspaces-core-images) intended for developers to create custimized streaming containers. These containers can be used standalone or within the [Kasm Workspaces Platform](https://www.kasmweb.com) which provides a full Enterprise feature set.
-
-## Documentation
-
-**Do not use the README from the master branch**, unless you are compiling KasmVNC yourself from the tip of master. Use the documentation for your specific release.
-
-  - [KasmVNC 1.0.0 Documentation](https://www.kasmweb.com/kasmvnc/docs/1.0.0/index.html)
-
-  For beta releases prior to version 1.0.0, use the README in this github project on the tagged commit for that release.
-
-## Installation
-
-**You must disconnect and reconnect to the server after installation, for the group membership to apply.**
-
-### Debian/Ubuntu/Kali
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-sudo apt-get install ./kasmvncserver_*.deb
-
-# Add your user to the ssl-cert group
-sudo addgroup $USER ssl-cert
-```
-
-### Oracle 8
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-# Ensure KasmVNC dependencies are available
-sudo dnf config-manager --set-enabled ol8_codeready_builder
-sudo dnf install oracle-epel-release-el8
-
-sudo dnf localinstall ./kasmvncserver_*.rpm
-
-# Add your user to the kasmvnc-cert group
-sudo usermod -a -G kasmvnc-cert $USER
-```
-
-### CentOS 7
-
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-# Ensure KasmVNC dependencies are available
-sudo yum install epel-release
-
-sudo yum install ./kasmvncserver_*.rpm
-
-# Add your user to the kasmvnc-cert group
-sudo usermod -a -G kasmvnc-cert $USER
-```
-
-## Getting Started
-
-The following examples provide basic usage of KasmVNC with the tools provided. For full documentation on all the utilities and the runtime environment, see our [KasmVNC Documentation](https://www.kasmweb.com/kasmvnc/docs/latest/index.html)
-
-```sh
-# Start a session and be guided to setup a user and select a default desktop environment
-vncserver
-
-# Start a session with the mate desktop environment
-vncserver -select-de mate
-
-# Add a new user with read/write permissions
-vncpasswd -u my_username -w -r
-
-# Tail the logs
-tail -f ~/.vnc/*.log
-
-# Get a list of current sessions with display IDs
-vncserver -list
-
-# Kill the VNC session with display ID :2
-vncserver -kill :2
-```
-
-## Configuration
-
-KasmVNC is configured via YAML based configurations. The server level configuration is at `/etc/kasmvnc/kasmvnc.yaml`. Edits to this file apply to all users. Individual users can override server global configurations by specifying them in their configuration file at `~/.vnc/kasmvnc.yaml`.
-
-The following configuration shows all default settings. Many of the encoding settings can be overridden by the client, unless the `runtime_configuration.allow_client_to_override_kasm_server_settings` setting is set tot false. By default the client is allowed to modify encoding settings.
-
-For a full description of each setting see the [configuration reference](https://www.kasmweb.com/kasmvnc/docs/latest/configuration.html).
-
-```yaml
-desktop:
-  resolution:
-    width: 1024
-    height: 768
-  allow_resize: true
-  pixel_depth: 24
-  gpu:
-    hw3d: false
-    drinode: /dev/dri/renderD128
-
-network:
-  protocol: http
-  interface: 0.0.0.0
-  websocket_port: auto
-  use_ipv4: true
-  use_ipv6: true
-  udp:
-    public_ip: auto
-    port: auto
-    stun_server: auto
-  ssl:
-    pem_certificate: /etc/ssl/certs/ssl-cert-snakeoil.pem
-    pem_key: /etc/ssl/private/ssl-cert-snakeoil.key
-    require_ssl: true
-
-user_session:
-  new_session_disconnects_existing_exclusive_session: false
-  concurrent_connections_prompt: false
-  concurrent_connections_prompt_timeout: 10
-  idle_timeout: never
-
-keyboard:
-  remap_keys:
-  ignore_numlock: false
-  raw_keyboard: false
-
-pointer:
-  enabled: true
-
-runtime_configuration:
-  allow_client_to_override_kasm_server_settings: true
-  allow_override_standard_vnc_server_settings: true
-  allow_override_list:
-    - pointer.enabled
-    - data_loss_prevention.clipboard.server_to_client.enabled
-    - data_loss_prevention.clipboard.client_to_server.enabled
-    - data_loss_prevention.clipboard.server_to_client.primary_clipboard_enabled
-
-logging:
-  log_writer_name: all
-  log_dest: logfile
-  level: 30
-
-security:
-  brute_force_protection:
-    blacklist_threshold: 5
-    blacklist_timeout: 10
-
-data_loss_prevention:
-  visible_region:
-    # top: 10
-    # left: 10
-    # right: 40
-    # bottom: 40
-    concealed_region:
-      allow_click_down: false
-      allow_click_release: false
-  clipboard:
-    delay_between_operations: none
-    allow_mimetypes:
-      - chromium/x-web-custom-data
-      - text/html
-      - image/png
-    server_to_client:
-      enabled: true
-      size: unlimited
-      primary_clipboard_enabled: false
-    client_to_server:
-      enabled: true
-      size: unlimited
-  keyboard:
-    enabled: true
-    rate_limit: unlimited
-  logging:
-    level: off
-
-encoding:
-  max_frame_rate: 60
-  full_frame_updates: none
-  rect_encoding_mode:
-    min_quality: 7
-    max_quality: 8
-    consider_lossless_quality: 10
-    rectangle_compress_threads: auto
-
-  video_encoding_mode:
-    jpeg_quality: -1
-    webp_quality: -1
-    max_resolution:
-      width: 1920
-      height: 1080
-    enter_video_encoding_mode:
-      time_threshold: 5
-      area_threshold: 45%
-    exit_video_encoding_mode:
-      time_threshold: 3
-    logging:
-      level: off
-    scaling_algorithm: progressive_bilinear
-
-  compare_framebuffer: auto
-  zrle_zlib_level: auto
-  hextile_improved_compression: true
-
-server:
-  http:
-    headers:
-      - Cross-Origin-Embedder-Policy=require-corp
-      - Cross-Origin-Opener-Policy=same-origin
-    httpd_directory: /usr/share/kasmvnc/www
-  advanced:
-    x_font_path: auto
-    kasm_password_file: ${HOME}/.kasmpasswd
-    x_authority_file: auto
-  auto_shutdown:
-    no_user_session_timeout: never
-    active_user_session_timeout: never
-    inactive_user_session_timeout: never
-
-command_line:
-  prompt: true
-```
+[Kasm Technologies LLC](https://www.kasmweb.com) developed Kasm Server, a Containerized Desktop Infrastructure (CDI) solution. Kasm started with TigerVNC and eventually forked it to create KasmVNC. KasmVNC is used within the overal Kasm CDI infrastructure, however, you can use KasmVNC for individual servers. KasmVNC has different goals than TigerVNC:

+  - Web-based - KasmVNC is designed to provide a web accessible remote desktop. It comes with a web server and websocket server built in. There is no need to install other components. Simply run and navigate to your desktop's URL on the port you specify. While you can still tun on the legacy VNC port, it is disabled by default.
+  - Security - KasmVNC defaults to HTTPS and allows for HTTP Basic Auth. VNC Password authentication is limited by specification to 8 characters and is not suffecient for use on an internet accessible remote desktop. Our goal is to create a by default secure, web based experience.
+  - Simplicity - KasmVNC aims at being simple to deploy and configure.

 # New Features!

-  - Faster jpeg compression (via statically linked libjpeg-turbo)
  - Webp image compression for better bandwidth usage
  - Automatic mixing of webp and jpeg based on CPU availability on server
  - Multi-threaded image encoding for smoother frame rate for servers with more cores
-  - WebRTC UDP Transit
-  - Lossless QOI Image format for Local LAN
  - [Full screen video detection](https://github.com/kasmtech/KasmVNC/wiki/Video-Rendering-Options#video-mode), goes into configurable video mode for better full screen videoo playback performance.
  - [Dynamic jpeg/webp image coompression](https://github.com/kasmtech/KasmVNC/wiki/Video-Rendering-Options#dynamic-image-quality) quality settings based on screen change rates
  - Seemless clipboard support (on Chromium based browsers)
-  - Binary clipboard support for text, images, and formatted text (on Chromium based browsers)
  - Allow client to set/change most configuration settings
  - [Data Loss Prevention features](https://github.com/kasmtech/KasmVNC/wiki/Data-Loss-Prevention)
    - Key stroke logging
@@ -250,20 +25,77 @@ command_line:
    - Keyboard input rate limit
    - Screen region selection
  - Deb packages for Debian, Ubuntu, and Kali Linux included in release.
-  - RPM packages for CentOS, Oracle, OpenSUSE, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
+  - RPM packages for CentOS, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
  - Web [API](https://github.com/kasmtech/KasmVNC/wiki/API) added for remotely controlling and getting information from KasmVNC
-  - Multi-User support with permissions that can be changed via the API
+  - Multi-User with ability to pass control to other users.
  - Web UI uses a webpack for faster load times.
  - Network and CPU bottleneck statistics
-  - Relative cursor support (game pointer mode)
-  - Cursor lock
-  - IME support for languages with extended characters
-  - Better mobile support
-  - DRI3 GPU acceleration with open source drivers (AMDGPU,Intel,ATI,ARM)
+

 Future Goals:

-  - H264 encoding
+  - Support uploads and downloads
+  - Pre-build Packages for all major Linux distributions
+
+### Installation
+
+#### Debian-based
+
+```sh
+wget -qO- https://github.com/kasmtech/KasmVNC/releases/download/v0.9.1-beta/kasmvncserver_0.9.1~beta-1_amd64.deb
+
+sudo dpkg -i kasmvncserver_0.9.1~beta-1_amd64.deb
+sudo apt-get -f install
+
+# We provide an example script to run KasmVNC at #
+# /usr/share/doc/kasmvncserver/examples/kasmvncserver-easy-start. It runs a VNC
+# server on display :10 and on interface 0.0.0.0. If you're happy with those
+# defaults you can just use it as is:
+sudo ln -s /usr/share/doc/kasmvncserver/examples/kasmvncserver-easy-start /usr/bin/
+
+# Add your user to the ssl-cert group
+sudo addgroup $USER ssl-cert
+# You will need to re-connect in order to pick up the group change
+
+# Create ~/.vnc directory and corresponding files.
+kasmvncserver-easy-start -d && kasmvncserver-easy-start -kill
+
+# Modify vncstartup to launch your environment of choice, in this example LXDE
+# This may be optional depending on your system configuration
+echo '/usr/bin/lxsession -s LXDE &' >> ~/.vnc/xstartup
+
+# Start KasmVNC with debug logging:
+kasmvncserver-easy-start -d
+
+# Tail the logs
+tail -f ~/.vnc/`hostname`:10.log
+```
+
+Now navigate to your system at https://[ip-address]:8443/
+
+To stop a running KasmVNC:
+
+```sh
+kasmvncserver-easy-start -kill
+```
+
+The options for vncserver:
+
+| Argument | Description |
+| -------- | ----------- |
+| depth | Color depth, for jpeg/webp should be 24bit |
+| geometry | Screensize, this will automatically be adjusted when the client connects. |
+| websocketPort | The port to use for the web socket. Use a high port to avoid having to run as root. |
+| cert | SSL cert to use for HTTPS |
+| sslOnly | Disable HTTP |
+| interface | Which interface to bind the web server to. |
+
+### Development
+Would you like to contribute to KasmVNC? Please reachout to us at info@kasmweb.com
+
+We need help, especially in packaging KasmVNC for various operating systems. We would love to have standard debian or RMP packages and host our own repo, however, that all requires a lot of experience, proper testing, and pipeline development for automated builds.
+
+We also need help with Windows, which is not currently supported. While KasmVNC can technically be built for Windows 10, it is unusably slow, due to all the changes that occured in Windows since the original Windows support was added in the chain of VNC forked projects.

 ### Compiling From Source
 See the [builder/README.md](https://github.com/kasmtech/KasmVNC/blob/master/builder/README.md). We containerize our build systems to ensure highly repeatable builds.
--- a/builder/README.md
+++ b/builder/README.md
@@ -3,17 +3,8 @@ Docker CE

 # Build a deb/rpm package
 ```
-# builder/build-package <os> <os_codename> <build_tag>
+# builder/build-package <os> <os_codename>
 # os_codename is what "lsb_release -c" outputs, e.g. buster, focal.
-#
-# build_tag allows building multiple versions of deb package (rpm not supported)
-# targeting a single distro release (e.g. Ubuntu Bionic). If build_tag is given,
-# the package name will include build_tag as part of Debian revision. For
-# example:
-# * with build_tag: kasmvncserver_0.9.1~beta-1+libjpeg-turbo-latest_amd64.deb
-# * without build_tag: kasmvncserver_0.9.1~beta-1_amd64.deb
-# You need to have .build and .deb.build for the build_tag.
-#
 # Packages will be placed under builder/build/

 builder/build-package ubuntu bionic
@@ -48,18 +39,6 @@ It will install the package inside a new container and run KasmVNC.

 Open browser and point to https://localhost:443/ or https://\<ip-address\>:443/

-## Debugging
-
-To debug a test container, run `test-deb ubuntu focal -s` or `test-deb ubuntu
-focal --shell`. It runs a shell instead of starting KasmVNC.
-
-## Testing performance
-
-To run a performance test, add `-p` option:
-```
-builder/test-deb ubuntu focal -p
-```
-
 # Package development

 ## deb/rpm package building and testing
@@ -91,94 +70,3 @@ packages installed with XFCE.
 ```
 builder/test-deb-barebones ubuntu focal
 ```
-
-# Preparing a release
-
-Deb and rpm packages need their versions bumped to the new release version. It
-can be done with:
-
-```
-builder/bump-package-version 0.9.4-beta
-```
-
-This will update corresponding package files, use `git diff` to see changes.
-
-If you've ran the command and curious about Debian version specifics, here's an
-explanation:
-Deb version will be `0.9.4~beta-1`. `~` (and not `-`) is required by packaging
-guidelines, and `-1` is Debian package revision for `0.9.4` upstream release. If
-a Debian-specific patch was later added on top of `0.9.4`, it'd be `-2` for the
-next Debian version. Rpm has a corresponding revision in its .spec file.
-
-# CI development
-
-S3 upload code is extracted to various files in `.ci`. It's possible to iterate
-locally by doing stuff like this:
-
-```
-bash -c '
-. .ci/upload.sh;
-prepare_upload_filename "bionic/kasmvncserver_0.9.1~beta-1+libjpeg-turbo-latest_amd64.deb";
-echo $upload_filename;'
-```
-
-# vncserver development
-
-## Building a Ubuntu Focal package
-```
-builder/build-package ubuntu focal
-```
-
-You don't need to `build-package` every time you change something, but you need
-`Xvnc` and other files.
-
-## Running a development environment
-
-```
-builder/devenv-vncserver
-```
-
-`devenv-vncserver` starts a dockerized development environment. Edit
-`vncserver`, its modules, and configuration files as usual. When you
-run`vncserver`, not `/usr/bin/vncserver` will be used, but `./unix/vncserver`.
-Same for configuration files.
-
-Python specs can be run with `ty` alias inside devenv.
-
-### Debug output
-To see `vncserver` output, run `ty -d`. Anything you print inside `vncserver`
-with `say` should be visible that way.
-
-### Finding which spec produces a warning
-By default, each passing test is represented as a dot. `-v` flag causes tests to
-emit test descriptions alongside the program's output. Run `ty -v`.
-
-# ARM
-
-KasmVNC is supported on ARM, however, the build process needs to be broken into two parts with one occuring on a x64 system and the other on an ARM system. All our testing and official builds are done on AWS Graviton instances.
-
-### Build www code on x86 System
-The www code is webpacked for performance and thus requires building. There are NPM packages, phantomjs, which do not have an ARM build. Therefore, this must be built on x86 and then copied over to the ARM system for final packaging.
-
-```
-cd ~/KasmVNC
-mkdir builder/www
-sudo docker build -t kasmweb/www -f builder/dockerfile.www.build .
-sudo docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
-cd builder
-tar -zcvf /tmp/kasm_www.tar.gz www
-```
-
-Now transfer ```kasm_www.tar.gz``` to the ARM system.
-
-### Build KasmVNC ARM
-These instructions assume KasmVNC has been cloned at $HOME and ```kasm_www.tar.gz``` has been placed at $HOME as well, adjust for your environment.
-
-```
-cd ~
-tar -zxf kasm_www.tar.gz -C KasmVNC/builder/
-cd KasmVNC
-sudo builder/build-package ubuntu bionic
-```
-The resulting deb package can be found under ~/KasmVNC/builder/build/bionic
-Replace ```bionic``` with ```focal``` to build for Ubuntu 20.04LTS. At this time, only Ubuntu Bionic has been tested, however, other Debian based builds we support should also work.
--- a/builder/build-apk
+++ b/builder/build-apk
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. builder/os_ver_cli.sh
-
-cd "$(dirname "$0")/.."
-
-docker build -t kasmvnc_apkbuilder_${os}:${os_codename} -f \
-  builder/dockerfile.${os}_${os_codename}.apk.build .
-
-source_dir=$(echo $PWD)
-L_UID=$(id -u)
-L_GID=$(id -g)
-docker run --rm -v "$source_dir":/src --user $L_UID:$L_GID \
-  kasmvnc_apkbuilder_${os}:${os_codename} /bin/bash -c \
-  '/src/builder/build-apk-inside-docker'
--- a/builder/build-apk-inside-docker
+++ b/builder/build-apk-inside-docker
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-os=alpine
-os_codename=$(cat /etc/os-release | awk '/VERSION_ID/' | grep -o '[[:digit:]]' | tr -d '\n' | head -c 3)
-
-mkdir -p /src/builder/build/${os}_${os_codename}
-mv \
-  /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \
-  /src/builder/build/${os}_${os_codename}/kasmvnc.${os}_${os_codename}_$(uname -m).tgz
--- a/builder/build-deb
+++ b/builder/build-deb
@@ -5,17 +5,12 @@ set -e
 cd "$(dirname "$0")/.."
 . builder/os_ver_cli.sh

-L_UID=$(id -u) #Ubuntu already has UID env var, but this should work on all Linix systems
-L_GID=$(id -g)
-
-builder_image=debbuilder_${os}:${os_codename}${build_tag_for_images}
-docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
-  --build-arg L_UID="$L_UID" \
-  -t "$builder_image" -f \
-  builder/dockerfile.${os}_${os_codename}${build_tag}.deb.build .
+docker build -t debbuilder_${os}:${os_codename} -f \
+  builder/dockerfile.${os}_${os_codename}.deb.build .

 deb_output_dir=$(cd .. && echo $PWD)
-docker run --rm -v "$deb_output_dir":/src -e BUILD_TAG="$build_tag" \
-  --user "$L_UID:$L_GID" \
-  "$builder_image" /bin/bash -c \
+L_UID=$(id -u) #Ubuntu already has UID env var, but this should work on all Linix systems
+L_GID=$(id -g)
+docker run --rm -v "$deb_output_dir":/src --user $L_UID:$L_GID \
+  debbuilder_${os}:${os_codename} /bin/bash -c \
  '/src/*/builder/build-deb-inside-docker'
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@@ -2,33 +2,13 @@

 set -e

-prepare_docker_copy_of_debian_dir_and_cd_to_id() {
-   cd "$(dirname "$0")/.."
-
-   local mounted_src_dir="$PWD"
-   local docker_src_dir="$HOME/src"
-
-   mkdir "$docker_src_dir"
-   cd "$docker_src_dir"
-   cp -a "$mounted_src_dir/debian/" .
-   ln -s "$mounted_src_dir/builder" .
-}
-
-prepare_docker_copy_of_debian_dir_and_cd_to_id
+cd "$(dirname "$0")/.."

 os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
 os_codename=$(lsb_release -cs)
 os_dir="builder/build/${os_codename}"

-if [ "$BUILD_TAG" = "+libjpeg-turbo_latest" ]; then
-   echo 'libjpeg 62 libjpeg-turbo (>= 2.1.1)' > debian/shlibs.local
-
-   debian_revision="$(echo $BUILD_TAG | tr _ -)"
-   sed -i -e "1 s/)/$debian_revision)/" debian/changelog
-fi
-
 dpkg-buildpackage -us -uc -b
 mkdir -p "$os_dir"
-cp ../*dbgsym*deb "$os_dir"
 cp ../*.deb "$os_dir"
 lintian ../*.deb || true
--- a/builder/build-package
+++ b/builder/build-package
@@ -4,28 +4,16 @@ set -e

 os="$1"
 codename="$2"
-build_tag="$3"

 detect_package_format() {
  package_format=rpm
  if ls builder/dockerfile*"$os"* | grep -q .deb.build; then
    package_format=deb
-  elif ls builder/dockerfile*"$os"* | grep -q .apk.build; then
-    package_format=apk
-  fi
-}
-
-warn_build_tag_not_supported_for_rpm_and_exit() {
-  if [[ "$build_tag" && "$package_format" = "rpm" ]]; then
-    echo >&2 "<build_tag> isn't supported for rpm"
-    exit 1
  fi
 }

 cd "$(dirname "$0")/.."

 detect_package_format
-warn_build_tag_not_supported_for_rpm_and_exit
-
-builder/build-tarball "$os" "$codename" "$build_tag"
-builder/build-${package_format} "$os" "$codename" "$build_tag"
+builder/build-tarball "$os" "$codename"
+builder/build-${package_format} "$os" "$codename"
--- a/builder/build-rpm
+++ b/builder/build-rpm
@@ -2,18 +2,8 @@

 set -e

-warn_build_tag_not_supported_for_rpm_and_exit() {
-  local build_tag="$1"
-
-  if [[ -n "$build_tag" ]]; then
-    echo >&2 "<build_tag> isn't supported for rpm"
-    exit 1
-  fi
-}
-
 cd "$(dirname "$0")/.."
 . builder/os_ver_cli.sh
-warn_build_tag_not_supported_for_rpm_and_exit "$build_tag"

 docker build -t kasmvnc_rpmbuilder_${os}:${os_codename} -f \
  builder/dockerfile.${os}_${os_codename}.rpm.build .
--- a/builder/build-rpm-inside-docker
+++ b/builder/build-rpm-inside-docker
@@ -8,7 +8,7 @@ prepare_build_env() {
 }

 copy_spec_and_tar_with_binaries() {
-  cp /tmp/*.spec ~/rpmbuild/SPECS/
+  cp /src/centos/kasmvncserver.spec ~/rpmbuild/SPECS/
  cp /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \
    ~/rpmbuild/SOURCES/
 }
@@ -20,16 +20,11 @@ copy_rpm_to_build_dir() {

 cd "$(dirname "$0")/.."

-if [ -z ${KASMVNC_BUILD_OS_CODENAME+x} ]; then
-  os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
-  os_codename=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
-else
-  os=${KASMVNC_BUILD_OS}
-  os_codename=${KASMVNC_BUILD_OS_CODENAME}
-fi
+os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+os_codename=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
 os_dir="build/${os}_${os_codename}"

 prepare_build_env
-rpmbuild -ba ~/rpmbuild/SPECS/*.spec
+rpmbuild -ba ~/rpmbuild/SPECS/kasmvncserver.spec
 copy_rpm_to_build_dir
 rpmlint "$os_dir"/*.rpm || true
--- a/builder/build-tarball
+++ b/builder/build-tarball
@@ -12,13 +12,6 @@ build_www_dir() {
  fi
 }

-move_libjpeg_turbo_to_os_specific_dir() {
-  chown $L_UID:$L_GID $shared_with_docker_dir/${os_codename}/*
-  mkdir -p $PWD/builder/build/${os_codename}/
-  mv $shared_with_docker_dir/${os_codename}/libjpeg-turbo*.deb \
-    $PWD/builder/build/${os_codename}/
-}
-
 shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp}

 cd "$(dirname "$0")/.."
@@ -26,22 +19,13 @@ cd "$(dirname "$0")/.."

 build_www_dir

-builder_image=kasmvncbuilder:$os_codename${build_tag_for_images}
-docker build -t "$builder_image" \
-  -f builder/dockerfile.${os}_${os_codename}${build_tag}.build .
+docker build -t kasmvncbuilder:$os_codename \
+  -f builder/dockerfile.${os}_${os_codename}.build .
 mkdir -p builder/build
-docker run -v $shared_with_docker_dir:/build -e BUILD_TAG="$build_tag" \
-  -e KASMVNC_COMMIT_ID="$KASMVNC_COMMIT_ID" \
-  --rm "$builder_image"
+docker run -v $shared_with_docker_dir:/build --rm kasmvncbuilder:$os_codename

 L_GID=$(id -g)
 L_UID=$(id -u)
 tarball_name="kasmvnc.${os}_${os_codename}.tar.gz"
-tarball_name_with_build_tag="kasmvnc.${os}_${os_codename}${build_tag}.tar.gz"
 chown $L_UID:$L_GID $shared_with_docker_dir/$tarball_name
-mv $shared_with_docker_dir/$tarball_name \
-  $PWD/builder/build/"$tarball_name_with_build_tag"
-
-if [ "$build_tag" = "+libjpeg-turbo_latest" ]; then
-  move_libjpeg_turbo_to_os_specific_dir
-fi
+mv $shared_with_docker_dir/$tarball_name $PWD/builder/build/
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/sh -e

 detect_quilt() {
  if which quilt 1>/dev/null; then
@@ -9,45 +7,17 @@ detect_quilt() {
  fi
 }

-ensure_crashpad_can_fetch_line_number_by_address() {
-  if [ ! -f /etc/centos-release ]; then
-    export LDFLAGS="$LDFLAGS -no-pie"
-  fi
-}
-
-
-fail_on_gcc_12() {
-  if [[ -n "$CC" && -n "$CXX" ]]; then
-    return;
-  fi
-
-  if gcc --version | head -1 | grep -q 12; then
-    cat >&2 <<EOF
-
-Error: gcc 12 detected. It has a bug causing the build to fall because of a
-Warray-bounds bug. Please use gcc 11 in the build Dockerfile:
-ENV CC=gcc-11
-ENV CXX=g++-11
-RUN <install gcc 11>
-EOF
-  exit 1
-  fi
-}
-
 # For build-dep to work, the apt sources need to have the source server
 #sudo apt-get build-dep xorg-server

 #sudo apt-get install cmake git libjpeg-dev libgnutls-dev

-# Gcc12 builds fail due to bug
-#fail_on_gcc_12
-
 # Ubuntu applies a million patches, but here we use upstream to simplify matters
 cd /tmp
 # default to the version of x in Ubuntu 18.04, otherwise caller will need to specify
 XORG_VER=${XORG_VER:-"1.19.6"}
 XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##')
-wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.gz
+wget https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.bz2

 #git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git
 #cd kasmvnc
@@ -60,68 +30,33 @@ sed -i -e '/find_package(FLTK/s@^@#@' \
 	-e '/add_subdirectory(tests/s@^@#@' \
 	CMakeLists.txt

-cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF \
-  -DENABLE_GNUTLS:BOOL=OFF
+cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo .
 make -j5

-tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
+tar -C unix/xserver -xvf /tmp/xorg-server-${XORG_VER}.tar.bz2 --strip-components=1

 cd unix/xserver
-# Apply patches
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
-case "$XORG_VER" in
-  1.20.*)
-      patch -s -p0 < ../CVE-2022-2320-v1.20.patch
-      if [ -f ../xserver120.7.patch ]; then
-        patch -Np1 -i ../xserver120.7.patch
-      fi ;;
-  1.19.*)
-      patch -s -p0 < ../CVE-2022-2320-v1.19.patch
-      ;;
-esac
+if [[ $XORG_VER =~ ^1\.20\..*$ ]]; then
+  patch -Np1 -i ../xserver120.7.patch
+fi

 autoreconf -i
 # Configuring Xorg is long and has many distro-specific paths.
 # The distro paths start after prefix and end with the font path,
 # everything after that is based on BUILDING.txt to remove unneeded
 # components.
-ensure_crashpad_can_fetch_line_number_by_address
-# Centos7 is too old for dri3
-if [ ! "${KASMVNC_BUILD_OS}" == "centos" ]; then
-  CONFIG_OPTIONS="--enable-dri3"
-fi
-# remove gl check for opensuse
-if [ "${KASMVNC_BUILD_OS}" == "opensuse" ] || ([ "${KASMVNC_BUILD_OS}" == "oracle" ] && [ "${KASMVNC_BUILD_OS_CODENAME}" == 9 ]); then
-  sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
-fi
-
-# build X11
-./configure \
-    --disable-config-hal \
-    --disable-config-udev \
-    --disable-dmx \
-    --disable-dri \
-    --disable-dri2 \
-    --disable-kdrive \
-    --disable-static \
-    --disable-xephyr \
-    --disable-xinerama \
-    --disable-xnest \
-    --disable-xorg \
-    --disable-xvfb \
-    --disable-xwayland \
-    --disable-xwin \
-    --enable-glx \
-    --prefix=/opt/kasmweb \
-    --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
-    --without-dtrace \
-    --with-sha1=libcrypto \
-    --with-xkb-bin-directory=/usr/bin \
-    --with-xkb-output=/var/lib/xkb \
-    --with-xkb-path=/usr/share/X11/xkb ${CONFIG_OPTIONS}
-
-# remove array bounds errors for new versions of GCC
-find . -name "Makefile" -exec sed -i 's/-Werror=array-bounds//g' {} \;
+./configure --prefix=/opt/kasmweb \
+	--with-xkb-path=/usr/share/X11/xkb \
+	--with-xkb-output=/var/lib/xkb \
+	--with-xkb-bin-directory=/usr/bin \
+	--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
+	--with-pic --without-dtrace --disable-dri \
+        --disable-static \
+	--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
+	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
+	--disable-config-hal --disable-config-udev \
+	--disable-dri2 --enable-glx --disable-xwayland --disable-dri3
 make -j5

 # modifications for the servertarball
@@ -137,10 +72,6 @@ mkdir lib
 cd lib
 if [ -d /usr/lib/x86_64-linux-gnu/dri ]; then
  ln -s /usr/lib/x86_64-linux-gnu/dri dri
-elif [ -d /usr/lib/aarch64-linux-gnu/dri ]; then
-  ln -s /usr/lib/aarch64-linux-gnu/dri dri
-elif [ -d /usr/lib/xorg/modules/dri ]; then
-  ln -s /usr/lib/xorg/modules/dri dri
 else
  ln -s /usr/lib64/dri dri
 fi
@@ -149,13 +80,7 @@ cd /src
 detect_quilt
 if [ -n "$QUILT_PRESENT" ]; then
  quilt push -a
-  echo 'Patches applied!'
 fi
-
 make servertarball

 cp kasmvnc*.tar.gz /build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz
-if [ "$BUILD_TAG" = "+libjpeg-turbo_latest" ]; then
-	mkdir -p /build/${KASMVNC_BUILD_OS_CODENAME}/
-	cp /libjpeg-turbo/libjpeg*.deb /build/${KASMVNC_BUILD_OS_CODENAME}/
-fi
--- a/builder/build_www.sh
+++ b/builder/build_www.sh
@@ -15,4 +15,4 @@ cd /build
 rm *.md
 rm AUTHORS
 rm vnc.html
-ln -s index.html vnc.html
+rm vnc_lite.html
--- a/builder/bump-package-version
+++ b/builder/bump-package-version
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-update_version_to_meet_packaging_standards() {
-  new_version=$(echo "$new_version" |
-    sed -e 's/\([0-9]\)-\([a-zA-Z]\)/\1~\2/')
-}
-
-bump_rpm() {
-  builder/bump-package-version-rpm "$new_version"
-}
-
-bump_deb() {
-  builder/bump-package-version-deb "$new_version"
-}
-
-new_version="$1"
-
-if [[ -z "$new_version" ]]; then
-  echo >&2 "Usage: $(basename "$0") <new_version>"
-  exit 1
-fi
-
-cd "$(dirname "$0")/.."
-
-update_version_to_meet_packaging_standards
-bump_rpm
-bump_deb
--- a/builder/bump-package-version-deb
+++ b/builder/bump-package-version-deb
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-new_version="$1"
-
-add_debian_revision_to_new_version() {
-  echo "$new_version-1"
-}
-
-bump_deb() {
-  local image="debbump_package_version:dev"
-  local L_UID=$(id -u)
-  local L_GID=$(id -g)
-  local debian_version=$(add_debian_revision_to_new_version)
-
-  docker build -t "$image" -f builder/dockerfile.bump-package-version .
-  docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
-    "$image" /bin/bash -c \
-    "cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
-}
-
-bump_deb
--- a/builder/bump-package-version-inside-docker-deb
+++ b/builder/bump-package-version-inside-docker-deb
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-new_version="$1"
-
-update_version() {
-  dch --newversion $new_version 'New upstream release.'
-}
-
-mark_as_released() {
-  dch --release ""
-}
-
-update_version
-mark_as_released
--- a/builder/bump-package-version-rpm
+++ b/builder/bump-package-version-rpm
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-new_version="$1"
-spec_dirs=(centos oracle opensuse fedora)
-
-spec_files() {
-  for d in "${spec_dirs[@]}"; do
-    ls "$d"/*.spec
-  done
-}
-
-bump_version() {
-  sed -i "s/^Version:.\+/Version:        $new_version/" "$1"
-}
-
-detect_release_version() {
-  release_version=$(sed -ne 's/^Release:\s\+//p' "$1" | sed -e 's/%.\+$//')
-}
-
-bump_changelog() {
-  detect_release_version "$1"
-
-  local date=$(date +'%a %b %d %Y')
-  local changelog_version="$new_version-$release_version"
-  local new_changelog_entry="* $date KasmTech <info@kasmweb.com> - $changelog_version\n- Upstream release"
-
-  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$1"
-}
-
-for spec_file in $(spec_files); do
-  bump_version $spec_file
-  bump_changelog $spec_file
-done
--- a/builder/common.sh
+++ b/builder/common.sh
@@ -1 +0,0 @@
-VNC_PORT=8443
--- a/builder/devenv-vncserver
+++ b/builder/devenv-vncserver
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-default_os=ubuntu
-default_os_codename=focal
-
-cd "$(dirname "$0")/.."
-. ./builder/os_ver_cli.sh
-. ./builder/common.sh
-
-docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
-  -t kasmvncdevenv_${os}:$os_codename \
-  -f builder/dockerfile.${os}_${os_codename}.vncserver_devenv.test .
-docker run -it -v $(realpath ${PWD}):/src -p "443:$VNC_PORT" -p "$VNC_PORT:$VNC_PORT" \
-  -p 8444:8444 \
-  -p 8445:8445 --rm \
-  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
-  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  kasmvncdevenv_${os}:$os_codename
--- a/builder/dockerfile.alpine_317.apk.build
+++ b/builder/dockerfile.alpine_317.apk.build
@@ -1,7 +0,0 @@
-FROM alpine:3.17
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_317.build
+++ b/builder/dockerfile.alpine_317.build
@@ -1,82 +0,0 @@
-FROM alpine:3.17
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 317
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.bump-package-version
+++ b/builder/dockerfile.bump-package-version
@@ -1,6 +0,0 @@
-FROM debian:buster
-
-ENV DEBEMAIL="Kasm Technologies LLC <info@kasmweb.com>"
-
-RUN apt-get update && \
-      apt-get -y install vim devscripts
--- a/builder/dockerfile.centos_core.barebones.rpm.test
+++ b/builder/dockerfile.centos_core.barebones.rpm.test
@@ -1,20 +1,18 @@
 FROM centos:centos7

-ENV STARTUPDIR=/dockerstartup
-
 RUN yum install -y xterm
 RUN yum install -y vim less
 RUN yum install -y redhat-lsb-core
-RUN yum install -y epel-release

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
 RUN yum localinstall -y /tmp/*.rpm

-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
 RUN useradd -m foo
+
 USER foo:kasmvnc-cert

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.centos_core.build
+++ b/builder/dockerfile.centos_core.build
@@ -3,33 +3,27 @@ FROM centos:centos7
 ENV KASMVNC_BUILD_OS centos
 ENV KASMVNC_BUILD_OS_CODENAME core

-RUN yum install -y ca-certificates
 RUN yum install -y build-dep xorg-server libxfont-dev sudo
-RUN yum install -y gcc cmake git libgnutls28-dev vim wget tightvncserver
-RUN yum install -y libpng-dev libtiff-dev libgif-dev libavcodec-dev openssl-devel
+RUN yum install -y gcc cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN yum install -y libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev openssl-devel
 RUN yum install -y make
 RUN yum group install -y "Development Tools"
-RUN yum install -y xorg-x11-server-devel zlib-devel
+RUN yum install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
 RUN yum install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
-  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel pam-devel \
-  gnutls-devel libX11-devel libXtst-devel libXcursor-devel
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
 RUN yum install -y mesa-dri-drivers
-RUN yum install -y ca-certificates

 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
 RUN cd /tmp/libwebp-1.0.2 && \
    ./configure --enable-static --disable-shared && \
    make && make install

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
 RUN useradd -m docker && echo "docker:docker" | chpasswd

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.centos_core.rpm.test
+++ b/builder/dockerfile.centos_core.rpm.test
@@ -41,16 +41,13 @@ RUN yum install -y vim less
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./centos/kasmvncserver.spec /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN yum localinstall -y /tmp/*.rpm

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.debian_bullseye.build
+++ b/builder/dockerfile.debian_bullseye.build
@@ -12,17 +12,20 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.debian_bullseye.deb.build
+++ b/builder/dockerfile.debian_bullseye.deb.build
@@ -9,11 +9,4 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
+USER 1000
--- a/builder/dockerfile.debian_bullseye.deb.test
+++ b/builder/dockerfile.debian_bullseye.deb.test
@@ -37,16 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.debian_buster.barebones.deb.test
+++ b/builder/dockerfile.debian_buster.barebones.deb.test
@@ -1,19 +1,19 @@
 FROM debian:buster-slim

-ENV STARTUPDIR=/dockerstartup
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
 RUN apt-get update && apt-get -y install xterm

-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
+COPY startup/deb/kasmvncserver-easy-start /usr/local/bin

 RUN useradd -m foo
+
 USER foo:ssl-cert

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | \
+  kasmvncpasswd -w -u $VNC_USER $HOME/.kasmpasswd && \
+  kasmvncserver-easy-start && tail -f $HOME/.vnc/*.log"
--- a/builder/dockerfile.debian_buster.build
+++ b/builder/dockerfile.debian_buster.build
@@ -12,17 +12,20 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.debian_buster.deb.build
+++ b/builder/dockerfile.debian_buster.deb.build
@@ -9,11 +9,4 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
+USER 1000
--- a/builder/dockerfile.debian_buster.deb.test
+++ b/builder/dockerfile.debian_buster.deb.test
@@ -34,23 +34,30 @@ RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 RUN apt-get update && apt-get -y install lsb-release

+RUN apt-get update && apt-get -y install xdg-desktop-portal firefox-esr
+COPY ./xdg-desktop-portal-gtk_1.2.0-1_amd64.deb /tmp
+RUN apt-get install -y /tmp/xdg-*.deb
+# RUN apt-get install -y xdg-desktop-portal-gtk
+
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

+RUN sed -i -e 's/about:home/postimages.org/' /usr/lib/firefox-esr/browser/defaults/preferences/firefox.js
+RUN sed -i -e '/browser.startup.firstrunSkipsHomepage/d' /usr/lib/firefox-esr/browser/defaults/preferences/firefox.js
+RUN echo 'pref("browser.startup.firstrunSkipsHomepage", false);' >> /usr/lib/firefox-esr/browser/defaults/preferences/firefox.js
 RUN chown -R 1000:0 $HOME
 USER 1000:ssl-cert
 WORKDIR $HOME

+ENV GTK_USE_PORTAL=1
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
@@ -1,19 +0,0 @@
-FROM fedora:37
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y xterm
-RUN dnf install -y vim less
-RUN yum install -y redhat-lsb-core
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.fedora_thirtyseven.build
+++ b/builder/dockerfile.fedora_thirtyseven.build
@@ -1,86 +0,0 @@
-FROM fedora:37
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtyseven
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
@@ -0,0 +1,18 @@
+FROM fedora:33
+
+RUN dnf install -y xterm
+RUN dnf install -y vim less
+RUN yum install -y redhat-lsb-core
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN dnf localinstall -y /tmp/*.rpm
+
+RUN useradd -m foo
+
+USER foo:kasmvnc-cert
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.fedora_thirtythree.build
+++ b/builder/dockerfile.fedora_thirtythree.build
@@ -0,0 +1,38 @@
+FROM fedora:33
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME thirtythree
+ENV XORG_VER 1.20.10
+
+# RUN dnf install -y build-dep xorg-server libxfont-dev sudo
+RUN dnf install -y gcc cmake git gnutls-devel vim wget
+#tightvncserver
+RUN dnf install -y libjpeg-turbo-devel libpng-devel libtiff-devel giflib-devel openssl-devel
+
+#libavcodec-dev
+RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install ffmpeg-devel
+
+RUN dnf install -y make
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
+RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
+RUN dnf install -y mesa-dri-drivers
+RUN dnf install -y bzip2 redhat-lsb-core
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+COPY . /src
+RUN chown -R docker:docker /src
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtythree.rpm.build
+++ b/builder/dockerfile.fedora_thirtythree.rpm.build
@@ -1,11 +1,11 @@
-FROM fedora:37
+FROM fedora:33

 RUN dnf install -y fedora-packager fedora-review
 RUN dnf install -y tree vim less
 RUN dnf install -y redhat-lsb-core
 RUN dnf install -y dnf-plugins-core

-COPY fedora/*.spec /tmp
+COPY centos/*.spec /tmp
 RUN dnf builddep -y /tmp/*.spec

 RUN useradd -m docker && echo "docker:docker" | chpasswd
--- a/builder/dockerfile.fedora_thirtythree.rpm.test
+++ b/builder/dockerfile.fedora_thirtythree.rpm.test
@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:33

 ENV DISPLAY=:1 \
    VNC_PORT=8443 \
@@ -31,27 +31,26 @@ WORKDIR $HOME

 RUN dnf install -y openssl xterm gettext wget
 RUN dnf install -y nss_wrapper
-RUN dnf install -y xorg-x11-xauth xkeyboard-config
+RUN dnf install -y xorg-x11-xauth xorg-x11-xkb-utils \
+  xkeyboard-config xorg-x11-server-utils
 # xorg-x11-server-Xorg
 # RUN dnf install -y @xfce-desktop-environment
+RUN dnf group install -y lxde-desktop
 RUN dnf erase -y pm-utils xscreensaver*
 RUN dnf install -y redhat-lsb-core
 RUN dnf install -y vim less
-RUN dnf install -y @xfce-desktop-environment

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./fedora/kasmvncserver.spec /tmp

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
 # RUN dnf remove -y tigervnc-server-minimal
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN dnf localinstall -y --allowerasing /tmp/*.rpm

 ### END CUSTOM STUFF ###

@@ -59,4 +58,7 @@ RUN chown -R 1000:0 $HOME
 USER 1000:kasmvnc-cert
 WORKDIR $HOME

+RUN mkdir ~/.vnc && echo '/usr/bin/lxsession -s LXDE &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.kali_kali-rolling.build
+++ b/builder/dockerfile.kali_kali-rolling.build
@@ -4,8 +4,6 @@ ENV KASMVNC_BUILD_OS kali
 ENV KASMVNC_BUILD_OS_CODENAME kali-rolling
 ENV XORG_VER 1.20.10
 ENV DEBIAN_FRONTEND noninteractive
-ENV CC=gcc-11
-ENV CXX=g++-11

 RUN grep '^deb'  /etc/apt/sources.list | sed 's#^deb#deb-src#' >> /etc/apt/sources.list

@@ -14,18 +12,20 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install gcc-11 g++-11 curl
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.kali_kali-rolling.deb.build
+++ b/builder/dockerfile.kali_kali-rolling.deb.build
@@ -9,11 +9,4 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
+USER 1000
--- a/builder/dockerfile.kali_kali-rolling.deb.test
+++ b/builder/dockerfile.kali_kali-rolling.deb.test
@@ -37,15 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.opensuse_15.barebones.rpm.test
+++ b/builder/dockerfile.opensuse_15.barebones.rpm.test
@@ -1,23 +0,0 @@
-FROM opensuse/leap:15.3
-
-ENV STARTUPDIR=/dockerstartup
-
-# base tools
-RUN zypper -n install -y \
-  less \
-  vim \
-  xterm
-
-# Cache repo updates, so that package changes don't trigger it on every build.
-RUN zypper refresh
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN zypper install -y --allow-unsigned-rpm /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.opensuse_15.build
+++ b/builder/dockerfile.opensuse_15.build
@@ -1,61 +0,0 @@
-FROM opensuse/leap:15.3
-
-ENV KASMVNC_BUILD_OS opensuse
-ENV KASMVNC_BUILD_OS_CODENAME 15
-ENV XORG_VER 1.20.3
-
-# Install depends
-RUN zypper install -ny \
-  bdftopcf \
-  bigreqsproto-devel \
-  cmake \
-  curl \
-  ffmpeg-4-libavcodec-devel \
-  fonttosfnt \
-  font-util \
-  gcc \
-  gcc-c++ \
-  giflib-devel \
-  git \
-  gzip \
-  lbzip2 \
-  libbz2-devel \
-  libgbm-devel \
-  libGLw-devel \
-  libgnutls-devel \
-  libopenssl-devel \
-  libpng16-devel \
-  libpnglite0 \
-  png++-devel \
-  libtiff-devel \
-  libXfont2-devel \
-  libxkbcommon-x11-devel \
-  libxshmfence-devel \
-  make \
-  Mesa-dri \
-  Mesa-libglapi-devel \
-  mkfontdir \
-  mkfontscale \
-  patch \
-  tigervnc \
-  wget \
-  xcmiscproto-devel \
-  xorg-x11-devel \
-  xorg-x11-server-sdk \
-  xorg-x11-util-devel \
-  zlib-devel
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -u 1000 docker && \
-  groupadd -g 1000 docker && \
-  usermod -a -G docker docker
-
-COPY --chown=docker:docker . /src/
-
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.opensuse_15.rpm.build
+++ b/builder/dockerfile.opensuse_15.rpm.build
@@ -1,27 +0,0 @@
-FROM opensuse/leap:15.3
-
-ENV KASMVNC_BUILD_OS opensuse
-ENV KASMVNC_BUILD_OS_CODENAME 15
-
-RUN zypper -n install -y \
-  gpg* \
-  less \
-  lsb-release \
-  rng-tools \
-  rpm-build \
-  rpmdevtools \
-  rpmlint \
-  tree \
-  vim
-
-# Cache repo updates, so that spec changes don't trigger it on every build.
-RUN zypper refresh
-COPY opensuse/*.spec /tmp
-
-RUN zypper -n install $(grep BuildRequires /tmp/*.spec | cut -d' ' -f2 | xargs)
-
-RUN useradd -u 1000 -m -d /home/docker docker && \
-  groupadd -g 1000 docker && \
-  usermod -a -G docker docker
-
-USER docker
--- a/builder/dockerfile.oracle_8.barebones.rpm.test
+++ b/builder/dockerfile.oracle_8.barebones.rpm.test
@@ -1,23 +0,0 @@
-FROM oraclelinux:8
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y \
-  less \
-  redhat-lsb-core \
-  vim \
-  xterm
-RUN dnf config-manager --set-enabled ol8_codeready_builder
-RUN dnf install -y oracle-epel-release-el8
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.oracle_8.build
+++ b/builder/dockerfile.oracle_8.build
@@ -1,63 +0,0 @@
-FROM oraclelinux:8
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 8
-ENV XORG_VER 1.20.10
-
-# Install from stock repos
-RUN \
-  dnf install -y 'dnf-command(config-manager)' && \
-  dnf config-manager --set-enabled ol8_codeready_builder && \
-  dnf install -y \
-    bzip2-devel \
-    ca-certificates \
-    cmake \
-    dnf-plugins-core \
-    gcc \
-    gcc-c++ \
-    git \
-    gnutls-devel \
-    libjpeg-turbo-devel \
-    libpng-devel \
-    libtiff-devel \
-    libxshmfence-devel \
-    make \
-    mesa-dri-drivers \
-    mesa-libgbm-devel \
-    openssl-devel \
-    patch \
-    tigervnc-server \
-    wget \
-    xorg-x11-font-utils \
-    zlib-devel
-
-# Enable additional repos (epel, powertools, and fusion)
-RUN dnf config-manager --set-enabled ol8_codeready_builder
-RUN dnf install -y oracle-epel-release-el8
-RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm
-
-# Install from new repos
-RUN dnf install -y \
-  ffmpeg-devel \
-  giflib-devel \
-  lbzip2 \
-  libXfont2-devel \
-  libxkbfile-devel \
-  xorg-x11-server-devel \
-  xorg-x11-xkb-utils-devel \
-  xorg-x11-xtrans-devel \
-  libXrandr-devel \
-  libXtst-devel \
-  libXcursor-devel
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.oracle_8.rpm.build
+++ b/builder/dockerfile.oracle_8.rpm.build
@@ -1,21 +0,0 @@
-FROM oraclelinux:8
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 8
-
-RUN dnf install -y \
-  gpg* \
-  less \
-  redhat-lsb-core \
-  rng-tools \
-  rpm* \
-  rpmlint \
-  tree \
-  vim
-
-COPY oracle/kasmvncserver.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.oracle_9.barebones.rpm.test
+++ b/builder/dockerfile.oracle_9.barebones.rpm.test
@@ -1,25 +0,0 @@
-FROM oraclelinux:9
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y \
-  less \
-  vim \
-  xterm
-RUN dnf config-manager --set-enabled ol9_codeready_builder
-RUN dnf install -y oracle-epel-release-el9
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN dnf install -y crypto-policies-scripts
-RUN update-crypto-policies --set FIPS:SHA1
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.oracle_9.build
+++ b/builder/dockerfile.oracle_9.build
@@ -1,63 +0,0 @@
-FROM oraclelinux:9
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 9
-ENV XORG_VER 1.20.10
-
-# Install from stock repos
-RUN \
-  dnf config-manager --set-enabled ol9_codeready_builder && \
-  dnf config-manager --set-enabled ol9_distro_builder && \
-  dnf install -y \
-    bzip2-devel \
-    ca-certificates \
-    cmake \
-    dnf-plugins-core \
-    gcc \
-    gcc-c++ \
-    git \
-    gnutls-devel \
-    libjpeg-turbo-devel \
-    libpng-devel \
-    libtiff-devel \
-    libxshmfence-devel \
-    make \
-    mesa-dri-drivers \
-    mesa-libGL-devel \
-    mesa-libgbm-devel \
-    openssl-devel \
-    openssl-devel \
-    patch \
-    tigervnc-server \
-    wget \
-    xorg-x11-font-utils \
-    zlib-devel
-
-# Enable additional repos (epel, powertools, and fusion)
-RUN dnf install -y oracle-epel-release-el9
-RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-9.noarch.rpm
-
-# Install from new repos
-RUN dnf install -y \
-  giflib-devel \
-  lbzip2 \
-  libXfont2-devel \
-  libxkbfile-devel \
-  xorg-x11-server-devel \
-  xorg-x11-xtrans-devel \
-  libXrandr-devel \
-  libXtst-devel \
-  libXcursor-devel
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.oracle_9.rpm.build
+++ b/builder/dockerfile.oracle_9.rpm.build
@@ -1,23 +0,0 @@
-FROM oraclelinux:9
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 9
-
-RUN dnf config-manager --set-enabled ol9_codeready_builder
-RUN dnf config-manager --set-enabled ol9_distro_builder
-RUN dnf install -y \
-  gpg* \
-  less \
-  redhat-lsb-core \
-  rng-tools \
-  rpm* \
-  rpmlint \
-  rsync \
-  tree \
-  vim
-
-COPY oracle/kasmvncserver9.spec /tmp
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.ubuntu1604.build
+++ b/builder/dockerfile.ubuntu1604.build
@@ -0,0 +1,22 @@
+FROM ubuntu:16.04
+
+RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
+
+RUN apt-get update && \
+      apt-get -y install sudo
+
+RUN apt-get -y build-dep xorg-server
+RUN apt-get -y install cmake git libjpeg-dev libgnutls-dev vim wget tightvncserver
+RUN apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+
+COPY . /src
+RUN chown -R docker:docker /src
+
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_bionic.build
+++ b/builder/dockerfile.ubuntu_bionic.build
@@ -10,13 +10,15 @@ RUN apt-get update && \
      apt-get -y install sudo

 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 # Fix for older required libs
 #RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \
@@ -26,7 +28,8 @@ RUN $SCRIPTS_DIR/build-libjpeg-turbo

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_bionic.deb.build
+++ b/builder/dockerfile.ubuntu_bionic.deb.build
@@ -7,11 +7,4 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
+USER 1000
--- a/builder/dockerfile.ubuntu_bionic.deb.test
+++ b/builder/dockerfile.ubuntu_bionic.deb.test
@@ -33,25 +33,27 @@ RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm l
 RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 RUN apt-get update && apt-get -y install lsb-release
+RUN apt-get update && apt-get -y install xdg-desktop-portal xdg-desktop-portal-gtk firefox

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

+RUN echo 'pref("browser.startup.firstrunSkipsHomepage", false);' >> /usr/lib/firefox/browser/defaults/preferences/syspref.js
+RUN echo 'pref("browser.startup.homepage", "postimages.org");' >> /usr/lib/firefox/browser/defaults/preferences/syspref.js
+
 RUN chown -R 1000:0 $HOME
 USER 1000:ssl-cert
 WORKDIR $HOME

+ENV GTK_USE_PORTAL=1
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.ubuntu_bionic.test
+++ b/builder/dockerfile.ubuntu_bionic.test
@@ -29,13 +29,13 @@ WORKDIR $HOME

 ### REQUIRED STUFF ###

-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
 RUN apt-get purge -y pm-utils xscreensaver*

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

--- a/builder/dockerfile.ubuntu_focal.barebones.deb.test
+++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test
@@ -1,20 +1,15 @@
 FROM ubuntu:focal

-ENV STARTUPDIR=/dockerstartup
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
-
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
 RUN apt-get update && apt-get -y install xterm lsb-release

-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
-
 RUN useradd -m foo && addgroup foo ssl-cert
+
 USER foo

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/ssl/certs/ssl-cert-snakeoil.pem -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.ubuntu_focal.build
+++ b/builder/dockerfile.ubuntu_focal.build
@@ -12,17 +12,20 @@ RUN apt-get update && \

 RUN apt-get update && apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git vim wget curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src

 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_focal.deb.build
+++ b/builder/dockerfile.ubuntu_focal.deb.build
@@ -9,11 +9,4 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
+USER 1000
--- a/builder/dockerfile.ubuntu_focal.deb.test
+++ b/builder/dockerfile.ubuntu_focal.deb.test
@@ -37,16 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
  chmod +x ~/.vnc/xstartup
--- a/builder/dockerfile.ubuntu_focal.specs.test
+++ b/builder/dockerfile.ubuntu_focal.specs.test
@@ -1,30 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get install -y python3-pip
-RUN apt-get update && apt-get install -y strace silversearcher-ag xfonts-base
-RUN apt-get update && apt-get install -y cinnamon
-RUN apt-get update && apt-get install -y mate
-
-RUN useradd -m docker
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN apt-get install -y /tmp/*$(dpkg --print-architecture).deb
-
-ENV USER docker
-ENV HOME /home/docker
-
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-RUN pip3 install --user pipenv
-RUN echo 'PATH="~/.local/bin/:$PATH"' >> ~/.bashrc
-
-ENV LC_ALL=C.UTF-8
-ENV LANG=C.UTF-8
-
-ENTRYPOINT ["/bin/bash", "-ic", "/src/builder/run-specs-inside-docker"]
--- a/builder/dockerfile.ubuntu_focal.test
+++ b/builder/dockerfile.ubuntu_focal.test
@@ -29,13 +29,13 @@ WORKDIR $HOME

 ### REQUIRED STUFF ###

-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
 RUN apt-get purge -y pm-utils xscreensaver*

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

--- a/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
+++ b/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
@@ -1,67 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV VNC_PORT 8443
-ENV VNC_PORT2 8444
-ENV VNC_PORT3 8445
-EXPOSE $VNC_PORT
-EXPOSE $VNC_PORT2
-EXPOSE $VNC_PORT3
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get -y install lsb-release
-RUN apt-get update && apt-get -y install net-tools
-
-# RUN mkdir -p /usr/share/man/man1
-# RUN apt-get update && apt-get install -y apt-utils openjdk-11-jre
-RUN apt-get update && apt-get install -y ubuntu-mate-desktop
-RUN apt-get update && apt-get install -y lxde
-RUN apt-get update && apt-get install -y lxqt
-RUN apt-get update && apt-get install -y kde-plasma-desktop
-RUN apt-get update && apt-get install -y cinnamon
-RUN apt-get update && apt-get install -y gnome-session
-RUN apt-get purge -y pm-utils xscreensaver*
-RUN apt-get purge -y clipit magnus kgpg
-
-RUN apt-get update && apt-get install -y python3-pip
-RUN apt-get update && apt-get install -y strace
-RUN apt-get update && apt-get install -y silversearcher-ag
-RUN apt-get update && apt-get install -y libdevel-stacktrace-perl
-
-RUN useradd -m docker
-ENV USER docker
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
-
-ENV KASMVNC_DEVELOPMENT 1
-ENV HOME /home/docker
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-RUN pip3 install --user pipenv
-RUN echo 'PATH="/src/unix:~/.local/bin/:$PATH"' >> ~/.bashrc
-RUN echo 'export PERL5LIB="/src/unix"' >> ~/.bashrc
-RUN echo 'ulimit -c 0' >> ~/.bashrc
-RUN echo 'alias s="vncserver"' >> ~/.bashrc
-RUN echo 'alias k="vncserver -kill :1; pkill baloo_file; pkill gpg-agent; pkill ssh-agent; pkill xiccd"' >> ~/.bashrc
-RUN echo 'alias r="k; s"' >> ~/.bashrc
-RUN echo 'alias go="vncserver; vncserver -kill :1"' >> ~/.bashrc
-RUN echo 'alias ns="netstat -nltup"' >> ~/.bashrc
-RUN echo 'alias tv="./run-specs spec/vncserver_yaml_validation_spec.py"' >> ~/.bashrc
-RUN echo 'alias ty="./run-specs spec/vncserver_*spec.py"' >> ~/.bashrc
-RUN echo 'alias ta="./run-specs"' >> ~/.bashrc
-RUN echo 'alias vd="vncserver -dry-run"' >> ~/.bashrc
-ENV SET_PASSWORD_FUNC 'sp() { echo -e "$VNC_PW\\n$VNC_PW\\n" | kasmvncpasswd -w -u $USER $HOME/.kasmpasswd; }'
-RUN echo $SET_PASSWORD_FUNC >> ~/.bashrc
-
-ENV LC_ALL=C.UTF-8
-ENV LANG=C.UTF-8
-
-ENTRYPOINT ["bash", "-ic", "cd /src && pipenv install; exec bash"]
--- a/builder/dockerfile.ubuntu_jammy.build
+++ b/builder/dockerfile.ubuntu_jammy.build
@@ -1,28 +0,0 @@
-FROM ubuntu:jammy
-
-ENV KASMVNC_BUILD_OS ubuntu
-ENV KASMVNC_BUILD_OS_CODENAME jammy
-ENV XORG_VER 1.20.8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
-
-RUN apt-get update && \
-      apt-get -y install sudo
-
-RUN apt-get update && apt-get install -y --no-install-recommends tzdata
-RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_jammy.deb.build
+++ b/builder/dockerfile.ubuntu_jammy.deb.build
@@ -1,19 +0,0 @@
-FROM ubuntu:jammy
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && \
-      apt-get -y install vim build-essential devscripts equivs
-
-# Install build-deps for the package.
-COPY ./debian/control /tmp
-RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
-
-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
--- a/builder/dockerfile.ubuntu_jammy.deb.test
+++ b/builder/dockerfile.ubuntu_jammy.deb.test
@@ -1,57 +0,0 @@
-FROM ubuntu:jammy
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
-    KASMVNC_BUILD_OS_CODENAME=bionic
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get -y install lsb-release
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install
-
-RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
-  chmod +x ~/.vnc/xstartup
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.ubuntu_jammy.test
+++ b/builder/dockerfile.ubuntu_jammy.test
@@ -1,51 +0,0 @@
-FROM ubuntu:jammy
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
-    KASMVNC_BUILD_OS_CODENAME=jammy
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-COPY build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz /tmp/
-RUN tar -xzvf /tmp/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz --strip 1 -C /
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/os_ver_cli.sh
+++ b/builder/os_ver_cli.sh
@@ -1,15 +1,8 @@
-#!/bin/bash
-
-default_os=${default_os:-ubuntu}
-default_os_codename=${default_os_codename:-bionic}
+default_os=ubuntu
+default_os_codename=bionic

 os=${1:-$default_os}
 os_codename=${2:-$default_os_codename}
-build_tag="$3"
-if [[ -n "$build_tag" ]]; then
-   build_tag_for_images="_${build_tag#+}"
-   build_debian_revision="$(echo $build_tag | tr _ -)"
-fi
 os_image="$os:$os_codename"

 echo "Building for $os_image"
--- a/builder/process_test_options.sh
+++ b/builder/process_test_options.sh
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-usage() {
-  echo >&2 "Usage: $(basename "$0") [-s|--shell] [-p|--perf-test] [-h|--help] <distro> <distro_version>"
-  exit
-}
-
-process_options() {
-   local sorted_options=$(getopt -o psh --long perf-test --long shell --long help -- "$@")
-   eval set -- $sorted_options
-
-   while : ; do
-      case "$1" in
-         -p|--perf-test)
-            entrypoint_args='-interface 0.0.0.0 -selfBench :1'
-            entrypoint_executable="--entrypoint=/usr/bin/Xvnc"
-            shift
-            ;;
-         -s|--shell)
-            entrypoint_executable="--entrypoint=bash"
-            shift
-            ;;
-         -h|--help)
-            print_usage=1
-            ;;
-         --)
-            shift
-            break
-            ;;
-      esac
-   done
-
-   leftover_options=("$@")
-}
-
-declare -a leftover_options
-
-if [ "$#" -eq 0 ]; then
-   usage
-   exit
-fi
-
-process_options "$@"
-set -- "${leftover_options[@]}"
-
-if [ -n "$print_usage" ]; then
-   usage
-   exit
-fi
--- a/builder/run-specs-inside-docker
+++ b/builder/run-specs-inside-docker
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-logfile=/tmp/specs.log
-red='\033[0;31m'
-no_color='\033[0m'
-
-fail_on_perl_warnings() {
-   if grep -qP 'line \d+\.$' "$logfile"; then
-      echo -e "${red}Failure: Perl warnings were found${no_color}"
-      false
-   fi
-}
-
-cd /src
-pipenv install
-./run-specs 2>&1 | tee "$logfile"
-fail_on_perl_warnings
--- a/builder/scripts/build-libjpeg-turbo
+++ b/builder/scripts/build-libjpeg-turbo
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-build_and_install() {
-  export MAKEFLAGS=-j`nproc`
-  export CFLAGS="-fpic"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles"
-  make
-  make install
-}
-
-install_build_dependencies() {
-  install_packages cmake gcc
-  ensure_libjpeg_is_fast
-}
-
-ensure_libjpeg_is_fast() {
-  install_packages nasm
-}
-
-prepare_libjpeg_source() {
-  export JPEG_TURBO_RELEASE=$(curl -sX GET "https://api.github.com/repos/libjpeg-turbo/libjpeg-turbo/releases/latest" \
-  | awk '/tag_name/{print $4;exit}' FS='[""]')
-  mkdir libjpeg-turbo
-  curl -Ls "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_TURBO_RELEASE}.tar.gz" | \
-  tar xzvf - -C libjpeg-turbo/ --strip-components=1
-  cd libjpeg-turbo
-}
-
-source_dir=$(dirname "$0")
-. "$source_dir/common.sh"
-
-install_build_dependencies
-prepare_libjpeg_source
-build_and_install
--- a/builder/scripts/build-webp
+++ b/builder/scripts/build-webp
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-webp_tar_url=https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.4.tar.gz
-
-prepare_source() {
-  cd /tmp
-  wget "$webp_tar_url"
-  tar -xzf /tmp/libwebp-*
-  rm /tmp/libwebp-*.tar.gz
-  cd /tmp/libwebp-*
-}
-
-build_and_install() {
-  export MAKEFLAGS=-j`nproc`
-  ./configure --enable-static --disable-shared
-  make
-  make install
-}
-
-prepare_source
-build_and_install
--- a/builder/scripts/common.sh
+++ b/builder/scripts/common.sh
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-detect_distro() {
-  if [ -f /etc/centos-release ]; then
-    DISTRO=centos
-  elif [ -f /etc/oracle-release ]; then
-    DISTRO=oracle
-  elif [ -f /etc/fedora-release ]; then
-    DISTRO=fedora
-  elif [ -f /usr/bin/zypper ]; then
-    DISTRO=opensuse
-  elif [ -f /etc/alpine-release ]; then
-    DISTRO=alpine
-  else
-    DISTRO=debian
-  fi
-}
-
-install_packages() {
-  local install_cmd=no-command-defined
-
-  case "$DISTRO" in
-    centos) install_cmd="yum install -y" ;;
-    oracle) install_cmd="dnf install -y" ;;
-    fedora) install_cmd="dnf install -y" ;;
-    opensuse) install_cmd="zypper install -y" ;;
-    alpine) install_cmd="apk add" ;;
-    *) install_cmd="apt-get update && apt-get install -y"
-  esac
-
-  eval "$install_cmd $*"
-}
-
-detect_distro
--- a/builder/scripts/install_kasmvncserver_package
+++ b/builder/scripts/install_kasmvncserver_package
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ -n "$1" ]]; then
-  tag="$1"
-fi
-
-is_debian() {
-  [[ -f /etc/debian_version ]]
-}
-
-check_package_version_exists() {
-  if ! stat /tmp/kasmvncserver_"$package_version"*.deb; then
-    >&2 echo "No package found for version $package_version"
-    exit 1
-  fi
-}
-
-remove_tagged_debs_unless_tag_used() {
-  if [[ -n "$tag" ]]; then
-    return
-  fi
-
-  rm -f /tmp/kasmvncserver_*+*.deb
-}
-
-detect_rpm_package_manager() {
-  if command -v dnf >/dev/null; then
-    rpm_package_manager=dnf
-  else
-    rpm_package_manager=yum
-  fi
-}
-
-install_package_built_for_current_branch_package_version_deb() {
-  remove_tagged_debs_unless_tag_used
-
-  apt-get update
-  apt-get install -y dpkg-dev
-  package_version=$(dpkg-parsechangelog --show-field Version \
-    --file /tmp/changelog)
-
-  check_package_version_exists
-  apt-get install -y /tmp/kasmvncserver_"$package_version"*"$tag"*.deb
-}
-
-install_package_built_for_current_branch_package_version_rpm() {
-  detect_rpm_package_manager
-  $rpm_package_manager install -y rpmdevtools
-
-  package_version=$(rpmspec -q --qf '%{version}\n' /tmp/kasmvncserver.spec 2>/dev/null)
-  if [[ $rpm_package_manager = "dnf" ]]; then
-    dnf localinstall -y --allowerasing /tmp/kasmvncserver-"$package_version"*.rpm
-  else
-    yum install -y /tmp/kasmvncserver-"$package_version"*.rpm
-  fi
-}
-
-if is_debian ; then
-  install_package_built_for_current_branch_package_version_deb
-else
-  install_package_built_for_current_branch_package_version_rpm
-fi
--- a/builder/startup/deb/cli-processing.sh
+++ b/builder/startup/deb/cli-processing.sh
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-debug() {
-  if [ -z "$debug" ]; then return; fi
-
-  echo "$@"
-}
-
-enable_debug() {
-  debug=1
-  log_option="-log *:stderr:100"
-}
-
-kill_vnc_server() {
-  vncserver -kill $display
-}
-
-process_cli_options() {
-  for option in "$@"; do
-    case "$option" in
-      --help)
-        show_help
-        exit
-        ;;
-      -d|--debug)
-        enable_debug
-        ;;
-      -k|--kill)
-        kill_vnc_server
-        exit
-        ;;
-      -s|--select-de)
-        action=select-de-and-start
-        ;;
-      *)
-        echo >&2 "Unsupported argument: $option"
-        exit 1
-    esac
-  done
-}
-
-show_help() {
-  cat >&2 <<-USAGE
-Usage: $(basename "$0") [options]
-  -d, --debug      Debug output
-  -k, --kill       Kill vncserver
-  -s, --select-de  Select desktop environent to run
-  --help           Show this help
-USAGE
-}
--- a/builder/startup/deb/kasmvncserver-easy-start
+++ b/builder/startup/deb/kasmvncserver-easy-start
@@ -4,8 +4,43 @@ set -e

 display=:10
 interface=0.0.0.0
+cert_group=ssl-cert

+if [[ "$1" = "--help" ]]; then
+  cat >&2 <<-USAGE
+Usage: `basename $0` [options]
+  -d     Debug output
+  -kill  Kill vncserver
+  --help show this help
+USAGE
+  exit
+fi
+
+if [[ "$1" = "-d" ]]; then
+  log_option="-log *:stderr:100"
+fi
+
+action=start
+if [[ "$1" = "-kill" ]]; then
+  action=kill
+fi
+
+if groups | grep -qvw ssl-cert; then
+  cat <<-EOF
+    Can't access TLS certificate.
+    Please add your user to $cert_group via 'addgroup <user> ssl-cert'
+EOF
+  exit 1
+fi
+
+if [[ "$action" = "kill" ]]; then
+  vncserver -kill $display
+  exit
+fi
+
+vncserver $display -interface $interface
+vncserver -kill $display
 vncserver $display -depth 24 -geometry 1280x1050 -websocketPort 8443 \
  -cert /etc/ssl/certs/ssl-cert-snakeoil.pem \
  -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 \
-  -interface $interface -httpd /usr/share/kasmvnc/www
+  -interface $interface -httpd /usr/share/kasmvnc/www $log_option
--- a/builder/startup/deb/select-de.sh
+++ b/builder/startup/deb/select-de.sh
@@ -1,266 +0,0 @@
-#!/bin/bash
-
-set -e
-
-xstartup_script=~/.vnc/xstartup
-de_was_selected_file="$HOME/.vnc/.de-was-selected"
-
-debug() {
-  if [ -z "$debug" ]; then return; fi
-
-  echo "$@"
-}
-
-enable_debug() {
-  debug=1
-}
-
-process_cli_options() {
-  while [ $# -gt 0 ]; do
-    local option="$1"
-    shift
-
-    case "$option" in
-      --help|-h)
-        show_help
-        exit
-        ;;
-      -d|--debug)
-        enable_debug
-        ;;
-      -y|--assume-yes)
-        assume_yes=1
-        ;;
-      -s|--select-de)
-        action=select-de
-        if [[ -n "$1" && "${1:0:1}" != "-" ]]; then
-          selected_de="$1"
-          assume_yes_for_xstartup_overwrite=1
-          if [ "$selected_de" = "manual" ]; then
-            selected_de="$manual_xstartup_choice"
-          fi
-          shift
-        fi
-        ;;
-      *)
-        echo >&2 "Unsupported argument: $option"
-        exit 1
-    esac
-  done
-}
-
-show_help() {
-  cat >&2 <<-USAGE
-Usage: $(basename "$0") [options]
-  -d, --debug      Debug output
-  -y, --assume-yes Automatic "yes" to prompts
-  -s, --select-de  Select desktop environent to run
-  --help           Show this help
-USAGE
-}
-
-add_uppercase_desktop_environment_keys() {
-  local de_cmd
-
-  for de in "${!all_desktop_environments[@]}"; do
-    de_cmd=${all_desktop_environments[$de]};
-    all_desktop_environments[${de^^}]="$de_cmd"
-  done
-}
-
-manual_xstartup_choice="Manually edit xstartup"
-
-process_cli_options "$@"
-
-declare -A all_desktop_environments=(
-  [Cinnamon]="exec cinnamon-session"
-  [Mate]="XDG_CURRENT_DESKTOP=MATE exec dbus-launch --exit-with-session mate-session"
-  [LXDE]="exec lxsession"
-  [Lxqt]="exec startlxqt"
-  [KDE]="exec startkde"
-  [Gnome]="XDG_CURRENT_DESKTOP=GNOME exec dbus-launch --exit-with-session /usr/bin/gnome-session"
-  [XFCE]="exec xfce4-session")
-
-readarray -t sorted_desktop_environments < <(for de in "${!all_desktop_environments[@]}"; do echo "$de"; done | sort)
-
-all_desktop_environments[$manual_xstartup_choice]=""
-sorted_desktop_environments+=("$manual_xstartup_choice")
-add_uppercase_desktop_environment_keys
-
-detected_desktop_environments=()
-declare -A numbered_desktop_environments
-
-print_detected_desktop_environments() {
-  declare -i i=1
-
-  echo "Please choose Desktop Environment to run:"
-  for detected_de in "${detected_desktop_environments[@]}"; do
-    echo "[$i] $detected_de"
-    numbered_desktop_environments[$i]=$detected_de
-    i+=1
-  done
-}
-
-detect_desktop_environments() {
-  for de_name in "${sorted_desktop_environments[@]}"; do
-    if [[ "$de_name" = "$manual_xstartup_choice" ]]; then
-      detected_desktop_environments+=("$de_name")
-      continue;
-    fi
-
-    local executable=${all_desktop_environments[$de_name]}
-    executable=($executable)
-    executable=${executable[-1]}
-
-    if detect_desktop_environment "$de_name" "$executable"; then
-      detected_desktop_environments+=("$de_name")
-    fi
-  done
-}
-
-ask_user_to_choose_de() {
-  while : ; do
-    print_detected_desktop_environments
-    read -r de_number_to_run
-    if [[ -z "$de_number_to_run" ]]; then
-      continue
-    fi
-    de_name_from_number "$de_number_to_run"
-    if [[ -n "$de_name" ]]; then
-      break;
-    fi
-
-    echo "Incorrect number: $de_number_to_run"
-    echo
-  done
-}
-
-remember_de_choice() {
-  touch "$de_was_selected_file"
-}
-
-de_was_selected_on_previous_run() {
-  [[ -f "$de_was_selected_file" ]]
-}
-
-detect_desktop_environment() {
-  local de_name="$1"
-  local executable="$2"
-
-  if command -v "$executable" &>/dev/null; then
-    return 0
-  fi
-
-  return 1
-}
-
-did_user_forbid_replacing_xstartup() {
-  grep -q -v KasmVNC-safe-to-replace-this-file "$xstartup_script"
-}
-
-de_cmd_from_name() {
-  de_cmd=${all_desktop_environments[${de_name^^}]}
-}
-
-de_name_from_number() {
-  local de_number_to_run="$1"
-
-  de_name=${numbered_desktop_environments[$de_number_to_run]}
-}
-
-warn_xstartup_will_be_overwriten() {
-  if [[ -n "$assume_yes" || -n "$assume_yes_for_xstartup_overwrite" ]]; then
-    return 0
-  fi
-
-  if [ ! -f "$xstartup_script" ]; then
-    return 0
-  fi
-
-  echo -n "WARNING: $xstartup_script will be overwritten y/N?"
-  read -r do_overwrite_xstartup
-  if [[ "$do_overwrite_xstartup" = "y" || "$do_overwrite_xstartup" = "Y" ]]; then
-    return 0
-  fi
-
-  return 1
-}
-
-setup_de_to_run_via_xstartup() {
-  warn_xstartup_will_be_overwriten
-  generate_xstartup "$de_name"
-}
-
-generate_xstartup() {
-  local de_name="$1"
-
-  de_cmd_from_name
-
-  cat <<-SCRIPT > "$xstartup_script"
-#!/bin/sh
-$de_cmd
-SCRIPT
-  chmod +x "$xstartup_script"
-}
-
-user_asked_to_select_de() {
-  [[ "$action" = "select-de" ]]
-}
-
-user_specified_de() {
-  [ -n "$selected_de" ]
-}
-
-check_de_name_is_valid() {
-  local selected_de="$1"
-  if [[ "$selected_de" = "$manual_xstartup_choice" ]]; then
-    return 0;
-  fi
-
-  local de_cmd=${all_desktop_environments["${selected_de^^}"]:-}
-  if [ -z "$de_cmd" ]; then
-    echo >&2 "'$selected_de': not supported Desktop Environment"
-    return 1
-  fi
-}
-
-de_installed() {
-  local de_name="${1^^}"
-
-  for de in "${detected_desktop_environments[@]}"; do
-    if [ "${de^^}" = "$de_name" ]; then
-      return 0
-    fi
-  done
-
-  return 1
-}
-
-check_de_installed() {
-  local de_name="$1"
-
-  if ! de_installed "$de_name"; then
-    echo >&2 "'$de_name': Desktop Environment not installed"
-    return 1
-  fi
-}
-
-if user_asked_to_select_de || ! de_was_selected_on_previous_run; then
-  if user_specified_de; then
-    check_de_name_is_valid "$selected_de"
-  fi
-
-  detect_desktop_environments
-  if user_specified_de; then
-    check_de_installed "$selected_de"
-    de_name="$selected_de"
-  else
-    ask_user_to_choose_de
-  fi
-
-  debug "You selected $de_name desktop environment"
-  if [[ "$de_name" != "$manual_xstartup_choice" ]]; then
-    setup_de_to_run_via_xstartup
-  fi
-  remember_de_choice
-fi
--- a/builder/startup/vnc_startup.sh
+++ b/builder/startup/vnc_startup.sh
@@ -12,6 +12,28 @@ cleanup () {
 }
 trap cleanup SIGINT SIGTERM

+detect_www_dir() {
+  local package_www_dir="/usr/share/kasmvnc/www"
+  if [[ -d "$package_www_dir" ]]; then
+    package_www_dir_option="-httpd $package_www_dir"
+  fi
+}
+
+detect_cert_location() {
+  local tarball_cert="$HOME/.vnc/self.pem"
+  local deb_cert="/etc/ssl/certs/ssl-cert-snakeoil.pem"
+  local deb_key="/etc/ssl/private/ssl-cert-snakeoil.key"
+  local rpm_cert="/etc/pki/tls/private/kasmvnc.pem"
+
+  if [[ -f "$deb_cert" ]]; then
+    cert_option="-cert $deb_cert -key $deb_key"
+  elif [[ -f "$rpm_cert" ]]; then
+    cert_option="-cert $rpm_cert"
+  else
+    cert_option="-cert $tarball_cert"
+  fi
+}
+
 add_vnc_user() {
  local username="$1"
  local password="$2"
@@ -39,6 +61,9 @@ kasmvncpasswd -d -u "$VNC_USER-to-delete" $HOME/.kasmpasswd
 chmod 0600 $HOME/.kasmpasswd
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout $HOME/.vnc/self.pem -out $HOME/.vnc/self.pem -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=kasm/emailAddress=none@none.none"

+vncserver :1 -interface 0.0.0.0
+vncserver -kill :1
+
 if [[ -f $PASSWD_PATH ]]; then
    rm -f $PASSWD_PATH
 fi
@@ -59,10 +84,14 @@ vncserver -kill $DISPLAY &> $HOME/.vnc/vnc_startup.log \
    || echo "no locks present"


-[ -n "$KASMVNC_VERBOSE_LOGGING" ] && verbose_logging_option="-debug"
+detect_www_dir
+detect_cert_location
+[ -n "$KASMVNC_VERBOSE_LOGGING" ] && verbose_logging_option="-log *:stderr:100"
+
+# dbus-daemon --session --address=systemd: --nofork --nopidfile --syslog-only &

 echo -e "start vncserver with param: VNC_COL_DEPTH=$VNC_COL_DEPTH, VNC_RESOLUTION=$VNC_RESOLUTION\n..."
-vncserver $DISPLAY -select-de xfce -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -FrameRate=$MAX_FRAME_RATE -websocketPort $VNC_PORT $VNCOPTIONS $verbose_logging_option #&> $STARTUPDIR/no_vnc_startup.log
+vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -FrameRate=$MAX_FRAME_RATE -websocketPort $VNC_PORT $cert_option -sslOnly -interface 0.0.0.0 $VNCOPTIONS $package_www_dir_option $verbose_logging_option #&> $STARTUPDIR/no_vnc_startup.log

 PID_SUN=$!

--- a/builder/startup/vnc_startup_barebones.sh
+++ b/builder/startup/vnc_startup_barebones.sh
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-set_xterm_to_run() {
-  mkdir "$config_dir"
-  echo '/usr/bin/xterm &' >> "$xstartup"
-  chmod +x "$xstartup"
-}
-
-create_kasm_user() {
-  echo -e "$VNC_PW\n$VNC_PW\n" | kasmvncpasswd -w -u "$VNC_USER"
-}
-
-config_dir="$HOME/.vnc"
-xstartup="$config_dir/xstartup"
-
-set_xterm_to_run
-create_kasm_user
-
-vncserver -select-de manual -websocketPort "$VNC_PORT"
-tail -f "$config_dir"/*.log
--- a/builder/test-deb
+++ b/builder/test-deb
@@ -2,21 +2,13 @@

 set -e

-cd "$(dirname "$0")/.."
-. ./builder/process_test_options.sh
-. ./builder/os_ver_cli.sh
-. ./builder/common.sh
+cd "$(dirname "$0")"
+. ./os_ver_cli.sh

-tester_image="builder/kasmvnctester_${os}:$os_codename${build_tag_for_images}"
-docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
-  --build-arg BUILD_DEBIAN_REVISION="$build_debian_revision" \
-  -t "$tester_image" \
-  -f "builder/dockerfile.${os}_${os_codename}${build_tag}.deb.test" .
-
-docker run -it -p "443:$VNC_PORT" --rm \
+docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
+  -t kasmvnctester_${os}:$os_codename \
+  -f dockerfile.${os}_${os_codename}.deb.test .
+docker run -it -p 443:8443 --rm \
  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  -e "VNC_PORT=$VNC_PORT" \
-  $entrypoint_executable \
-  "$tester_image" \
-  $entrypoint_args
+  kasmvnctester_${os}:$os_codename
--- a/builder/test-deb-barebones
+++ b/builder/test-deb-barebones
@@ -2,18 +2,13 @@

 set -e

-cd "$(dirname "$0")/.."
-. ./builder/process_test_options.sh
-. ./builder/common.sh
+cd "$(dirname "$0")"
 os="${1:-debian}"
 os_codename="${2:-buster}"

-docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
+docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
  -t kasmvnctester_barebones_${os}:$os_codename \
-  -f builder/dockerfile.${os}_${os_codename}.barebones.deb.test .
+  -f dockerfile.${os}_${os_codename}.barebones.deb.test .
 echo
-docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  -e "VNC_PORT=$VNC_PORT" \
-  $entrypoint_executable \
-  kasmvnctester_barebones_${os}:$os_codename \
-  $entrypoint_args
+docker run -it -p 443:8443 --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
+  kasmvnctester_barebones_${os}:$os_codename
--- a/builder/test-rpm
+++ b/builder/test-rpm
@@ -2,21 +2,16 @@

 set -e

-cd "$(dirname "$0")/.."
-. ./builder/process_test_options.sh
-. ./builder/os_ver_cli.sh
-. ./builder/common.sh
+cd "$(dirname "$0")"
+. ./os_ver_cli.sh

 echo kasmvnctester_${os}:$os_codename
 docker build --build-arg \
-  KASMVNC_PACKAGE_DIR="builder/build/${os}_${os_codename}" \
+  KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
  -t kasmvnctester_${os}:$os_codename \
-  -f builder/dockerfile.${os}_${os_codename}.rpm.test .
+  -f dockerfile.${os}_${os_codename}.rpm.test .

-docker run -it -p "443:$VNC_PORT" --rm \
+docker run -it -p 443:8443 --rm \
  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  -e "VNC_PORT=$VNC_PORT" \
-  $entrypoint_executable \
-  kasmvnctester_${os}:$os_codename \
-  $entrypoint_args
+  kasmvnctester_${os}:$os_codename
--- a/builder/test-rpm-barebones
+++ b/builder/test-rpm-barebones
@@ -3,16 +3,11 @@
 set -e

 cd "$(dirname "$0")"
-. ./process_test_options.sh
-. ./common.sh
 os="${1:-centos}"
 os_codename="${2:-core}"

 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
  -t kasmvnctester_barebones_${os}:$os_codename \
  -f dockerfile.${os}_${os_codename}.barebones.rpm.test .
-docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  -e "VNC_PORT=$VNC_PORT" \
-  $entrypoint_executable \
-  kasmvnctester_barebones_${os}:$os_codename \
-  $entrypoint_args
+docker run -it -p 443:8443 --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
+  kasmvnctester_barebones_${os}:$os_codename
--- a/builder/test-vncserver
+++ b/builder/test-vncserver
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-default_os=ubuntu
-default_os_codename=focal
-
-. ./builder/os_ver_cli.sh
-
-if [[ -n "$GITLAB_CI" ]]; then
-  package_dir="output/${os_codename}"
-else
-  package_dir="builder/build/${os_codename}"
-fi
-
-docker build --build-arg KASMVNC_PACKAGE_DIR="$package_dir" \
-  -t kasmvnctester_${os}:$os_codename \
-  -f builder/dockerfile.${os}_${os_codename}.specs.test .
-docker run -v $(realpath ${PWD}):/src \
-  --rm \
-  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
-  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  kasmvnctester_${os}:$os_codename
--- a/centos/kasmvncserver.spec
+++ b/centos/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.1.0
+Version:        0.9.1~beta
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser

@@ -7,21 +7,29 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC

 BuildRequires: rsync
-Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny
+Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl
 Conflicts: tigervnc-server, tigervnc-server-minimal

 %description
-KasmVNC provides remote web-based access to a Desktop or application.
-While VNC is in the name, KasmVNC differs from other VNC variants such
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
-specification which defines VNC, in order to support modern technologies
-and increase security. KasmVNC is accessed by users from any modern
-browser and does not support legacy VNC viewer applications. KasmVNC
-uses a modern YAML based configuration at the server and user level,
-allowing for ease of management. KasmVNC is maintained by Kasm
-Technologies Corp, www.kasmweb.com.
+VNC stands for Virtual Network Computing. It is, in essence, a remote
+display system which allows you to view a computing `desktop' environment
+not only on the machine where it is running, but from anywhere on the
+Internet and from a wide variety of machine architectures.

-WARNING: this package requires EPEL.
+KasmVNC has different goals than TigerVNC:
+
+Web-based - KasmVNC is designed to provide a web accessible remote desktop.
+It comes with a web server and web-socket server built in. There is no need to
+install other components. Simply run and navigate to your desktop's URL on the
+port you specify. While you can still tun on the legacy VNC port, it is
+disabled by default.
+
+Security - KasmVNC defaults to HTTPS and allows for HTTP Basic Auth. VNC
+Password authentication is limited by specification to 8 characters and is not
+sufficient for use on an internet accessible remote desktop. Our goal is to
+create a by default secure, web based experience.
+
+Simplicity - KasmVNC aims at being simple to deploy and configure.

 %prep

@@ -40,61 +48,31 @@ DESTDIR=$RPM_BUILD_ROOT
 DST_MAN=$DESTDIR/usr/share/man/man1

 mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1 \
-  $DESTDIR/usr/share/doc/kasmvncserver $DESTDIR/usr/lib \
-  $DESTDIR/usr/share/perl5 $DESTDIR/etc/kasmvnc
-
+  $DESTDIR/usr/share/doc/kasmvncserver
 cp $SRC_BIN/Xvnc $DESTDIR/usr/bin;
 cp $SRC_BIN/vncserver $DESTDIR/usr/bin;
-cp -a $SRC_BIN/KasmVNC $DESTDIR/usr/share/perl5/
 cp $SRC_BIN/vncconfig $DESTDIR/usr/bin;
 cp $SRC_BIN/kasmvncpasswd $DESTDIR/usr/bin;
-cp $SRC_BIN/kasmxproxy $DESTDIR/usr/bin;
-cp -r $SRC/lib/kasmvnc/ $DESTDIR/usr/lib/kasmvncserver
 cd $DESTDIR/usr/bin && ln -s kasmvncpasswd vncpasswd;
 cp -r $SRC/share/doc/kasmvnc*/* $DESTDIR/usr/share/doc/kasmvncserver/
-rsync -r --links --safe-links --exclude '.git*' --exclude po2js --exclude xgettext-html \
-  --exclude www/utils/ --exclude .eslintrc --exclude configure \
+rsync -r --exclude '.git*' --exclude po2js --exclude xgettext-html \
+  --exclude www/utils/ --exclude .eslintrc \
  $SRC/share/kasmvnc $DESTDIR/usr/share
-
-sed -i -e 's!pem_certificate: .\+$!pem_certificate: /etc/pki/tls/private/kasmvnc.pem!' \
-    $DESTDIR/usr/share/kasmvnc/kasmvnc_defaults.yaml
-sed -i -e 's!pem_key: .\+$!pem_key: /etc/pki/tls/private/kasmvnc.pem!' \
-    $DESTDIR/usr/share/kasmvnc/kasmvnc_defaults.yaml
-sed -e 's/^\([^#]\)/# \1/' $DESTDIR/usr/share/kasmvnc/kasmvnc_defaults.yaml > \
-  $DESTDIR/etc/kasmvnc/kasmvnc.yaml
 cp $SRC/man/man1/Xvnc.1 $DESTDIR/usr/share/man/man1/;
 cp $SRC/share/man/man1/vncserver.1 $DST_MAN;
 cp $SRC/share/man/man1/vncconfig.1 $DST_MAN;
 cp $SRC/share/man/man1/vncpasswd.1 $DST_MAN;
-cp $SRC/share/man/man1/kasmxproxy.1 $DST_MAN;
 cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;

-
 %files
-%config(noreplace) /etc/kasmvnc
-
 /usr/bin/*
-/usr/lib/kasmvncserver
 /usr/share/man/man1/*
-/usr/share/perl5/KasmVNC
-/usr/share/kasmvnc
+/usr/share/kasmvnc/www

 %license /usr/share/doc/kasmvncserver/LICENSE.TXT
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
-* Wed Apr 05 2023 KasmTech <info@kasmweb.com> - 1.1.0-1
- Upstream release
-* Tue Nov 29 2022 KasmTech <info@kasmweb.com> - 1.0.0-1
- WebRTC UDP transit support with support of STUN servers
- Lossless compression using multi-threaded WASM QOI decoder client side
- New yaml based configuration
- Significantly improved FPS through both client-side and server-side improvements.
- Support for the admin to define arbitrary http response headers for the built in web server
- Support for additional mouse buttons
- Refinement of vncserver checks and user prompts
- Added send_full_frame to developer API, forces full frame to be sent to all connected users that have at least read permission.
-* Tue Mar 22 2022 KasmTech <info@kasmweb.com> - 0.9.3~beta-1
 * Fri Feb 12 2021 KasmTech <info@kasmweb.com> - 0.9.1~beta-1
 - Initial release of the rpm package.

--- a/common/network/Blacklist.cxx
+++ b/common/network/Blacklist.cxx
@@ -1,85 +0,0 @@
-/* Copyright (C) 2021 Kasm
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <map>
-#include <string>
-
-#include <network/Blacklist.h>
-#include <rfb/Blacklist.h>
-
-static std::map<std::string, unsigned> hits;
-static std::map<std::string, time_t> blacklist;
-
-static pthread_mutex_t hitmutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t blmutex = PTHREAD_MUTEX_INITIALIZER;
-
-unsigned char bl_isBlacklisted(const char *addr) {
-	const unsigned char count = blacklist.count(addr);
-	if (!count)
-		return 0;
-
-	const time_t now = time(NULL);
-	const unsigned timeout = rfb::Blacklist::initialTimeout;
-
-	if (pthread_mutex_lock(&blmutex))
-		abort();
-
-	if (now - timeout > blacklist[addr]) {
-		blacklist.erase(addr);
-		pthread_mutex_unlock(&blmutex);
-
-		if (pthread_mutex_lock(&hitmutex))
-			abort();
-		hits.erase(addr);
-		pthread_mutex_unlock(&hitmutex);
-		return 0;
-	} else {
-		blacklist[addr] = now;
-		pthread_mutex_unlock(&blmutex);
-		return 1;
-	}
-}
-
-void bl_addFailure(const char *addr) {
-	if (!rfb::Blacklist::threshold)
-		return;
-
-	if (pthread_mutex_lock(&hitmutex))
-		abort();
-	const unsigned num = ++hits[addr];
-	pthread_mutex_unlock(&hitmutex);
-
-	if (num >= (unsigned) rfb::Blacklist::threshold) {
-		if (pthread_mutex_lock(&blmutex))
-			abort();
-		blacklist[addr] = time(NULL);
-		pthread_mutex_unlock(&blmutex);
-	}
-}
--- a/common/network/Blacklist.h
+++ b/common/network/Blacklist.h
@@ -1,33 +0,0 @@
-/* Copyright (C) 2021 Kasm
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#ifndef __NETWORK_BLACKLIST_H__
-#define __NETWORK_BLACKLIST_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-unsigned char bl_isBlacklisted(const char *);
-void bl_addFailure(const char *);
-
-#ifdef __cplusplus
-} // extern C
-#endif
-
-#endif // __NETWORK_TCP_SOCKET_H__
--- a/common/network/CMakeLists.txt
+++ b/common/network/CMakeLists.txt
@@ -2,30 +2,10 @@ include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/unix/kasmvncp

 set(NETWORK_SOURCES
  GetAPIMessager.cxx
-  Blacklist.cxx
-  iceip.cxx
  Socket.cxx
  TcpSocket.cxx
-  Udp.cxx
-  cJSON.c
-  jsonescape.c
  websocket.c
  websockify.c
-
-  webudp/CRC32.cpp
-  webudp/WuArena.cpp
-  webudp/Wu.cpp
-  webudp/WuCrypto.cpp
-  webudp/WuHostEpoll.cpp
-  webudp/WuNetwork.cpp
-  webudp/WuPool.cpp
-  webudp/WuQueue.cpp
-  webudp/WuRng.cpp
-  webudp/WuSctp.cpp
-  webudp/WuSdp.cpp
-  webudp/WuString.cpp
-  webudp/WuStun.cpp
-
  ${CMAKE_SOURCE_DIR}/unix/kasmvncpasswd/kasmpasswd.c)

 if(NOT WIN32)
--- a/common/network/GetAPI.h
+++ b/common/network/GetAPI.h
@@ -21,12 +21,9 @@

 #include <kasmpasswd.h>
 #include <pthread.h>
-#include <network/GetAPIEnums.h>
 #include <rfb/PixelBuffer.h>
 #include <rfb/PixelFormat.h>
 #include <stdint.h>
-#include <map>
-#include <string>
 #include <vector>

 namespace network {
@@ -37,61 +34,24 @@ namespace network {

    // from main thread
    void mainUpdateScreen(rfb::PixelBuffer *pb);
-    void mainUpdateBottleneckStats(const char userid[], const char stats[]);
-    void mainClearBottleneckStats(const char userid[]);
-    void mainUpdateServerFrameStats(uint8_t changedPerc, uint32_t all,
-                                    uint32_t jpeg, uint32_t webp, uint32_t analysis,
-                                    uint32_t jpegarea, uint32_t webparea,
-                                    uint16_t njpeg, uint16_t nwebp,
-                                    uint16_t enc, uint16_t scale, uint16_t shot,
-                                    uint16_t w, uint16_t h);
-    void mainUpdateClientFrameStats(const char userid[], uint32_t render, uint32_t all,
-                                    uint32_t ping);
-    void mainUpdateUserInfo(const uint8_t ownerConn, const uint8_t numUsers);

    // from network threads
    uint8_t *netGetScreenshot(uint16_t w, uint16_t h,
                              const uint8_t q, const bool dedup,
                              uint32_t &len, uint8_t *staging);
-    uint8_t netAddUser(const char name[], const char pw[],
-                       const bool read, const bool write, const bool owner);
+    uint8_t netAddUser(const char name[], const char pw[], const bool write);
    uint8_t netRemoveUser(const char name[]);
-    uint8_t netUpdateUser(const char name[], const uint64_t mask,
-                          const char password[],
-                          const bool read, const bool write, const bool owner);
-    uint8_t netAddOrUpdateUser(const struct kasmpasswd_entry_t *entry);
-    void netGetUsers(const char **ptr);
-    void netGetBottleneckStats(char *buf, uint32_t len);
-    void netGetFrameStats(char *buf, uint32_t len);
-    void netResetFrameStatsCall();
-    uint8_t netServerFrameStatsReady();
-    void netUdpUpgrade(void *client, uint32_t ip);
-    void netClearClipboard();
+    uint8_t netGiveControlTo(const char name[]);

    enum USER_ACTION {
-      NONE,
-      WANT_FRAME_STATS_SERVERONLY,
-      WANT_FRAME_STATS_ALL,
-      WANT_FRAME_STATS_OWNER,
-      WANT_FRAME_STATS_SPECIFIC,
-      UDP_UPGRADE,
-      CLEAR_CLIPBOARD,
+      //USER_ADD, - handled locally for interactivity
+      USER_REMOVE,
+      USER_GIVE_CONTROL,
    };

-    uint8_t netRequestFrameStats(USER_ACTION what, const char *client);
-    uint8_t netOwnerConnected();
-    uint8_t netNumActiveUsers();
-    uint8_t netGetClientFrameStatsNum();
-
    struct action_data {
      enum USER_ACTION action;
-      union {
-        kasmpasswd_entry_t data;
-        struct {
-          void *client;
-          uint32_t ip;
-        } udp;
-      };
+      kasmpasswd_entry_t data;
    };

    pthread_mutex_t userMutex;
@@ -108,40 +68,6 @@ namespace network {
    std::vector<uint8_t> cachedJpeg;
    uint16_t cachedW, cachedH;
    uint8_t cachedQ;
-
-    std::map<std::string, std::string> bottleneckStats;
-    pthread_mutex_t statMutex;
-
-    struct clientFrameStats_t {
-      uint32_t render;
-      uint32_t all;
-      uint32_t ping;
-    };
-    struct serverFrameStats_t {
-      uint32_t all;
-      uint32_t jpeg;
-      uint32_t webp;
-      uint32_t analysis;
-      uint32_t jpegarea;
-      uint32_t webparea;
-      uint16_t njpeg;
-      uint16_t nwebp;
-      uint16_t enc;
-      uint16_t scale;
-      uint16_t shot;
-      uint16_t w;
-      uint16_t h;
-      uint8_t changedPerc;
-
-      uint8_t inprogress;
-    };
-    std::map<std::string, clientFrameStats_t> clientFrameStats;
-    serverFrameStats_t serverFrameStats;
-    pthread_mutex_t frameStatMutex;
-
-    uint8_t ownerConnected;
-    uint8_t activeUsers;
-    pthread_mutex_t userInfoMutex;
  };

 }
--- a/common/network/GetAPIEnums.h
+++ b/common/network/GetAPIEnums.h
@@ -1,30 +0,0 @@
-/* Copyright (C) 2021 Kasm
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#ifndef __NETWORK_GET_API_ENUMS_H__
-#define __NETWORK_GET_API_ENUMS_H__
-
-// Enums that need accessibility from both C and C++.
-enum USER_UPDATE_MASK {
-	USER_UPDATE_WRITE_MASK = 1 << 0,
-	USER_UPDATE_OWNER_MASK = 1 << 1,
-	USER_UPDATE_PASSWORD_MASK = 1 << 2,
-	USER_UPDATE_READ_MASK = 1 << 3,
-};
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dmitry Maksyoma	0df8de241e	More XDG work I'll probably never need	2021-07-01 20:08:49 +12:00
Dmitry Maksyoma	905a65b0cd	Proof of concept xdg-portal KDE + Firefox	2021-06-18 07:53:27 +12:00