Update noVNC ref to tip of 1.2.0

update novnc ref, bump package version to 1.3.0
Merge branch 'bugfix/KASM-5524_watermark_rotation_negative_number' into 'master'
2024-02-09 13:44:36 -05:00 · 2024-02-05 14:34:44 -05:00 · 2024-01-30 18:26:11 +00:00 · 2024-01-30 17:00:11 +00:00 · 2024-01-30 11:59:12 -05:00 · 2024-01-30 16:44:31 +00:00
139 changed files with 7518 additions and 401 deletions
--- a/.ci/upload.sh
+++ b/.ci/upload.sh
@@ -89,3 +89,26 @@ detect_revision() {
  REVISION=$(echo "$package" | sed "s/_${arch}.\+//" | sed 's/.\++//')
 }
 make_index_html() {
  local body=""
  local bname
  for f in "$@"; do
    bname=$(basename "$f")
    body="${body}<a href=/$f>$bname</a><br>"
  done
  cat <<EOF
 <!doctype html>
 <html lang=en>
 <head>
 	<meta charset=utf-8>
 	<title>KasmVNC preview build</title>
 </head>
 <body>
 $body
 </body>
 </html>
 EOF
 }
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
 ---
 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
@@ -0,0 +1,27 @@
 ---
 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
@@ -0,0 +1,46 @@
 ---
 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/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,18 @@ 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
+  GIT_FETCH_EXTRA_FLAGS: --tags --force
  # 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: tcp://docker:2375
  DOCKER_TLS_CERTDIR: ""
 workflow:
  rules:
    # Disable tag builds.
    - if: $CI_COMMIT_TAG != $CI_COMMIT_REF_NAME
 stages:
  - www
@@ -30,9 +37,15 @@ stages:
  - cp -r builder/build/* output/
  - rm output/*.tar.gz
 default:
  tags:
    - oci-fixed-amd
 build_www:
  stage: www
  allow_failure: false
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
  script:
@@ -42,6 +55,9 @@ build_www:
    - 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:
@@ -53,6 +69,8 @@ build_www:
 build_ubuntu_bionic:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -71,7 +89,7 @@ build_ubuntu_bionic_arm:
  stage: build
  allow_failure: false
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -86,26 +104,11 @@ build_ubuntu_bionic_arm:
    paths:
      - output/
 build_ubuntu_bionic_libjpeg_turbo:
  stage: build
  allow_failure: false
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package ubuntu bionic +libjpeg-turbo_latest
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_ubuntu_focal:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -124,7 +127,7 @@ build_ubuntu_focal_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -142,6 +145,8 @@ build_ubuntu_focal_arm:
 build_ubuntu_jammy:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -160,7 +165,7 @@ build_ubuntu_jammy_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -178,6 +183,8 @@ build_ubuntu_jammy_arm:
 build_debian_buster:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -187,7 +194,7 @@ build_debian_buster:
    - bash builder/build-package debian buster;
  only:
    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
@@ -196,7 +203,7 @@ build_debian_buster_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -206,7 +213,7 @@ build_debian_buster_arm:
    - bash builder/build-package debian buster;
  only:
    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
@@ -214,6 +221,8 @@ build_debian_buster_arm:
 build_debian_bullseye:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -223,7 +232,7 @@ build_debian_bullseye:
    - bash builder/build-package debian bullseye;
  only:
    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
@@ -232,7 +241,7 @@ build_debian_bullseye_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -242,7 +251,46 @@ build_debian_bullseye_arm:
    - bash builder/build-package debian bullseye;
  only:
    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_debian_bookworm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package debian bookworm;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_debian_bookworm_arm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package debian bookworm;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
@@ -250,6 +298,8 @@ build_debian_bullseye_arm:
 build_kali_rolling:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -268,7 +318,7 @@ build_kali_rolling_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -286,6 +336,8 @@ build_kali_rolling_arm:
 build_centos7:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -303,6 +355,8 @@ build_centos7:
 build_oracle_8:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -321,7 +375,7 @@ build_oracle_8_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -336,9 +390,49 @@ build_oracle_8_arm:
    paths:
      - output/
 build_oracle_9:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  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-arm
  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
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -357,7 +451,7 @@ build_opensuse_15_arm:
  stage: build
  allow_failure: true
  tags:
-    - arm
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -372,16 +466,252 @@ build_opensuse_15_arm:
    paths:
      - output/
 build_fedora_thirtyseven:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  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-arm
  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_thirtyeight:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package fedora thirtyeight;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_fedora_thirtyeight_arm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package fedora thirtyeight;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_fedora_thirtynine:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package fedora thirtynine;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_fedora_thirtynine_arm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package fedora thirtynine;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_alpine_317:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  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-arm
  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
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
  script:
    - bash builder/test-vncserver
 build_alpine_318:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package alpine 318;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_alpine_318_arm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package alpine 318;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_alpine_319:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package alpine 319;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 build_alpine_319_arm:
  stage: build
  allow_failure: true
  tags:
    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
    - bash builder/build-package alpine 319;
  only:
    variables:
      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
 upload:
  stage: upload
  image: ubuntu:focal
  tags:
    - oci-fixed-amd
  artifacts:
    paths:
      - output/
  before_script:
    - . .ci/upload.sh
  script:
@@ -398,12 +728,34 @@ upload:
      done
    - export S3_BUILD_DIRECTORY="kasmvnc/${CI_COMMIT_SHA}"
    - export RELEASE_VERSION=$(.ci/next_release_version "$CI_COMMIT_REF_NAME")
-    - for package in `find output/ -type f -name '*.deb' -or -name '*.rpm'`; do
+    - uploaded_files=()
    - for package in `find output/ -type f -name '*.deb' -or -name '*.rpm' -or -name '*.tgz'`; 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)##');
+        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}";
        uploaded_files+=("$upload_filename");
      done
    - make_index_html "${uploaded_files[@]}" > output/index.html;
 upload_build_preview:
  stage: upload
  needs: ["upload"]
  dependencies: ["upload"]
  image: ubuntu:focal
  tags:
    - oci-fixed-amd
  before_script:
    - . .ci/upload.sh
  resource_group: upload_build_preview
  only:
    variables:
      - $CI_COMMIT_BRANCH == 'master'
  script:
    - prepare_to_run_scripts_and_s3_uploads
    - preview_builds_dir=kasmvnc/preview-builds
    - upload_to_s3 "output/index.html" "$preview_builds_dir/index.html" "$S3_BUCKET"
    - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=index.html&target_url=${S3_URL}";
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = master
+	branch = release/1.2.0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,9 +148,17 @@ endif()
 # Check for zlib
 find_package(ZLIB REQUIRED)
 # Check for libpng
 find_package(PNG REQUIRED)
 # Check for libjpeg
 find_package(JPEG REQUIRED)
 find_package(Freetype REQUIRED)
 include_directories(${FREETYPE_INCLUDE_DIRS})
 # 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})
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ KasmVNC is configured via YAML based configurations. The server level configurat
 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/kasmvnc/docs/latest/index.html).
+For a full description of each setting see the [configuration reference](https://www.kasmweb.com/kasmvnc/docs/latest/configuration.html).
 ```yaml
 desktop:
@@ -101,6 +101,9 @@ desktop:
    height: 768
  allow_resize: true
  pixel_depth: 24
  gpu:
    hw3d: false
    drinode: /dev/dri/renderD128
 network:
  protocol: http
@@ -228,6 +231,7 @@ command_line:
 # 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
@@ -255,6 +259,7 @@ command_line:
  - 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:
--- a/builder/README.md
+++ b/builder/README.md
@@ -48,6 +48,18 @@ 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
--- a/builder/build-apk
+++ b/builder/build-apk
@@ -0,0 +1,17 @@
 #!/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
@@ -0,0 +1,11 @@
 #!/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-package
+++ b/builder/build-package
@@ -10,6 +10,8 @@ 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
 }
--- 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/kasmvncserver.spec ~/rpmbuild/SPECS/
+  cp /tmp/*.spec ~/rpmbuild/SPECS/
  cp /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \
    ~/rpmbuild/SOURCES/
 }
@@ -30,6 +30,6 @@ fi
 os_dir="build/${os}_${os_codename}"
 prepare_build_env
-rpmbuild -ba ~/rpmbuild/SPECS/kasmvncserver.spec
+rpmbuild -ba ~/rpmbuild/SPECS/*.spec
 copy_rpm_to_build_dir
 rpmlint "$os_dir"/*.rpm || true
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -40,14 +40,14 @@ EOF
 #sudo apt-get install cmake git libjpeg-dev libgnutls-dev
 # Gcc12 builds fail due to bug
-fail_on_gcc_12
+#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.bz2
+wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.gz
 #git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git
 #cd kasmvnc
@@ -64,9 +64,10 @@ cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF \
  -DENABLE_GNUTLS:BOOL=OFF
 make -j5
-tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.bz2 --strip-components=1
+tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
 cd unix/xserver
 # Apply patches
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
 case "$XORG_VER" in
  1.20.*)
@@ -85,22 +86,42 @@ autoreconf -i
 # 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" ]; then
+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
-./configure --prefix=/opt/kasmweb \
+
-	--with-xkb-path=/usr/share/X11/xkb \
+# build X11
-	--with-xkb-output=/var/lib/xkb \
+./configure \
-	--with-xkb-bin-directory=/usr/bin \
+    --disable-config-hal \
-	--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" \
+    --disable-config-udev \
-  --with-sha1=libcrypto \
+    --disable-dmx \
-	--without-dtrace --disable-dri \
+    --disable-dri \
-        --disable-static \
+    --disable-dri2 \
-	--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
+    --disable-kdrive \
-	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
+    --disable-static \
-	--disable-config-hal --disable-config-udev \
+    --disable-xephyr \
-	--disable-dri2 --enable-glx --disable-xwayland --disable-dri3
+    --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' {} \;
 make -j5
 # modifications for the servertarball
@@ -118,6 +139,8 @@ 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
--- a/builder/build_www.sh
+++ b/builder/build_www.sh
@@ -15,3 +15,4 @@ cd /build
 rm *.md
 rm AUTHORS
 rm vnc.html
 ln -s index.html vnc.html
--- a/builder/bump-package-version
+++ b/builder/bump-package-version
@@ -15,6 +15,11 @@ bump_deb() {
  builder/bump-package-version-deb "$new_version"
 }
 bump_xvnc_binary() {
  local cmd="s/#define XVNCVERSION.\+$/#define XVNCVERSION \"KasmVNC $new_version\"/"
  sed -i -e "$cmd" unix/xserver/hw/vnc/xvnc.c
 }
 new_version="$1"
 if [[ -z "$new_version" ]]; then
@@ -25,5 +30,6 @@ fi
 cd "$(dirname "$0")/.."
 update_version_to_meet_packaging_standards
 bump_xvnc_binary
 bump_rpm
 bump_deb
--- a/builder/bump-package-version-rpm
+++ b/builder/bump-package-version-rpm
@@ -3,9 +3,13 @@
 set -eo pipefail
 new_version="$1"
-specs="centos/kasmvncserver.spec
+spec_dirs=(centos oracle opensuse fedora)
-oracle/kasmvncserver.spec
+
-opensuse/kasmvncserver.spec"
+spec_files() {
  for d in "${spec_dirs[@]}"; do
    ls "$d"/*.spec
  done
 }
 bump_version() {
  sed -i "s/^Version:.\+/Version:        $new_version/" "$1"
@@ -25,8 +29,7 @@ bump_changelog() {
  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$1"
 }
-IFS=$'\n'
+for spec_file in $(spec_files); do
 for spec_file in $specs; do
  bump_version $spec_file
  bump_changelog $spec_file
 done
--- a/builder/dockerfile.alpine_317.apk.build
+++ b/builder/dockerfile.alpine_317.apk.build
@@ -0,0 +1,7 @@
 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
@@ -0,0 +1,82 @@
 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.alpine_318.apk.build
+++ b/builder/dockerfile.alpine_318.apk.build
@@ -0,0 +1,7 @@
 FROM alpine:3.18
 RUN apk add shadow bash
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 USER docker
--- a/builder/dockerfile.alpine_318.build
+++ b/builder/dockerfile.alpine_318.build
@@ -0,0 +1,82 @@
 FROM alpine:3.18
 ENV KASMVNC_BUILD_OS alpine
 ENV KASMVNC_BUILD_OS_CODENAME 318
 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.alpine_319.apk.build
+++ b/builder/dockerfile.alpine_319.apk.build
@@ -0,0 +1,7 @@
 FROM alpine:3.19
 RUN apk add shadow bash
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 USER docker
--- a/builder/dockerfile.alpine_319.build
+++ b/builder/dockerfile.alpine_319.build
@@ -0,0 +1,82 @@
 FROM alpine:3.19
 ENV KASMVNC_BUILD_OS alpine
 ENV KASMVNC_BUILD_OS_CODENAME 319
 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.centos_core.build
+++ b/builder/dockerfile.centos_core.build
@@ -5,11 +5,11 @@ 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 libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN yum install -y gcc cmake git 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 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 libjpeg-turbo-devel
+RUN yum install -y xorg-x11-server-devel zlib-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
@@ -23,6 +23,10 @@ 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/
--- a/builder/dockerfile.debian_bookworm.build
+++ b/builder/dockerfile.debian_bookworm.build
@@ -0,0 +1,38 @@
 FROM debian:bookworm-slim
 ENV KASMVNC_BUILD_OS debian
 ENV KASMVNC_BUILD_OS_CODENAME bookworm
 ENV XORG_VER 1.20.10
 ENV DEBIAN_FRONTEND noninteractive
 RUN \
  echo "**** add all sources ****" && \
  echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
  echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
  rm -f /etc/apt/sources.list.d/debian.sources
 RUN apt-get update && \
      apt-get -y install sudo
 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
 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_bionic+libjpeg-turbo_latest.deb.build
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
@@ -1,18 +1,14 @@
-FROM ubuntu:bionic
+FROM debian:bookworm
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
      apt-get -y install vim build-essential devscripts equivs
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo*deb /tmp/
 RUN apt-get install /tmp/libjpeg-turbo*deb
 # Install build-deps for the package.
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 ENV LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
 ARG L_UID
 RUN if [ "$L_UID" -eq 0 ]; then \
      useradd -m docker; \
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM debian:bookworm-slim
 ENV DISPLAY=:1 \
    VNC_PORT=8443 \
@@ -16,12 +16,12 @@ ENV DISPLAY=:1 \
    VNC_PW=vncpassword \
    VNC_USER=user \
    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/opt/libjpeg-turbo/lib64/:/usr/local/lib/ \
+    LD_LIBRARY_PATH=/usr/local/lib/ \
    OMP_WAIT_POLICY=PASSIVE \
    SHELL=/bin/bash \
    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
+    KASMVNC_BUILD_OS=debian \
-    KASMVNC_BUILD_OS_CODENAME=bionic
+    KASMVNC_BUILD_OS_CODENAME=buster
 EXPOSE $VNC_PORT
@@ -29,7 +29,7 @@ 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 dbus-x11 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
@@ -40,16 +40,13 @@ RUN mkdir -p $STARTUPDIR
 COPY builder/startup/ $STARTUPDIR
 ### START CUSTOM STUFF ####
 COPY ./builder/scripts/ /tmp/scripts/
 COPY ./debian/changelog /tmp
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_*.deb /tmp/
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN apt-get install /tmp/libjpeg-turbo*deb
+RUN /tmp/scripts/install_kasmvncserver_package
 ARG BUILD_DEBIAN_REVISION
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*$BUILD_DEBIAN_REVISION*.deb /tmp/
 RUN /tmp/scripts/install_kasmvncserver_package "$BUILD_DEBIAN_REVISION"
 ### END CUSTOM STUFF ###
--- a/builder/dockerfile.debian_bullseye.build
+++ b/builder/dockerfile.debian_bullseye.build
@@ -12,15 +12,13 @@ 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 libjpeg-dev libgnutls28-dev vim wget tightvncserver
+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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
--- a/builder/dockerfile.debian_buster.build
+++ b/builder/dockerfile.debian_buster.build
@@ -12,15 +12,13 @@ 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 libjpeg-dev libgnutls28-dev vim wget tightvncserver
+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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
--- a/builder/dockerfile.debian_buster.deb.test
+++ b/builder/dockerfile.debian_buster.deb.test
@@ -34,14 +34,6 @@ 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 install -y task-cinnamon-desktop
 RUN apt-get update && apt-get install -y task-gnome-desktop
 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 task-lxde-desktop
 RUN apt-get update && apt-get install -y task-mate-desktop
 RUN apt-get update && apt-get install -y task-kde-desktop
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
 RUN mkdir -p $STARTUPDIR
--- a/builder/dockerfile.fedora_thirtyeight.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtyeight.barebones.rpm.test
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:38
 ENV STARTUPDIR=/dockerstartup
--- a/builder/dockerfile.fedora_thirtyeight.build
+++ b/builder/dockerfile.fedora_thirtyeight.build
@@ -0,0 +1,86 @@
 FROM fedora:38
 ENV KASMVNC_BUILD_OS fedora
 ENV KASMVNC_BUILD_OS_CODENAME thirtyeight
 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_thirtyeight.rpm.build
+++ b/builder/dockerfile.fedora_thirtyeight.rpm.build
@@ -1,11 +1,11 @@
-FROM fedora:33
+FROM fedora:38
 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 centos/*.spec /tmp
+COPY fedora/*.spec /tmp
 RUN dnf builddep -y /tmp/*.spec
 RUN useradd -m docker && echo "docker:docker" | chpasswd
--- a/builder/dockerfile.fedora_thirtyeight.rpm.test
+++ b/builder/dockerfile.fedora_thirtyeight.rpm.test
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:38
 ENV DISPLAY=:1 \
    VNC_PORT=8443 \
@@ -31,8 +31,7 @@ WORKDIR $HOME
 RUN dnf install -y openssl xterm gettext wget
 RUN dnf install -y nss_wrapper
-RUN dnf install -y xorg-x11-xauth xorg-x11-xkb-utils \
+RUN dnf install -y xorg-x11-xauth xkeyboard-config
  xkeyboard-config xorg-x11-server-utils
 # xorg-x11-server-Xorg
 # RUN dnf install -y @xfce-desktop-environment
 RUN dnf erase -y pm-utils xscreensaver*
@@ -47,7 +46,7 @@ COPY builder/startup/ $STARTUPDIR
 ### START CUSTOM STUFF ####
 COPY ./builder/scripts/ /tmp/scripts/
-COPY ./centos/kasmvncserver.spec /tmp
+COPY ./fedora/kasmvncserver.spec /tmp
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
--- a/builder/dockerfile.fedora_thirtynine.build
+++ b/builder/dockerfile.fedora_thirtynine.build
@@ -0,0 +1,86 @@
 FROM fedora:39
 ENV KASMVNC_BUILD_OS fedora
 ENV KASMVNC_BUILD_OS_CODENAME thirtynine
 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_thirtynine.rpm.build
+++ b/builder/dockerfile.fedora_thirtynine.rpm.build
@@ -0,0 +1,13 @@
 FROM fedora:39
 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
 RUN dnf builddep -y /tmp/*.spec
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 USER docker
--- a/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
@@ -0,0 +1,19 @@
 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
@@ -0,0 +1,86 @@
 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_thirtyseven.rpm.build
+++ b/builder/dockerfile.fedora_thirtyseven.rpm.build
@@ -0,0 +1,13 @@
 FROM fedora:37
 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
 RUN dnf builddep -y /tmp/*.spec
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 USER docker
--- a/builder/dockerfile.fedora_thirtyseven.rpm.test
+++ b/builder/dockerfile.fedora_thirtyseven.rpm.test
@@ -0,0 +1,62 @@
 FROM fedora:37
 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=fedora \
    KASMVNC_BUILD_OS_CODENAME=thirtythree
 EXPOSE $VNC_PORT
 WORKDIR $HOME
 ### REQUIRED STUFF ###
 RUN dnf install -y openssl xterm gettext wget
 RUN dnf install -y nss_wrapper
 RUN dnf install -y xorg-x11-xauth xkeyboard-config
 # xorg-x11-server-Xorg
 # RUN dnf install -y @xfce-desktop-environment
 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
 ### START CUSTOM STUFF ####
 COPY ./builder/scripts/ /tmp/scripts/
 COPY ./fedora/kasmvncserver.spec /tmp
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
 # RUN dnf remove -y tigervnc-server-minimal
 RUN /tmp/scripts/install_kasmvncserver_package
 ### END CUSTOM STUFF ###
 RUN chown -R 1000:0 $HOME
 USER 1000:kasmvnc-cert
 WORKDIR $HOME
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.fedora_thirtythree.build
+++ b/builder/dockerfile.fedora_thirtythree.build
@@ -1,38 +0,0 @@
 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 libXrandr-devel libXtst-devel \
  libXcursor-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 -xzf /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 --chown=docker:docker . /src/
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.kali_kali-rolling.build
+++ b/builder/dockerfile.kali_kali-rolling.build
@@ -14,16 +14,14 @@ 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
+RUN apt-get update && apt-get -y install gcc-11 g++-11 curl
-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 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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make -j$(nproc) && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
--- a/builder/dockerfile.opensuse_15.barebones.rpm.test
+++ b/builder/dockerfile.opensuse_15.barebones.rpm.test
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.5
 ENV STARTUPDIR=/dockerstartup
--- a/builder/dockerfile.opensuse_15.build
+++ b/builder/dockerfile.opensuse_15.build
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.5
 ENV KASMVNC_BUILD_OS opensuse
 ENV KASMVNC_BUILD_OS_CODENAME 15
@@ -9,6 +9,7 @@ RUN zypper install -ny \
  bdftopcf \
  bigreqsproto-devel \
  cmake \
  curl \
  ffmpeg-4-libavcodec-devel \
  fonttosfnt \
  font-util \
@@ -19,14 +20,17 @@ RUN zypper install -ny \
  gzip \
  lbzip2 \
  libbz2-devel \
  libgbm-devel \
  libGLw-devel \
  libgnutls-devel \
  libjpeg8-devel \
  libopenssl-devel \
  libpng16-devel \
  libpnglite0 \
  png++-devel \
  libtiff-devel \
  libXfont2-devel \
  libxkbcommon-x11-devel \
  libxshmfence-devel \
  make \
  Mesa-dri \
  Mesa-libglapi-devel \
@@ -41,12 +45,10 @@ RUN zypper install -ny \
  xorg-x11-util-devel \
  zlib-devel
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -u 1000 docker && \
  groupadd -g 1000 docker && \
--- a/builder/dockerfile.opensuse_15.rpm.build
+++ b/builder/dockerfile.opensuse_15.rpm.build
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.5
 ENV KASMVNC_BUILD_OS opensuse
 ENV KASMVNC_BUILD_OS_CODENAME 15
--- a/builder/dockerfile.oracle_8.build
+++ b/builder/dockerfile.oracle_8.build
@@ -5,27 +5,31 @@ ENV KASMVNC_BUILD_OS_CODENAME 8
 ENV XORG_VER 1.20.10
 # Install from stock repos
-RUN dnf install -y \
+RUN \
-  bzip2-devel \
+  dnf install -y 'dnf-command(config-manager)' && \
-  ca-certificates \
+  dnf config-manager --set-enabled ol8_codeready_builder && \
-  cmake \
+  dnf install -y \
-  dnf-plugins-core \
+    bzip2-devel \
-  gcc \
+    ca-certificates \
-  gcc-c++ \
+    cmake \
-  git \
+    dnf-plugins-core \
-  gnutls-devel \
+    gcc \
-  libjpeg-turbo-devel \
+    gcc-c++ \
-  libpng-devel \
+    git \
-  libtiff-devel \
+    gnutls-devel \
-  make \
+    libjpeg-turbo-devel \
-  mesa-dri-drivers \
+    libpng-devel \
-  openssl-devel \
+    libtiff-devel \
-  openssl-devel \
+    libxshmfence-devel \
-  patch \
+    make \
-  tigervnc-server \
+    mesa-dri-drivers \
-  wget \
+    mesa-libgbm-devel \
-  xorg-x11-font-utils \
+    openssl-devel \
-  zlib-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
@@ -46,12 +50,10 @@ RUN dnf install -y \
  libXtst-devel \
  libXcursor-devel
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd
--- a/builder/dockerfile.oracle_8.rpm.build
+++ b/builder/dockerfile.oracle_8.rpm.build
@@ -13,7 +13,7 @@ RUN dnf install -y \
  tree \
  vim
-COPY oracle/*.spec /tmp
+COPY oracle/kasmvncserver.spec /tmp
 RUN dnf builddep -y /tmp/*.spec
 RUN useradd -m docker && echo "docker:docker" | chpasswd
--- a/builder/dockerfile.oracle_9.barebones.rpm.test
+++ b/builder/dockerfile.oracle_9.barebones.rpm.test
@@ -0,0 +1,25 @@
 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
@@ -0,0 +1,63 @@
 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
@@ -0,0 +1,23 @@
 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
@@ -1,21 +0,0 @@
 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 --chown=docker:docker . /src/
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.build
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.build
@@ -1,39 +0,0 @@
 FROM ubuntu:18.04
 ENV KASMVNC_BUILD_OS ubuntu
 ENV KASMVNC_BUILD_OS_CODENAME bionic
 ENV XORG_VER 1.20.10
 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 -y build-dep xorg-server libxfont-dev
 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 install -y cmake nasm gcc
 RUN git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git
 RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -G"Unix Makefiles" && make deb
 RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles" && make && make install
 # 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/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 && \
 #    wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \
 #    dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \
 #    dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb
 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_bionic.build
+++ b/builder/dockerfile.ubuntu_bionic.build
@@ -10,15 +10,13 @@ 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 libjpeg-dev libgnutls28-dev vim wget tightvncserver
+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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./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 && \
--- a/builder/dockerfile.ubuntu_bionic.test
+++ b/builder/dockerfile.ubuntu_bionic.test
@@ -29,7 +29,7 @@ WORKDIR $HOME
 ### REQUIRED STUFF ###
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
+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
--- a/builder/dockerfile.ubuntu_focal.barebones.deb.test
+++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test
@@ -2,9 +2,13 @@ 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 rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
+RUN /tmp/scripts/install_kasmvncserver_package
 RUN apt-get update && apt-get -y install xterm lsb-release
 RUN mkdir -p $STARTUPDIR
--- a/builder/dockerfile.ubuntu_focal.build
+++ b/builder/dockerfile.ubuntu_focal.build
@@ -12,15 +12,13 @@ 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 libjpeg-dev vim wget
+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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
--- a/builder/dockerfile.ubuntu_focal.test
+++ b/builder/dockerfile.ubuntu_focal.test
@@ -29,7 +29,7 @@ WORKDIR $HOME
 ### REQUIRED STUFF ###
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
+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
--- a/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
+++ b/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
@@ -58,7 +58,8 @@ RUN echo 'alias tv="./run-specs spec/vncserver_yaml_validation_spec.py"' >> ~/.b
 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 'alias ss="sp; vncserver -select-de xfce"' >> ~/.bashrc
 ENV SET_PASSWORD_FUNC 'sp() { echo -e "$VNC_PW\\n$VNC_PW\\n" | kasmvncpasswd -w -u $VNC_USER $HOME/.kasmpasswd; }'
 RUN echo $SET_PASSWORD_FUNC >> ~/.bashrc
 ENV LC_ALL=C.UTF-8
--- a/builder/dockerfile.ubuntu_jammy.build
+++ b/builder/dockerfile.ubuntu_jammy.build
@@ -12,15 +12,13 @@ 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 libjpeg-dev libgnutls28-dev vim wget tightvncserver
+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
-# Additions for webp
+ENV SCRIPTS_DIR=/tmp/scripts
-RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+COPY builder/scripts $SCRIPTS_DIR
-RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN $SCRIPTS_DIR/build-webp
-RUN cd /tmp/libwebp-1.0.2 && \
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
    ./configure --enable-static --disable-shared && \
    make && make install
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
--- a/builder/dockerfile.ubuntu_jammy.test
+++ b/builder/dockerfile.ubuntu_jammy.test
@@ -29,7 +29,7 @@ WORKDIR $HOME
 ### REQUIRED STUFF ###
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
+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
--- a/builder/os_ver_cli.sh
+++ b/builder/os_ver_cli.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 default_os=${default_os:-ubuntu}
 default_os_codename=${default_os_codename:-bionic}
--- a/builder/process_test_options.sh
+++ b/builder/process_test_options.sh
@@ -0,0 +1,49 @@
 #!/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/scripts/build-libjpeg-turbo
+++ b/builder/scripts/build-libjpeg-turbo
@@ -0,0 +1,36 @@
 #!/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
@@ -0,0 +1,23 @@
 #!/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
@@ -0,0 +1,34 @@
 #!/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/startup/deb/select-de.sh
+++ b/builder/startup/deb/select-de.sh
@@ -198,6 +198,7 @@ generate_xstartup() {
  cat <<-SCRIPT > "$xstartup_script"
 #!/bin/sh
 set -x
 $de_cmd
 SCRIPT
  chmod +x "$xstartup_script"
--- a/builder/test-deb
+++ b/builder/test-deb
@@ -3,6 +3,7 @@
 set -e
 cd "$(dirname "$0")/.."
 . ./builder/process_test_options.sh
 . ./builder/os_ver_cli.sh
 . ./builder/common.sh
@@ -11,8 +12,11 @@ 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 \
  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
  -e "VNC_PORT=$VNC_PORT" \
-  "$tester_image"
+  $entrypoint_executable \
  "$tester_image" \
  $entrypoint_args
--- a/builder/test-deb-barebones
+++ b/builder/test-deb-barebones
@@ -3,6 +3,7 @@
 set -e
 cd "$(dirname "$0")/.."
 . ./builder/process_test_options.sh
 . ./builder/common.sh
 os="${1:-debian}"
 os_codename="${2:-buster}"
@@ -13,4 +14,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
 echo
 docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
  -e "VNC_PORT=$VNC_PORT" \
-  kasmvnctester_barebones_${os}:$os_codename
+  $entrypoint_executable \
  kasmvnctester_barebones_${os}:$os_codename \
  $entrypoint_args
--- a/builder/test-rpm
+++ b/builder/test-rpm
@@ -3,6 +3,7 @@
 set -e
 cd "$(dirname "$0")/.."
 . ./builder/process_test_options.sh
 . ./builder/os_ver_cli.sh
 . ./builder/common.sh
@@ -16,4 +17,6 @@ docker run -it -p "443:$VNC_PORT" --rm \
  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
  -e "VNC_PORT=$VNC_PORT" \
-  kasmvnctester_${os}:$os_codename
+  $entrypoint_executable \
  kasmvnctester_${os}:$os_codename \
  $entrypoint_args
--- a/builder/test-rpm-barebones
+++ b/builder/test-rpm-barebones
@@ -3,6 +3,7 @@
 set -e
 cd "$(dirname "$0")"
 . ./process_test_options.sh
 . ./common.sh
 os="${1:-centos}"
 os_codename="${2:-core}"
@@ -12,4 +13,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="build/${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" \
-  kasmvnctester_barebones_${os}:$os_codename
+  $entrypoint_executable \
  kasmvnctester_barebones_${os}:$os_codename \
  $entrypoint_args
--- a/centos/kasmvncserver.spec
+++ b/centos/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.0.0
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser
@@ -7,18 +7,18 @@ 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, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime-TimeZone
 Conflicts: tigervnc-server, tigervnc-server-minimal
 %description
-KasmVNC provides remote web-based access to a Desktop or application. 
+KasmVNC provides remote web-based access to a Desktop or application.
-While VNC is in the name, KasmVNC differs from other VNC variants such 
+While VNC is in the name, KasmVNC differs from other VNC variants such
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB 
+as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
-specification which defines VNC, in order to support modern technologies 
+specification which defines VNC, in order to support modern technologies
-and increase security. KasmVNC is accessed by users from any modern 
+and increase security. KasmVNC is accessed by users from any modern
-browser and does not support legacy VNC viewer applications. KasmVNC 
+browser and does not support legacy VNC viewer applications. KasmVNC
-uses a modern YAML based configuration at the server and user level, 
+uses a modern YAML based configuration at the server and user level,
-allowing for ease of management. KasmVNC is maintained by Kasm 
+allowing for ease of management. KasmVNC is maintained by Kasm
 Technologies Corp, www.kasmweb.com.
 WARNING: this package requires EPEL.
@@ -52,7 +52,7 @@ 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 --exclude '.git*' --exclude po2js --exclude xgettext-html \
+rsync -r --links --safe-links --exclude '.git*' --exclude po2js --exclude xgettext-html \
  --exclude www/utils/ --exclude .eslintrc --exclude configure \
  $SRC/share/kasmvnc $DESTDIR/usr/share
@@ -83,6 +83,26 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 %changelog
 * Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
 - Multi-monitor support.
 - Increased performance with watermark enabled.
 - Added support for Fedora 39 and Alpine 319.
 - Allow special characters in usernames.
 - Better logging of client settings when client connects or changes settings.
 - Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-1
 - Add support for Unix relays for bidirectional communication between noVNC
  and containerized applications.
 - Text based watermark overlays with date and time support.
 - New builds for Bookworm, Alpine 3.18, and Fedora 38.
 - Multi-language support.
 - Add support for rendering pixmaps via DRI3 GPU acceleration allowing
  compositing and other 3d accelerated workloads in a KasmVNC session.
 - Fix crash that can occur.
 - Fixed tearing when compositing is enabled with DRI3 hardware acceleration.
 - Fix stuck command key on MacOS clients.
 * 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
--- a/cmake/Modules/FindFreetype.cmake
+++ b/cmake/Modules/FindFreetype.cmake
@@ -0,0 +1,17 @@
 # - Find freetype
 # Find the freetype libraries
 #
 #  This module defines the following variables:
 #     FREETYPE_FOUND        - True if freetype is found
 #     FREETYPE_INCLUDE_DIRS - include directories
 #
 find_package(PkgConfig)
 pkg_check_modules(PC_FREETYPE freetype2)
 find_path(FREETYPE_INCLUDE_DIRS NAMES ft2build.h HINTS ${PC_FREETYPE_INCLUDE_DIRS})
 include(FindPackageHandleStandardArgs)
 set(FPHSA_NAME_MISMATCHED 1)
 find_package_handle_standard_args(freetype DEFAULT_MSG FREETYPE_INCLUDE_DIRS)
 unset(FPHSA_NAME_MISMATCHED)
 mark_as_advanced(FREETYPE_INCLUDE_DIRS)
--- a/common/network/GetAPI.h
+++ b/common/network/GetAPI.h
@@ -66,6 +66,7 @@ namespace network {
    void netResetFrameStatsCall();
    uint8_t netServerFrameStatsReady();
    void netUdpUpgrade(void *client, uint32_t ip);
    void netClearClipboard();
    enum USER_ACTION {
      NONE,
@@ -73,7 +74,8 @@ namespace network {
      WANT_FRAME_STATS_ALL,
      WANT_FRAME_STATS_OWNER,
      WANT_FRAME_STATS_SPECIFIC,
-      UDP_UPGRADE
+      UDP_UPGRADE,
      CLEAR_CLIPBOARD,
    };
    uint8_t netRequestFrameStats(USER_ACTION what, const char *client);
--- a/common/network/GetAPIMessager.cxx
+++ b/common/network/GetAPIMessager.cxx
@@ -550,7 +550,7 @@ void GetAPIMessager::netGetBottleneckStats(char *buf, uint32_t len) {
 		const char *id = it->first.c_str();
 		const char *data = it->second.c_str();
-		const char *at = strchr(id, '@');
+		const char *at = strrchr(id, '@');
 		if (!at)
 			continue;
@@ -806,3 +806,16 @@ void GetAPIMessager::netUdpUpgrade(void *client, uint32_t ip) {
 	pthread_mutex_unlock(&userMutex);
 }
 void GetAPIMessager::netClearClipboard() {
 	action_data act;
 	act.action = CLEAR_CLIPBOARD;
 	// Send it in
 	if (pthread_mutex_lock(&userMutex))
 		return;
 	actionQueue.push_back(act);
 	pthread_mutex_unlock(&userMutex);
 }
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -545,6 +545,12 @@ static uint8_t serverFrameStatsReadyCb(void *messager)
  return msgr->netServerFrameStatsReady();
 }
 static void clearClipboardCb(void *messager)
 {
  GetAPIMessager *msgr = (GetAPIMessager *) messager;
  msgr->netClearClipboard();
 }
 #if OPENSSL_VERSION_NUMBER < 0x1010000f
 static pthread_mutex_t *sslmutex;
@@ -693,6 +699,8 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
  settings.getClientFrameStatsNumCb = getClientFrameStatsNumCb;
  settings.serverFrameStatsReadyCb = serverFrameStatsReadyCb;
  settings.clearClipboardCb = clearClipboardCb;
  openssl_threads();
  pthread_t tid;
--- a/common/network/Udp.cxx
+++ b/common/network/Udp.cxx
@@ -40,7 +40,7 @@ using namespace network;
 static rfb::LogWriter vlog("WebUdp");
 static WuHost *host = NULL;
-rfb::IntParameter udpSize("udpSize", "UDP packet data size", 1300, 500, 1400);
+rfb::IntParameter udpSize("udpSize", "UDP packet data size", 1296, 500, 1400);
 extern settings_t settings;
@@ -95,10 +95,11 @@ void *udpserver(void *nport) {
 }
 // Send one packet, split into N UDP-sized pieces
-static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint32_t *id) {
+static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint32_t *id,
 			const uint32_t *frame) {
 	const uint32_t DATA_MAX = udpSize;
-	uint8_t buf[1400 + sizeof(uint32_t) * 4];
+	uint8_t buf[1400 + sizeof(uint32_t) * 5];
 	const uint32_t pieces = (len / DATA_MAX) + ((len % DATA_MAX) ? 1 : 0);
 	uint32_t i;
@@ -111,12 +112,13 @@ static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint
 		memcpy(&buf[4], &i, sizeof(uint32_t));
 		memcpy(&buf[8], &pieces, sizeof(uint32_t));
 		memcpy(&buf[12], &hash, sizeof(uint32_t));
 		memcpy(&buf[16], frame, sizeof(uint32_t));
-		memcpy(&buf[16], data, curlen);
+		memcpy(&buf[20], data, curlen);
 		data += curlen;
 		len -= curlen;
-		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 4) < 0)
+		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 5) < 0)
 			return 1;
 	}
@@ -125,7 +127,8 @@ static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint
 	return 0;
 }
-UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0), failed(false) {
+UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0), failed(false),
 	                frame(0) {
 	ptr = data;
 	end = data + UDPSTREAM_BUFSIZE;
@@ -137,7 +140,7 @@ void UdpStream::flush() {
 	total_len += len;
 	if (client) {
-		if (udpsend(client, data, len, &id)) {
+		if (udpsend(client, data, len, &id, &frame)) {
 			vlog.error("Error sending udp, client gone?");
 			failed = true;
 		}
--- a/common/network/Udp.h
+++ b/common/network/Udp.h
@@ -40,6 +40,10 @@ namespace network {
 				client = cli;
 			}
 			void setFrameNumber(const unsigned in) {
 				frame = in;
 			}
 			bool isFailed() const;
 			void clearFailed();
 		private:
@@ -48,6 +52,7 @@ namespace network {
 			size_t total_len;
 			uint32_t id;
 			bool failed;
 			uint32_t frame;
 	};
 }
--- a/common/network/websocket.c
+++ b/common/network/websocket.c
@@ -33,7 +33,6 @@
 #include <openssl/sha.h> /* sha1 hash */
 #include "websocket.h"
 #include "jsonescape.h"
 #include "kasmpasswd.h"
 #include <network/Blacklist.h>
 /*
@@ -1596,6 +1595,22 @@ static uint8_t ownerapi(ws_ctx_t *ws_ctx, const char *in, const char * const use
        ws_send(ws_ctx, buf, strlen(buf));
        weblog(200, wsthread_handler_id, 0, origip, ip, user, 1, origpath, strlen(buf));
        ret = 1;
    } else entry("/api/clear_clipboard") {
        settings.clearClipboardCb(settings.messager);
        write(wakeuppipe[1], "", 1);
        sprintf(buf, "HTTP/1.1 200 OK\r\n"
                 "Server: KasmVNC/4.0\r\n"
                 "Connection: close\r\n"
                 "Content-type: text/plain\r\n"
                 "Content-length: 6\r\n"
                 "%s"
                 "\r\n"
                 "200 OK", extra_headers ? extra_headers : "");
        ws_send(ws_ctx, buf, strlen(buf));
        weblog(200, wsthread_handler_id, 0, origip, ip, user, 1, origpath, strlen(buf));
        ret = 1;
    }
@@ -1740,7 +1755,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
    }
    unsigned char owner = 0;
-    char inuser[32] = "-";
+    char inuser[USERNAME_LEN] = "-";
    if (!settings.disablebasicauth) {
        const char *hdr = strstr(handshake, "Authorization: Basic ");
        if (!hdr) {
@@ -1778,7 +1793,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
        if (resppw && *resppw)
            resppw++;
        if (settings.passwdfile) {
-            if (resppw && *resppw && resppw - response < 32) {
+            if (resppw && *resppw && resppw - response < USERNAME_LEN + 1) {
                char pwbuf[4096];
                struct kasmpasswd_t *set = readkasmpasswd(settings.passwdfile);
                if (!set->num) {
--- a/common/network/websocket.h
+++ b/common/network/websocket.h
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include "GetAPIEnums.h"
 #include "datelog.h"
 #include "kasmpasswd.h"
 #define BUFSIZE 65536
 #define DBUFSIZE (BUFSIZE * 3) / 4 - 20
@@ -57,7 +58,7 @@ typedef struct {
    char      *tin_buf;
    char      *tout_buf;
-    char      user[32];
+    char      user[USERNAME_LEN];
    char      ip[64];
 } ws_ctx_t;
@@ -105,6 +106,8 @@ typedef struct {
    void (*getUsersCb)(void *messager, const char **buf);
    uint8_t (*getClientFrameStatsNumCb)(void *messager);
    uint8_t (*serverFrameStatsReadyCb)(void *messager);
    void (*clearClipboardCb)(void *messager);
 } settings_t;
 #ifdef __cplusplus
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR}
+include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR}
                    ${CMAKE_SOURCE_DIR}/unix/kasmvncpasswd)
 set(RFB_SOURCES
@@ -65,6 +65,7 @@ set(RFB_SOURCES
  VNCServerST.cxx
  ZRLEEncoder.cxx
  ZRLEDecoder.cxx
  Watermark.cxx
  cpuid.cxx
  encodings.cxx
  util.cxx
@@ -79,7 +80,7 @@ if(WIN32)
  set(RFB_SOURCES ${RFB_SOURCES} WinPasswdValidator.cxx)
 endif(WIN32)
-set(RFB_LIBRARIES ${JPEG_LIBRARIES} os rdr Xregion)
+set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PNG_LIBRARIES} os rdr Xregion)
 if(HAVE_PAM)
  set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
--- a/common/rfb/ConnParams.cxx
+++ b/common/rfb/ConnParams.cxx
@@ -24,6 +24,7 @@
 #include <rfb/Exception.h>
 #include <rfb/encodings.h>
 #include <rfb/ledStates.h>
 #include <rfb/LogWriter.h>
 #include <rfb/clipboardTypes.h>
 #include <rfb/ConnParams.h>
 #include <rfb/ServerCore.h>
@@ -32,6 +33,19 @@
 using namespace rfb;
 static LogWriter vlog("CP");
 static void clientparlog(const char name[], const bool applied) {
  vlog.debug("Client sent config param %s, %s",
             name,
             applied ? "applied" : "ignored due to -IgnoreClientSettingsKasm/lacking perms");
 }
 static void clientparlog(const char name[], int val, const bool applied) {
  vlog.debug("Client sent config param %s %d, %s",
             name, val,
             applied ? "applied" : "ignored due to -IgnoreClientSettingsKasm/lacking perms");
 }
 ConnParams::ConnParams()
  : majorVersion(0), minorVersion(0),
    width(0), height(0), useCopyRect(false),
@@ -147,54 +161,71 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
    switch (encodings[i]) {
    case encodingCopyRect:
      useCopyRect = true;
      clientparlog("copyrect", true);
      break;
    case pseudoEncodingCursor:
      supportsLocalCursor = true;
      clientparlog("cursor", true);
      break;
    case pseudoEncodingXCursor:
      supportsLocalXCursor = true;
      clientparlog("xcursor", true);
      break;
    case pseudoEncodingCursorWithAlpha:
      supportsLocalCursorWithAlpha = true;
      clientparlog("cursorWithAlpha", true);
      break;
    case pseudoEncodingVMwareCursor:
      supportsVMWareCursor = true;
      clientparlog("vmwareCursor", true);
      break;
    case pseudoEncodingDesktopSize:
      supportsDesktopResize = true;
      clientparlog("desktopSize", true);
      break;
    case pseudoEncodingExtendedDesktopSize:
      supportsExtendedDesktopSize = true;
      clientparlog("extendedDesktopSize", true);
      break;
    case pseudoEncodingVMwareCursorPosition:
      supportsCursorPosition = true;
      clientparlog("vmwareCursorPosition", true);
      break;
    case pseudoEncodingDesktopName:
      supportsDesktopRename = true;
      clientparlog("desktopRename", true);
      break;
    case pseudoEncodingLastRect:
      supportsLastRect = true;
      clientparlog("lastRect", true);
      break;
    case pseudoEncodingLEDState:
      supportsLEDState = true;
      clientparlog("ledState", true);
      break;
    case pseudoEncodingQEMUKeyEvent:
      supportsQEMUKeyEvent = true;
      clientparlog("qemuKeyEvent", true);
      break;
    case pseudoEncodingWEBP:
      supportsWEBP = true;
      clientparlog("webp", true);
      break;
    case pseudoEncodingQOI:
      supportsQOI = true;
      clientparlog("qoi", true);
      break;
    case pseudoEncodingFence:
      supportsFence = true;
      clientparlog("fence", true);
      break;
    case pseudoEncodingContinuousUpdates:
      supportsContinuousUpdates = true;
      clientparlog("continuousUpdates", true);
      break;
    case pseudoEncodingExtendedClipboard:
      supportsExtendedClipboard = true;
      clientparlog("extendedClipboard", true);
      break;
    case pseudoEncodingSubsamp1X:
      subsampling = subsampleNone;
@@ -215,8 +246,12 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
      subsampling = subsample16X;
      break;
    case pseudoEncodingPreferBandwidth:
-      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
+      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) {
        Server::preferBandwidth.setParam(true);
        clientparlog("preferBandwidth", true);
      } else {
        clientparlog("preferBandwidth", false);
      }
      break;
    case pseudoEncodingMaxVideoResolution:
      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
@@ -225,57 +260,133 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
    }
    if (encodings[i] >= pseudoEncodingCompressLevel0 &&
-        encodings[i] <= pseudoEncodingCompressLevel9)
+        encodings[i] <= pseudoEncodingCompressLevel9) {
      compressLevel = encodings[i] - pseudoEncodingCompressLevel0;
      clientparlog("compressLevel", compressLevel, true);
    }
    if (encodings[i] >= pseudoEncodingQualityLevel0 &&
-        encodings[i] <= pseudoEncodingQualityLevel9)
+        encodings[i] <= pseudoEncodingQualityLevel9) {
      qualityLevel = encodings[i] - pseudoEncodingQualityLevel0;
      clientparlog("qualityLevel", qualityLevel, true);
    }
    if (encodings[i] >= pseudoEncodingFineQualityLevel0 &&
-        encodings[i] <= pseudoEncodingFineQualityLevel100)
+        encodings[i] <= pseudoEncodingFineQualityLevel100) {
      fineQualityLevel = encodings[i] - pseudoEncodingFineQualityLevel0;
      clientparlog("fineQualityLevel", fineQualityLevel, true);
    }
    if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) {
      if (encodings[i] >= pseudoEncodingJpegVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9)
+          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9) {
          Server::jpegVideoQuality.setParam(encodings[i] - pseudoEncodingJpegVideoQualityLevel0);
          clientparlog("jpegVideoQuality", encodings[i] - pseudoEncodingJpegVideoQualityLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingWebpVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9)
+          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9) {
          Server::webpVideoQuality.setParam(encodings[i] - pseudoEncodingWebpVideoQualityLevel0);
          clientparlog("webpVideoQuality", encodings[i] - pseudoEncodingWebpVideoQualityLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingTreatLosslessLevel0 &&
-          encodings[i] <= pseudoEncodingTreatLosslessLevel10)
+          encodings[i] <= pseudoEncodingTreatLosslessLevel10) {
          Server::treatLossless.setParam(encodings[i] - pseudoEncodingTreatLosslessLevel0);
          clientparlog("treatLossless", encodings[i] - pseudoEncodingTreatLosslessLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingDynamicQualityMinLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9)
+          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9) {
          Server::dynamicQualityMin.setParam(encodings[i] - pseudoEncodingDynamicQualityMinLevel0);
          clientparlog("dynamicQualityMin", encodings[i] - pseudoEncodingDynamicQualityMinLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingDynamicQualityMaxLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9)
+          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9) {
          Server::dynamicQualityMax.setParam(encodings[i] - pseudoEncodingDynamicQualityMaxLevel0);
          clientparlog("dynamicQualityMax", encodings[i] - pseudoEncodingDynamicQualityMaxLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingVideoAreaLevel1 &&
-          encodings[i] <= pseudoEncodingVideoAreaLevel100)
+          encodings[i] <= pseudoEncodingVideoAreaLevel100) {
          Server::videoArea.setParam(encodings[i] - pseudoEncodingVideoAreaLevel1 + 1);
          clientparlog("videoArea", encodings[i] - pseudoEncodingVideoAreaLevel1 + 1, true);
      }
      if (encodings[i] >= pseudoEncodingVideoTimeLevel0 &&
-          encodings[i] <= pseudoEncodingVideoTimeLevel100)
+          encodings[i] <= pseudoEncodingVideoTimeLevel100) {
          Server::videoTime.setParam(encodings[i] - pseudoEncodingVideoTimeLevel0);
          clientparlog("videoTime", encodings[i] - pseudoEncodingVideoTimeLevel0, true);
      }
      if (encodings[i] >= pseudoEncodingVideoOutTimeLevel1 &&
-          encodings[i] <= pseudoEncodingVideoOutTimeLevel100)
+          encodings[i] <= pseudoEncodingVideoOutTimeLevel100) {
          Server::videoOutTime.setParam(encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1);
          clientparlog("videoOutTime", encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1, true);
      }
      if (encodings[i] >= pseudoEncodingFrameRateLevel10 &&
-          encodings[i] <= pseudoEncodingFrameRateLevel60)
+          encodings[i] <= pseudoEncodingFrameRateLevel60) {
          Server::frameRate.setParam(encodings[i] - pseudoEncodingFrameRateLevel10 + 10);
          clientparlog("frameRate", encodings[i] - pseudoEncodingFrameRateLevel10 + 10, true);
      }
      if (encodings[i] >= pseudoEncodingVideoScalingLevel0 &&
-          encodings[i] <= pseudoEncodingVideoScalingLevel9)
+          encodings[i] <= pseudoEncodingVideoScalingLevel9) {
          Server::videoScaling.setParam(encodings[i] - pseudoEncodingVideoScalingLevel0);
          clientparlog("videoScaling", encodings[i] - pseudoEncodingVideoScalingLevel0, true);
      }
    } else {
      if (encodings[i] >= pseudoEncodingJpegVideoQualityLevel0 &&
          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9) {
          clientparlog("jpegVideoQuality", encodings[i] - pseudoEncodingJpegVideoQualityLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingWebpVideoQualityLevel0 &&
          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9) {
          clientparlog("webpVideoQuality", encodings[i] - pseudoEncodingWebpVideoQualityLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingTreatLosslessLevel0 &&
          encodings[i] <= pseudoEncodingTreatLosslessLevel10) {
          clientparlog("treatLossless", encodings[i] - pseudoEncodingTreatLosslessLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingDynamicQualityMinLevel0 &&
          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9) {
          clientparlog("dynamicQualityMin", encodings[i] - pseudoEncodingDynamicQualityMinLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingDynamicQualityMaxLevel0 &&
          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9) {
          clientparlog("dynamicQualityMax", encodings[i] - pseudoEncodingDynamicQualityMaxLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingVideoAreaLevel1 &&
          encodings[i] <= pseudoEncodingVideoAreaLevel100) {
          clientparlog("videoArea", encodings[i] - pseudoEncodingVideoAreaLevel1 + 1, false);
      }
      if (encodings[i] >= pseudoEncodingVideoTimeLevel0 &&
          encodings[i] <= pseudoEncodingVideoTimeLevel100) {
          clientparlog("videoTime", encodings[i] - pseudoEncodingVideoTimeLevel0, false);
      }
      if (encodings[i] >= pseudoEncodingVideoOutTimeLevel1 &&
          encodings[i] <= pseudoEncodingVideoOutTimeLevel100) {
          clientparlog("videoOutTime", encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1, false);
      }
      if (encodings[i] >= pseudoEncodingFrameRateLevel10 &&
          encodings[i] <= pseudoEncodingFrameRateLevel60) {
          clientparlog("frameRate", encodings[i] - pseudoEncodingFrameRateLevel10 + 10, false);
      }
      if (encodings[i] >= pseudoEncodingVideoScalingLevel0 &&
          encodings[i] <= pseudoEncodingVideoScalingLevel9) {
          clientparlog("videoScaling", encodings[i] - pseudoEncodingVideoScalingLevel0, false);
      }
    }
    if (encodings[i] > 0)
@@ -285,6 +396,8 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
  // QOI-specific overrides
  if (supportsQOI)
    useCopyRect = false;
  if (Server::DLP_WatermarkImage[0])
    useCopyRect = false;
 }
 void ConnParams::setLEDState(unsigned int state)
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -34,6 +34,7 @@
 #include <rfb/UpdateTracker.h>
 #include <rfb/LogWriter.h>
 #include <rfb/Exception.h>
 #include <rfb/Watermark.h>
 #include <rfb/RawEncoder.h>
 #include <rfb/RREEncoder.h>
@@ -162,6 +163,7 @@ static void updateMaxVideoRes(uint16_t *x, uint16_t *y) {
 EncodeManager::EncodeManager(SConnection* conn_, EncCache *encCache_) : conn(conn_),
  dynamicQualityMin(-1), dynamicQualityOff(-1),
  areaCur(0), videoDetected(false), videoTimer(this),
  watermarkStats(0),
  maxEncodingTime(0), framesSinceEncPrint(0),
  encCache(encCache_)
 {
@@ -299,6 +301,11 @@ void EncodeManager::logStats()
  vlog.info("  Total: %s, %s", a, b);
  iecPrefix(bytes, "B", a, sizeof(a));
  vlog.info("         %s (1:%g ratio)", a, ratio);
  if (watermarkData) {
    siPrefix(watermarkStats, "B", a, sizeof(a));
    vlog.info("  Watermark data sent: %s", a);
  }
 }
 bool EncodeManager::supported(int encoding)
@@ -356,6 +363,9 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
    unsigned screenArea;
    updates++;
    if (conn->cp.supportsUdp)
      ((network::UdpStream *) conn->getOutStream(conn->cp.supportsUdp))->setFrameNumber(updates);
    // The video resolution may have changed, check it
    if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
@@ -408,6 +418,9 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
      nRects += copypassed.size();
      nRects += computeNumRects(changed);
      nRects += computeNumRects(cursorRegion);
      if (watermarkData)
          nRects++;
    }
    conn->writer()->writeFramebufferUpdateStart(nRects);
@@ -427,6 +440,23 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
    if (!videoDetected) // In case detection happened between the calls
      writeRects(cursorRegion, renderedCursor);
    if (watermarkData && conn->sendWatermark()) {
      beforeLength = conn->getOutStream(conn->cp.supportsUdp)->length();
      const Rect rect(0, 0, pb->width(), pb->height());
      TightEncoder *encoder = ((TightEncoder *) encoders[encoderTight]);
      conn->writer()->startRect(rect, encoder->encoding);
      encoder->writeWatermarkRect(watermarkData, watermarkDataLen,
                                  watermarkInfo.r,
                                  watermarkInfo.g,
                                  watermarkInfo.b,
                                  watermarkInfo.a);
      conn->writer()->endRect();
      watermarkStats += conn->getOutStream(conn->cp.supportsUdp)->length() - beforeLength;
    }
    updateQualities();
    conn->writer()->writeFramebufferUpdateEnd();
--- a/common/rfb/EncodeManager.h
+++ b/common/rfb/EncodeManager.h
@@ -193,6 +193,7 @@ namespace rfb {
    unsigned updates;
    EncoderStats copyStats;
    StatsVector stats;
    unsigned long long watermarkStats;
    int activeType;
    int beforeLength;
    size_t curMaxUpdateSize;
--- a/common/rfb/Region.cxx
+++ b/common/rfb/Region.cxx
@@ -239,3 +239,8 @@ void rfb::Region::debug_print(const char* prefix) const
            xrgn->rects[i].y2-xrgn->rects[i].y1);
  }
 }
 bool rfb::Region::contains(int x, int y) const
 {
  return XPointInRegion(xrgn, x, y);
 }
--- a/common/rfb/Region.h
+++ b/common/rfb/Region.h
@@ -73,6 +73,8 @@ namespace rfb {
    void debug_print(const char *prefix) const;
    bool contains(int x, int y) const;
  protected:
    struct _XRegion* xrgn;
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -198,6 +198,10 @@ namespace rfb {
        std::vector<unsigned char> data;
    };
    virtual bool sendWatermark() const {
        return false;
    }
  protected:
    void setState(stateEnum s) { state_ = s; }
--- a/common/rfb/SDesktop.h
+++ b/common/rfb/SDesktop.h
@@ -86,6 +86,11 @@ namespace rfb {
    virtual void handleClipboardAnnounceBinary(const unsigned __unused_attr num,
                                               const char __unused_attr mimes[][32]) {}
    virtual void clearLocalClipboards() {}
    virtual void receivedUnixRelayData(const char name[], const unsigned char *buf,
                                       const unsigned len) {}
  protected:
    virtual ~SDesktop() {}
  };
--- a/common/rfb/SMsgHandler.h
+++ b/common/rfb/SMsgHandler.h
@@ -98,6 +98,9 @@ namespace rfb {
    virtual void udpUpgrade(const char *resp) = 0;
    virtual void udpDowngrade(const bool) = 0;
    virtual void subscribeUnixRelay(const char *name) = 0;
    virtual void unixRelay(const char *name, const rdr::U8 *buf, const unsigned len) = 0;
    ConnParams cp;
  };
 }
--- a/common/rfb/SMsgReader.cxx
+++ b/common/rfb/SMsgReader.cxx
@@ -100,6 +100,12 @@ void SMsgReader::readMsg()
  case msgTypeUpgradeToUdp:
    readUpgradeToUdp();
    break;
  case msgTypeSubscribeUnixRelay:
    readSubscribeUnixRelay();
    break;
  case msgTypeUnixRelay:
    readUnixRelay();
    break;
  default:
    fprintf(stderr, "unknown message type %d\n", msgType);
    throw Exception("unknown message type");
@@ -165,6 +171,9 @@ void SMsgReader::readSetMaxVideoResolution()
  if (!rfb::Server::ignoreClientSettingsKasm && handler->canChangeKasmSettings()) {
    sprintf(tmp, "%ux%u", width, height);
    rfb::Server::maxVideoResolution.setParam(tmp);
    vlog.debug("Client sent config param maxVideoResolution %ux%u, applied", width, height);
  } else {
    vlog.debug("Client sent config param maxVideoResolution %ux%u, ignored due to -IgnoreClientSettingsKasm/lacking perms", width, height);
  }
 }
@@ -357,3 +366,42 @@ void SMsgReader::readUpgradeToUdp()
  handler->udpUpgrade(resp);
 }
 void SMsgReader::readSubscribeUnixRelay()
 {
  const rdr::U8 namelen = is->readU8();
  char name[64];
  if (namelen >= sizeof(name)) {
    vlog.error("Ignoring subscribe with too large name");
    is->skip(namelen);
    return;
  }
  is->readBytes(name, namelen);
  name[namelen] = '\0';
  handler->subscribeUnixRelay(name);
 }
 void SMsgReader::readUnixRelay()
 {
  const rdr::U8 namelen = is->readU8();
  char name[64];
  if (namelen >= sizeof(name)) {
    vlog.error("Ignoring relay packet with too large name");
    is->skip(namelen);
    return;
  }
  is->readBytes(name, namelen);
  name[namelen] = '\0';
  const rdr::U32 len = is->readU32();
  rdr::U8 buf[1024 * 1024];
  if (len >= sizeof(buf)) {
    vlog.error("Ignoring relay packet with too large data");
    is->skip(len);
    return ;
  }
  is->readBytes(buf, len);
  handler->unixRelay(name, buf, len);
 }
--- a/common/rfb/SMsgReader.h
+++ b/common/rfb/SMsgReader.h
@@ -65,6 +65,9 @@ namespace rfb {
    void readUpgradeToUdp();
    void readSubscribeUnixRelay();
    void readUnixRelay();
    SMsgHandler* handler;
    rdr::InStream* is;
  };
--- a/common/rfb/SMsgWriter.cxx
+++ b/common/rfb/SMsgWriter.cxx
@@ -39,7 +39,7 @@ static LogWriter vlog("SMsgWriter");
 SMsgWriter::SMsgWriter(ConnParams* cp_, rdr::OutStream* os_, rdr::OutStream* udps_)
  : cp(cp_), os(os_), udps(udps_),
-    nRectsInUpdate(0), nRectsInHeader(0),
+    nRectsInUpdate(0), dataRectsInUpdate(0), nRectsInHeader(0),
    needSetDesktopSize(false), needExtendedDesktopSize(false),
    needSetDesktopName(false), needSetCursor(false),
    needSetXCursor(false), needSetCursorWithAlpha(false),
@@ -340,7 +340,7 @@ void SMsgWriter::writeFramebufferUpdateStart(int nRects)
  os->writeU16(nRects);
-  nRectsInUpdate = 0;
+  nRectsInUpdate = dataRectsInUpdate = 0;
  if (nRects == 0xFFFF)
    nRectsInHeader = 0;
  else
@@ -365,7 +365,7 @@ void SMsgWriter::writeFramebufferUpdateEnd()
    // Send an UDP flip marker, if needed
    if (cp->supportsUdp) {
-      udps->writeS16(0);
+      udps->writeS16(dataRectsInUpdate);
      udps->writeS16(0);
      udps->writeU16(0);
      udps->writeU16(0);
@@ -394,6 +394,7 @@ void SMsgWriter::startRect(const Rect& r, int encoding)
 {
  if (++nRectsInUpdate > nRectsInHeader && nRectsInHeader)
    throw Exception("SMsgWriter::startRect: nRects out of sync");
  ++dataRectsInUpdate;
  if (cp->supportsUdp) {
    udps->writeS16(r.tl.x);
@@ -749,3 +750,29 @@ void SMsgWriter::writeUdpUpgrade(const char *resp)
  endMsg();
 }
 void SMsgWriter::writeSubscribeUnixRelay(const bool success, const char *msg)
 {
  startMsg(msgTypeSubscribeUnixRelay);
  const rdr::U8 len = strlen(msg);
  os->writeU8(success);
  os->writeU8(len);
  os->writeBytes(msg, len);
  endMsg();
 }
 void SMsgWriter::writeUnixRelay(const char *name, const rdr::U8 *buf, const unsigned len)
 {
  startMsg(msgTypeUnixRelay);
  const rdr::U8 namelen = strlen(name);
  os->writeU8(namelen);
  os->writeBytes(name, namelen);
  os->writeU32(len);
  os->writeBytes(buf, len);
  endMsg();
 }
--- a/common/rfb/SMsgWriter.h
+++ b/common/rfb/SMsgWriter.h
@@ -129,6 +129,9 @@ namespace rfb {
    void writeUdpUpgrade(const char *resp);
    void writeSubscribeUnixRelay(const bool success, const char *msg);
    void writeUnixRelay(const char *name, const rdr::U8 *buf, const unsigned len);
  protected:
    void startMsg(int type);
    void endMsg();
@@ -162,6 +165,7 @@ namespace rfb {
    rdr::OutStream* udps;
    int nRectsInUpdate;
    int dataRectsInUpdate;
    int nRectsInHeader;
    bool needSetDesktopSize;
--- a/common/rfb/ServerCore.cxx
+++ b/common/rfb/ServerCore.cxx
@@ -185,6 +185,47 @@ rfb::BoolParameter rfb::Server::DLP_RegionAllowRelease
 "Allow click releases inside the blacked-out region",
 true);
 rfb::IntParameter rfb::Server::DLP_WatermarkRepeatSpace
 ("DLP_WatermarkRepeatSpace",
 "Number of pixels between repeats of the watermark",
 0, 0, 4096);
 rfb::IntParameter rfb::Server::DLP_WatermarkFontSize
 ("DLP_WatermarkFontSize",
 "Font size for -DLP_WatermarkText",
 48, 8, 256);
 rfb::IntParameter rfb::Server::DLP_WatermarkTimeOffset
 ("DLP_WatermarkTimeOffset",
 "Offset from UTC for -DLP_WatermarkText",
 0, -24, 24);
 rfb::IntParameter rfb::Server::DLP_WatermarkTimeOffsetMinutes
 ("DLP_WatermarkTimeOffsetMinutes",
 "Offset from UTC for -DLP_WatermarkText, minutes",
 0, -24 * 60, 24 * 60);
 rfb::IntParameter rfb::Server::DLP_WatermarkTextAngle
 ("DLP_WatermarkTextAngle",
 "Angle for -DLP_WatermarkText rotation",
 0, -359, 359);
 rfb::StringParameter rfb::Server::DLP_WatermarkImage
 ("DLP_WatermarkImage",
 "PNG file to use as a watermark",
 "");
 rfb::StringParameter rfb::Server::DLP_WatermarkLocation
 ("DLP_WatermarkLocation",
 "Place the watermark at this position from the corner.",
 "");
 rfb::StringParameter rfb::Server::DLP_WatermarkTint
 ("DLP_WatermarkTint",
 "Tint the greyscale watermark by this color.",
 "255,255,255,255");
 rfb::StringParameter rfb::Server::DLP_WatermarkText
 ("DLP_WatermarkText",
 "Use this text instead of an image for the watermark, with strftime time formatting",
 "");
 rfb::StringParameter rfb::Server::DLP_WatermarkFont
 ("DLP_WatermarkFont",
 "Use this font for -DLP_WatermarkText instead of the bundled one",
 "");
 rfb::StringParameter rfb::Server::maxVideoResolution
 ("MaxVideoResolution",
 "When in video mode, downscale the screen to max this size.",
--- a/common/rfb/ServerCore.h
+++ b/common/rfb/ServerCore.h
@@ -48,9 +48,19 @@ namespace rfb {
    static IntParameter DLP_ClipAcceptMax;
    static IntParameter DLP_ClipDelay;
    static IntParameter DLP_KeyRateLimit;
    static IntParameter DLP_WatermarkRepeatSpace;
    static IntParameter DLP_WatermarkFontSize;
    static IntParameter DLP_WatermarkTimeOffset;
    static IntParameter DLP_WatermarkTimeOffsetMinutes;
    static IntParameter DLP_WatermarkTextAngle;
    static StringParameter DLP_ClipLog;
    static StringParameter DLP_Region;
    static StringParameter DLP_Clip_Types;
    static StringParameter DLP_WatermarkImage;
    static StringParameter DLP_WatermarkLocation;
    static StringParameter DLP_WatermarkTint;
    static StringParameter DLP_WatermarkText;
    static StringParameter DLP_WatermarkFont;
    static BoolParameter DLP_RegionAllowClick;
    static BoolParameter DLP_RegionAllowRelease;
    static IntParameter jpegVideoQuality;
--- a/common/rfb/TightConstants.h
+++ b/common/rfb/TightConstants.h
@@ -25,7 +25,8 @@ namespace rfb {
  const unsigned int tightPng = 0x0a;
  const unsigned int tightWebp = 0x0b;
  const unsigned int tightQoi = 0x0c;
-  const unsigned int tightMaxSubencoding = 0x0c;
+  const unsigned int tightIT = 0x0d;
  const unsigned int tightMaxSubencoding = 0x0d;
  // Filters to improve compression efficiency
  const unsigned int tightFilterCopy = 0x00;
--- a/common/rfb/TightEncoder.cxx
+++ b/common/rfb/TightEncoder.cxx
@@ -277,6 +277,28 @@ void TightEncoder::resetZlib()
  zlibNeedsReset = true;
 }
 void TightEncoder::writeWatermarkRect(const rdr::U8 *data, const unsigned len,
                                      const rdr::U8 r,
                                      const rdr::U8 g,
                                      const rdr::U8 b,
                                      const rdr::U8 a)
 {
  rdr::OutStream* os;
  os = conn->getOutStream(conn->cp.supportsUdp);
  os->writeU8(tightIT << 4);
  writeCompact(os, len + 4);
  os->writeU8(r);
  os->writeU8(g);
  os->writeU8(b);
  os->writeU8(a);
  os->writeBytes(data, len);
 }
 //
 // Including BPP-dependent implementation of the encoder.
 //
--- a/common/rfb/TightEncoder.h
+++ b/common/rfb/TightEncoder.h
@@ -39,6 +39,11 @@ namespace rfb {
    virtual void writeSolidRect(int width, int height,
                                const PixelFormat& pf,
                                const rdr::U8* colour);
    void writeWatermarkRect(const rdr::U8 *data, const unsigned len,
                            const rdr::U8 r,
                            const rdr::U8 g,
                            const rdr::U8 b,
                            const rdr::U8 a);
    void resetZlib();
  protected:
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -51,6 +51,8 @@ static Cursor emptyCursor(0, 0, Point(0, 0), NULL);
 extern rfb::BoolParameter disablebasicauth;
 extern "C" char unixrelaynames[MAX_UNIX_RELAYS][MAX_UNIX_RELAY_NAME_LEN];
 VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
                                   bool reverse)
  : upgradingToUdp(false), sock(s), reverseConnection(reverse),
@@ -64,7 +66,7 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
    needsPermCheck(false), pointerEventTime(0),
    clientHasCursor(false),
    accessRights(AccessDefault), startTime(time(0)), frameTracking(false),
-    udpFramesSinceFull(0)
+    udpFramesSinceFull(0), complainedAboutNoViewRights(false)
 {
  setStreams(&sock->inStream(), &sock->outStream());
  peerEndpoint.buf = sock->getPeerEndpoint();
@@ -73,6 +75,10 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
  memset(bstats_total, 0, sizeof(bstats_total));
  gettimeofday(&connStart, NULL);
  unsigned i;
  for (i = 0; i < MAX_UNIX_RELAYS; i++)
    unixRelaySubscriptions[i][0] = '\0';
  // Check their permissions, if applicable
  kasmpasswdpath[0] = '\0';
  wordexp_t wexp;
@@ -82,8 +88,8 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
  wordfree(&wexp);
  user[0] = '\0';
-  const char *at = strchr(peerEndpoint.buf, '@');
+  const char *at = strrchr(peerEndpoint.buf, '@');
-  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < 32) {
+  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < USERNAME_LEN) {
    memcpy(user, peerEndpoint.buf, at - peerEndpoint.buf);
    user[at - peerEndpoint.buf] = '\0';
  }
@@ -991,8 +997,8 @@ void VNCSConnectionST::setDesktopSize(int fb_width, int fb_height,
 {
  unsigned int result;
-  if (!(accessRights & AccessSetDesktopSize)) return;
+  if (!(accessRights & AccessSetDesktopSize)) goto justnotify;
-  if (!rfb::Server::acceptSetDesktopSize) return;
+  if (!rfb::Server::acceptSetDesktopSize) goto justnotify;
  // Don't bother the desktop with an invalid configuration
  if (!layout.validate(fb_width, fb_height)) {
@@ -1015,6 +1021,14 @@ void VNCSConnectionST::setDesktopSize(int fb_width, int fb_height,
        throw Exception("Desktop configured a different screen layout than requested");
    server->notifyScreenLayoutChange(this);
  }
  return;
  justnotify:
  writer()->writeExtendedDesktopSize(reasonClient, resultProhibited,
                                     server->pb->getRect().width(),
                                     server->pb->getRect().height(),
                                     server->screenLayout);
 }
 void VNCSConnectionST::fence(rdr::U32 flags, unsigned len, const char data[])
@@ -1308,8 +1322,14 @@ void VNCSConnectionST::writeFramebufferUpdate()
    }
  }
-  if (!(accessRights & AccessView))
+  if (!(accessRights & AccessView)) {
    if (!complainedAboutNoViewRights) {
      complainedAboutNoViewRights = true;
      vlog.error("User %s has no read permissions. If this is not intended, grant them permissions with kasmvncpasswd or via the API",
                 user);
    }
    return;
  }
  // Updates often consists of many small writes, and in continuous
  // mode, we will also have small fence messages around the update. We
@@ -1623,7 +1643,7 @@ void VNCSConnectionST::sendStats(const bool toClient) {
 void VNCSConnectionST::handleFrameStats(rdr::U32 all, rdr::U32 render)
 {
  if (server->apimessager) {
-    const char *at = strchr(peerEndpoint.buf, '@');
+    const char *at = strrchr(peerEndpoint.buf, '@');
    if (!at)
      at = peerEndpoint.buf;
    else
@@ -1777,6 +1797,60 @@ void VNCSConnectionST::udpDowngrade(const bool byServer)
  cp.useCopyRect = true;
  encodeManager.resetZlib();
  if (Server::DLP_WatermarkImage[0])
    cp.useCopyRect = false;
  vlog.info("Client %s downgrading from udp by %s", sock->getPeerAddress(),
            byServer ? "the server" : "its own request");
 }
 void VNCSConnectionST::subscribeUnixRelay(const char *name)
 {
  bool read, write, owner;
  if (!getPerms(read, write, owner) || !write) {
    // Need write permissions to subscribe
    writer()->writeSubscribeUnixRelay(false, "No permissions");
    vlog.info("Client tried to subscribe to unix channel %s without permissions", name);
    return;
  }
  unsigned i;
  bool found = false;
  for (i = 0; i < MAX_UNIX_RELAYS; i++) {
    if (!strcmp(name, unixrelaynames[i])) {
      found = true;
      break;
    }
  }
  if (!found) {
    writer()->writeSubscribeUnixRelay(false, "No such unix channel");
    vlog.info("Client tried to subscribe to nonexistent unix channel %s", name);
    return;
  }
  writer()->writeSubscribeUnixRelay(true, "Ok");
  for (i = 0; i < MAX_UNIX_RELAYS; i++) {
    if (!unixRelaySubscriptions[i][0]) {
      strcpy(unixRelaySubscriptions[i], name);
      break;
    }
  }
 }
 void VNCSConnectionST::unixRelay(const char *name, const rdr::U8 *buf, const unsigned len)
 {
  unsigned i;
  for (i = 0; i < MAX_UNIX_RELAYS; i++) {
    if (!strcmp(unixRelaySubscriptions[i], name)) {
      server->desktop->receivedUnixRelayData(name, buf, len);
      return;
    }
  }
 }
 void VNCSConnectionST::sendUnixRelayData(const char name[], const unsigned char *buf,
                                         const unsigned len)
 {
  writer()->writeUnixRelay(name, buf, len);
 }
--- a/common/rfb/VNCSConnectionST.h
+++ b/common/rfb/VNCSConnectionST.h
@@ -33,6 +33,9 @@
 #include <rfb/EncodeManager.h>
 #include <rfb/SConnection.h>
 #include <rfb/Timer.h>
 #include <rfb/unixRelayLimits.h>
 #include "kasmpasswd.h"
 namespace rfb {
  class VNCServerST;
@@ -200,6 +203,22 @@ namespace rfb {
    bool upgradingToUdp;
    bool isSubscribedToUnixRelay(const char *name) const {
      unsigned i;
      for (i = 0; i < MAX_UNIX_RELAYS; i++) {
        if (!strcmp(unixRelaySubscriptions[i], name))
          return true;
      }
      return false;
    }
    virtual void sendUnixRelayData(const char name[], const unsigned char *buf,
                                   const unsigned len);
    bool sendWatermark() const {
        return server->sendWatermark;
    }
  private:
    // SConnection callbacks
@@ -222,6 +241,8 @@ namespace rfb {
    virtual void handleClipboardAnnounce(bool available);
    virtual void handleClipboardAnnounceBinary(const unsigned num, const char mimes[][32]);
    virtual void udpUpgrade(const char *resp);
    virtual void subscribeUnixRelay(const char *name);
    virtual void unixRelay(const char *name, const rdr::U8 *buf, const unsigned len);
    virtual void supportsLocalCursor();
    virtual void supportsFence();
    virtual void supportsContinuousUpdates();
@@ -303,7 +324,7 @@ namespace rfb {
    rdr::U64 bstats_total[BS_NUM];
    struct timeval connStart;
-    char user[32];
+    char user[USERNAME_LEN];
    char kasmpasswdpath[4096];
    bool needsPermCheck;
@@ -324,6 +345,9 @@ namespace rfb {
    bool frameTracking;
    uint32_t udpFramesSinceFull;
    char unixRelaySubscriptions[MAX_UNIX_RELAYS][MAX_UNIX_RELAY_NAME_LEN];
    bool complainedAboutNoViewRights;
  };
 }
 #endif
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -62,6 +62,7 @@
 #include <rfb/ServerCore.h>
 #include <rfb/VNCServerST.h>
 #include <rfb/VNCSConnectionST.h>
 #include <rfb/Watermark.h>
 #include <rfb/util.h>
 #include <rfb/ledStates.h>
@@ -134,7 +135,7 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
    queryConnectionHandler(0), keyRemapper(&KeyRemapper::defInstance),
    lastConnectionTime(0), disableclients(false),
    frameTimer(this), apimessager(NULL), trackingFrameStats(0),
-    clipboardId(0)
+    clipboardId(0), sendWatermark(false)
 {
  lastUserInputTime = lastDisconnectTime = time(0);
  slog.debug("creating single-threaded server %s", name.buf);
@@ -222,6 +223,9 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
  trackingClient[0] = 0;
  if (watermarkData)
    sendWatermark = true;
  if (Server::selfBench)
    SelfBench();
 }
@@ -278,6 +282,9 @@ void VNCServerST::addSocket(network::Socket* sock, bool outgoing)
  VNCSConnectionST* client = new VNCSConnectionST(this, sock, outgoing);
  client->init();
  if (watermarkData)
    sendWatermark = true;
 }
 void VNCServerST::removeSocket(network::Socket* sock) {
@@ -813,7 +820,7 @@ static void upgradeClientToUdp(const network::GetAPIMessager::action_data &act,
    inet_ntop(AF_INET, &act.udp.ip, buf, 32);
    const char * const who = (*ci)->getPeerEndpoint();
-    const char *start = strchr(who, '@');
+    const char *start = strrchr(who, '@');
    if (!start)
      continue;
    start++;
@@ -832,9 +839,8 @@ static void upgradeClientToUdp(const network::GetAPIMessager::action_data &act,
  }
 }
-static void checkAPIMessages(network::GetAPIMessager *apimessager,
+void VNCServerST::checkAPIMessages(network::GetAPIMessager *apimessager,
-                             rdr::U8 &trackingFrameStats, char trackingClient[],
+                             rdr::U8 &trackingFrameStats, char trackingClient[])
                             std::list<VNCSConnectionST*> &clients)
 {
  if (pthread_mutex_lock(&apimessager->userMutex))
    return;
@@ -866,6 +872,15 @@ static void checkAPIMessages(network::GetAPIMessager *apimessager,
      case network::GetAPIMessager::UDP_UPGRADE:
        upgradeClientToUdp(act, clients);
      break;
      case network::GetAPIMessager::CLEAR_CLIPBOARD:
        clearBinaryClipboardData();
        clipboardClient = NULL;
        desktop->handleClipboardAnnounceBinary(0, NULL);
        sendBinaryClipboardData("text/plain", NULL, 0);
        desktop->clearLocalClipboards();
      break;
    }
  }
@@ -965,6 +980,11 @@ void VNCServerST::writeUpdate()
    blackOut();
  }
  if (watermarkData && Server::DLP_WatermarkText[0] && watermarkTextNeedsUpdate(true)) {
    // The text may have changed
    sendWatermark = true;
  }
  comparer->getUpdateInfo(&ui, pb->getRect());
  toCheck = ui.changed.union_(ui.copied);
@@ -1031,7 +1051,7 @@ void VNCServerST::writeUpdate()
    shottime = msSince(&shotstart);
    trackingFrameStats = 0;
-    checkAPIMessages(apimessager, trackingFrameStats, trackingClient, clients);
+    checkAPIMessages(apimessager, trackingFrameStats, trackingClient);
  }
  const rdr::U8 origtrackingFrameStats = trackingFrameStats;
@@ -1040,6 +1060,9 @@ void VNCServerST::writeUpdate()
  memset(&jpegstats, 0, sizeof(EncodeManager::codecstats_t));
  memset(&webpstats, 0, sizeof(EncodeManager::codecstats_t));
  if (watermarkData)
      updateWatermark();
  for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
    ci_next = ci; ci_next++;
@@ -1087,6 +1110,8 @@ void VNCServerST::writeUpdate()
    }
  }
  sendWatermark = false; // the client now caches it, only send once
  if (trackingFrameStats) {
    if (enctime) {
      const unsigned totalMs = msSince(&start);
@@ -1236,3 +1261,15 @@ void VNCServerST::refreshClients()
    (*i)->add_changed_all();
  }
 }
 void VNCServerST::sendUnixRelayData(const char name[],
                                    const unsigned char *buf, const unsigned len)
 {
  // For each client subscribed to this channel, send the data to them
  std::list<VNCSConnectionST*>::iterator i;
  for (i = clients.begin(); i != clients.end(); i++) {
    if ((*i)->isSubscribedToUnixRelay(name)) {
      (*i)->sendUnixRelayData(name, buf, len);
    }
  }
 }
--- a/Show More
+++ b/Show More
`@@ -1,4 +1,4 @@`
	`FROM fedora:33`	`FROM fedora:38`

	`ENV STARTUPDIR=/dockerstartup`	`ENV STARTUPDIR=/dockerstartup`
`@@ -1,4 +1,4 @@`
	`FROM opensuse/leap:15.3`	`FROM opensuse/leap:15.5`

	`ENV STARTUPDIR=/dockerstartup`	`ENV STARTUPDIR=/dockerstartup`