Merge branch 'bugfix/KASM-4239-index.html-symlink' into 'master'

Resolve KASM-4239 "Bugfix/ index.html symlink"

Closes KASM-4239

See merge request kasm-technologies/internal/KasmVNC!98

builder/build_www.sh

@@ -15,3 +15,4 @@ cd /build
 rm *.md
 rm AUTHORS
 rm vnc.html
+ln -s index.html vnc.html

builder/dockerfile.oracle_9.barebones.rpm.test

@@ -4,7 +4,6 @@ ENV STARTUPDIR=/dockerstartup
 
 RUN dnf install -y \
   less \
-  redhat-lsb-core \
   vim \
   xterm
 RUN dnf config-manager --set-enabled ol9_codeready_builder
@@ -14,6 +13,9 @@ 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
 

centos/kasmvncserver.spec

@@ -11,14 +11,14 @@ Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
-KasmVNC provides remote web-based access to a Desktop or application. 
-While VNC is in the name, KasmVNC differs from other VNC variants such 
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB 
-specification which defines VNC, in order to support modern technologies 
-and increase security. KasmVNC is accessed by users from any modern 
-browser and does not support legacy VNC viewer applications. KasmVNC 
-uses a modern YAML based configuration at the server and user level, 
-allowing for ease of management. KasmVNC is maintained by Kasm 
+KasmVNC provides remote web-based access to a Desktop or application.
+While VNC is in the name, KasmVNC differs from other VNC variants such
+as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
+specification which defines VNC, in order to support modern technologies
+and increase security. KasmVNC is accessed by users from any modern
+browser and does not support legacy VNC viewer applications. KasmVNC
+uses a modern YAML based configuration at the server and user level,
+allowing for ease of management. KasmVNC is maintained by Kasm
 Technologies Corp, www.kasmweb.com.
 
 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
 

debian/Makefile.to_fakebuild_tar_package

@@ -22,8 +22,8 @@ install: unpack_tarball
 	cp $(SRC_BIN)/kasmxproxy $(DESTDIR)/usr/bin/
 	cp -r $(SRC)/lib/kasmvnc/ $(DESTDIR)/usr/lib/kasmvncserver
 	cp -r $(SRC)/share/doc/kasmvnc*/* $(DESTDIR)/usr/share/doc/kasmvncserver/
-	rsync -r --exclude '.git*' --exclude po2js --exclude xgettext-html \
-	  --exclude www/utils/ --exclude .eslintrc \
+	rsync -r --links --safe-links --exclude '.git*' --exclude po2js \
+		--exclude xgettext-html --exclude www/utils/ --exclude .eslintrc \
 	  $(SRC)/share/kasmvnc $(DESTDIR)/usr/share
 	sed -e 's/^\([^#]\)/# \1/' $(SRC)/share/kasmvnc/kasmvnc_defaults.yaml > \
 		$(DESTDIR)/etc/kasmvnc/kasmvnc.yaml

fedora/kasmvncserver.spec

@@ -7,18 +7,18 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
-Requires: xorg-x11-xauth, xkeyboard-config, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, mesa-libgbm, libxshmfence
+Requires: xorg-x11-xauth, xkeyboard-config, xkbcomp, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, mesa-libgbm, libxshmfence
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
-KasmVNC provides remote web-based access to a Desktop or application. 
-While VNC is in the name, KasmVNC differs from other VNC variants such 
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB 
-specification which defines VNC, in order to support modern technologies 
-and increase security. KasmVNC is accessed by users from any modern 
-browser and does not support legacy VNC viewer applications. KasmVNC 
-uses a modern YAML based configuration at the server and user level, 
-allowing for ease of management. KasmVNC is maintained by Kasm 
+KasmVNC provides remote web-based access to a Desktop or application.
+While VNC is in the name, KasmVNC differs from other VNC variants such
+as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
+specification which defines VNC, in order to support modern technologies
+and increase security. KasmVNC is accessed by users from any modern
+browser and does not support legacy VNC viewer applications. KasmVNC
+uses a modern YAML based configuration at the server and user level,
+allowing for ease of management. KasmVNC is maintained by Kasm
 Technologies Corp, www.kasmweb.com.
 
 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
 

opensuse/kasmvncserver.spec

@@ -50,7 +50,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
 

oracle/kasmvncserver.spec

@@ -11,14 +11,14 @@ Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
-KasmVNC provides remote web-based access to a Desktop or application. 
-While VNC is in the name, KasmVNC differs from other VNC variants such 
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB 
-specification which defines VNC, in order to support modern technologies 
-and increase security. KasmVNC is accessed by users from any modern 
-browser and does not support legacy VNC viewer applications. KasmVNC 
-uses a modern YAML based configuration at the server and user level, 
-allowing for ease of management. KasmVNC is maintained by Kasm 
+KasmVNC provides remote web-based access to a Desktop or application.
+While VNC is in the name, KasmVNC differs from other VNC variants such
+as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
+specification which defines VNC, in order to support modern technologies
+and increase security. KasmVNC is accessed by users from any modern
+browser and does not support legacy VNC viewer applications. KasmVNC
+uses a modern YAML based configuration at the server and user level,
+allowing for ease of management. KasmVNC is maintained by Kasm
 Technologies Corp, www.kasmweb.com.
 
 WARNING: this package requires EPEL and CodeReady builder.
@@ -51,7 +51,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
 

oracle/kasmvncserver9.spec

@@ -7,18 +7,18 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
-Requires: xorg-x11-xauth, 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, hostname, mesa-libgbm, libxshmfence
+Requires: xorg-x11-xauth, xkeyboard-config, xorg-x11-server-utils, xkbcomp, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, hostname, mesa-libgbm, libxshmfence
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
-KasmVNC provides remote web-based access to a Desktop or application. 
-While VNC is in the name, KasmVNC differs from other VNC variants such 
-as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB 
-specification which defines VNC, in order to support modern technologies 
-and increase security. KasmVNC is accessed by users from any modern 
-browser and does not support legacy VNC viewer applications. KasmVNC 
-uses a modern YAML based configuration at the server and user level, 
-allowing for ease of management. KasmVNC is maintained by Kasm 
+KasmVNC provides remote web-based access to a Desktop or application.
+While VNC is in the name, KasmVNC differs from other VNC variants such
+as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB
+specification which defines VNC, in order to support modern technologies
+and increase security. KasmVNC is accessed by users from any modern
+browser and does not support legacy VNC viewer applications. KasmVNC
+uses a modern YAML based configuration at the server and user level,
+allowing for ease of management. KasmVNC is maintained by Kasm
 Technologies Corp, www.kasmweb.com.
 
 WARNING: this package requires EPEL and CodeReady builder.
@@ -51,7 +51,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