Merge branch 'bugfix/KASM-5743_bufixes_1.2.1' into 'release/1.2.1'

Resolve KASM-5743 "Bugfix/ bufixes 1.2.1" See merge request kasm-technologies/internal/KasmVNC!130
fix dates in changelog
2024-03-15 12:01:33 +00:00 · 2024-03-12 14:45:56 -04:00 · 2024-03-12 11:39:26 -04:00 · 2024-01-09 11:23:21 -05:00 · 2023-09-13 23:39:36 +00:00
9 changed files with 30 additions and 8 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = master
+	branch = release/1.1.3
--- a/centos/kasmvncserver.spec
+++ b/centos/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser

@@ -83,6 +83,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
+- Fix exception with Firefox 124 and later
+- Fix bug with watermarking on odd resolutions
 * 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.
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kasmvnc (1.2.1-1) unstable; urgency=medium
+
+  * Fix exception with Firefox 124 and later
+  * Fix bug with watermarking on odd resolutions
+
+ -- Kasm Technologies LLC <info@kasmweb.com>  Tue, 12 Mar 2023 11:38:00 +0000
+
 kasmvnc (1.2.0-1) unstable; urgency=medium

  * Add support for Unix relays for bidirectional communication between noVNC
--- a/fedora/kasmvncserver.spec
+++ b/fedora/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser

@@ -83,6 +83,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
+- Fix exception with Firefox 124 and later
+- Fix bug with watermarking on odd resolutions
 * 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.
--- a/2
+++ b/2
--- a/opensuse/kasmvncserver.spec
+++ b/opensuse/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.2.0
+Version:        1.2.1
 Release:        leap15
 Summary:        VNC server accessible from a web browser

@@ -81,6 +81,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
+- Fix exception with Firefox 124 and later
+- Fix bug with watermarking on odd resolutions
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-leap15
 - Add support for Unix relays for bidirectional communication between noVNC
  and containerized applications.
--- a/oracle/kasmvncserver.spec
+++ b/oracle/kasmvncserver.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser

@@ -82,6 +82,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
+- Fix exception with Firefox 124 and later
+- Fix bug with watermarking on odd resolutions
 * 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.
--- a/oracle/kasmvncserver9.spec
+++ b/oracle/kasmvncserver9.spec
@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser

@@ -82,6 +82,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md

 %changelog
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
+- Fix exception with Firefox 124 and later
+- Fix bug with watermarking on odd resolutions
 * 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.
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -96,7 +96,7 @@ from the X Consortium.
 #include "version-config.h"
 #include "site.h"

-#define XVNCVERSION "KasmVNC 1.2.0"
+#define XVNCVERSION "KasmVNC 1.2.1"
 #define XVNCCOPYRIGHT ("Copyright (C) 1999-2018 KasmVNC Team and many others (see README.me)\n" \
                       "See http://kasmweb.com for information on KasmVNC.\n")
Author	SHA1	Message	Date
Justin Travis	0ef21b67f0	Merge branch 'bugfix/KASM-5743_bufixes_1.2.1' into 'release/1.2.1' Resolve KASM-5743 "Bugfix/ bufixes 1.2.1" See merge request kasm-technologies/internal/KasmVNC!130	2024-03-15 12:01:33 +00:00
Matt McClaskey	750da39e39	fix dates in changelog	2024-03-12 14:45:56 -04:00
Matt McClaskey	aa4261df56	KASM-5743 bump version num, update novnc ref	2024-03-12 11:39:26 -04:00
Matt McClaskey	bcd887fb5c	KASM-5429 bufix update	2024-01-09 11:23:21 -05:00
Matthew McClaskey	2af2e661e9	Merge branch 'master' into 'release/1.2.0' Ingest version changes to cut new installers See merge request kasm-technologies/internal/KasmVNC!111	2023-09-13 23:39:36 +00:00