Merge branch 'feature/VNC-292-add-support-for-fedora-42-and-43' into 'master'

Resolve VNC-292 "Feature/ add support for fedora 42 and 43"

Closes VNC-292

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

.gitlab-ci.yml

@@ -74,9 +74,9 @@ stages:
         GROUP: 8
       - DISTRO: 'opensuse 15'
         GROUP: 9
-      - DISTRO: 'fedora forty'
+      - DISTRO: 'fedora 42'
         GROUP: 10
-      - DISTRO: 'fedora fortyone'
+      - DISTRO: 'fedora 43'
         GROUP: 11
       - DISTRO: 'alpine 318'
         GROUP: 12
@@ -98,6 +98,7 @@ functional_test:
   tags:
     - oci-fixed-amd
   before_script:
+    - *prepare_build
     - . .ci/helpers.sh
   script:
     - prepare_to_run_functional_tests

builder/dockerfile.fedora_42.barebones.rpm.test

@@ -1,11 +1,10 @@
-FROM fedora:40
+FROM fedora:42
 
 ENV STARTUPDIR=/dockerstartup
 
 ARG RUN_TEST
 RUN [ "$RUN_TEST" = 1 ] || dnf install -y \
   less \
-  redhat-lsb-core \
   vim \
   xterm
 
@@ -16,6 +15,8 @@ COPY $KASMVNC_PACKAGE_DIR/kasmvncserver-*.rpm /tmp/
 COPY fedora/kasmvncserver.spec /tmp/
 RUN /tmp/scripts/install_kasmvncserver_package
 
+RUN update-crypto-policies --set FIPS:SHA1
+
 RUN mkdir -p $STARTUPDIR
 COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
 

builder/dockerfile.fedora_42.build

@@ -1,8 +1,8 @@
-FROM fedora:41
+FROM fedora:42
 
 ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME fortyone
-ENV XORG_VER 21.1.15
+ENV KASMVNC_BUILD_OS_CODENAME 42
+ENV XORG_VER 21.1.21
 
 RUN \
   echo "**** install build deps ****" && \

builder/dockerfile.fedora_42.rpm.build

@@ -1,8 +1,10 @@
-FROM fedora:41
+FROM fedora:42
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME 42
 
 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

builder/dockerfile.fedora_43.barebones.rpm.test

@@ -1,11 +1,10 @@
-FROM fedora:41
+FROM fedora:43
 
 ENV STARTUPDIR=/dockerstartup
 
 ARG RUN_TEST
 RUN [ "$RUN_TEST" = 1 ] || dnf install -y \
   less \
-  redhat-lsb-core \
   vim \
   xterm
 
@@ -16,6 +15,8 @@ COPY $KASMVNC_PACKAGE_DIR/kasmvncserver-*.rpm /tmp/
 COPY fedora/kasmvncserver.spec /tmp/
 RUN /tmp/scripts/install_kasmvncserver_package
 
+RUN update-crypto-policies --set FIPS:SHA1
+
 RUN mkdir -p $STARTUPDIR
 COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
 

builder/dockerfile.fedora_43.build

@@ -1,14 +1,15 @@
-FROM fedora:40
+FROM fedora:43
 
 ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME forty
-ENV XORG_VER 1.20.14
+ENV KASMVNC_BUILD_OS_CODENAME 43
+ENV XORG_VER 21.1.21
 
 RUN \
   echo "**** install build deps ****" && \
   dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
+    c-development \
+    development-tools \
+    development-libs && \
   dnf install -y \
     autoconf \
     automake \

builder/dockerfile.fedora_43.rpm.build

@@ -1,8 +1,10 @@
-FROM fedora:40
+FROM fedora:43
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME 43
 
 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

builder/scripts/build-tbb

@@ -30,6 +30,7 @@ build_and_install() {
         cp -r include/* /usr/include/
     else
         cmake -B build -DCMAKE_INSTALL_PREFIX=/usr/local \
+            -DCMAKE_CXX_FLAGS="-Wno-stringop-overflow" \
             -DTBB_TEST=OFF -DBUILD_SHARED_LIBS=OFF -GNinja .
         ninja -C build install
     fi

fedora/kasmvncserver.spec

@@ -7,7 +7,7 @@ License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
-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, perl-DateTime-TimeZone, mesa-libgbm, libxshmfence, hostname
+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, perl-DateTime-TimeZone, mesa-libgbm, libxshmfence, hostname, crypto-policies-scripts
 Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
@@ -28,8 +28,8 @@ WARNING: this package requires EPEL.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-TARGET_OS=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
-TARGET_OS_CODENAME=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
+TARGET_OS=$KASMVNC_BUILD_OS
+TARGET_OS_CODENAME=$KASMVNC_BUILD_OS_CODENAME
 TARBALL=$RPM_SOURCE_DIR/kasmvnc.${TARGET_OS}_${TARGET_OS_CODENAME}.tar.gz
 TAR_DATA=$(mktemp -d)
 tar -xzf "$TARBALL" -C "$TAR_DATA"