From 4290a9e73c7a0be76147bf5e7fe5618063864d97 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Tue, 21 Jan 2025 14:53:42 -0500
Subject: [PATCH 1/3] KASM-6852 add Fedora 41 buiild logic

---
 .gitlab-ci.yml                               | 38 +++++++++
 builder/dockerfile.fedora_fortyone.build     | 86 ++++++++++++++++++++
 builder/dockerfile.fedora_fortyone.rpm.build | 13 +++
 3 files changed, 137 insertions(+)
 create mode 100644 builder/dockerfile.fedora_fortyone.build
 create mode 100644 builder/dockerfile.fedora_fortyone.rpm.build

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdedf3f..6dd1bf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -637,6 +637,44 @@ build_fedora_forty_arm:
     paths:
       - output/
 
+build_fedora_fortyone:
+  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 fortyone;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+    
+build_fedora_fortyone_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 fortyone;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+
 build_alpine_317:
   stage: build
   allow_failure: true
diff --git a/builder/dockerfile.fedora_fortyone.build b/builder/dockerfile.fedora_fortyone.build
new file mode 100644
index 0000000..914345f
--- /dev/null
+++ b/builder/dockerfile.fedora_fortyone.build
@@ -0,0 +1,86 @@
+FROM fedora:41
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME forty
+ENV XORG_VER 21.1.15
+
+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"]
diff --git a/builder/dockerfile.fedora_fortyone.rpm.build b/builder/dockerfile.fedora_fortyone.rpm.build
new file mode 100644
index 0000000..07d9737
--- /dev/null
+++ b/builder/dockerfile.fedora_fortyone.rpm.build
@@ -0,0 +1,13 @@
+FROM fedora:41
+
+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

From ed5592ed6b2d0bbe6feabf0f75037f4435890686 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Tue, 21 Jan 2025 15:20:01 -0500
Subject: [PATCH 2/3] KASM-6852 fix 41

---
 builder/dockerfile.fedora_fortyone.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/builder/dockerfile.fedora_fortyone.build b/builder/dockerfile.fedora_fortyone.build
index 914345f..49cdfa0 100644
--- a/builder/dockerfile.fedora_fortyone.build
+++ b/builder/dockerfile.fedora_fortyone.build
@@ -7,8 +7,9 @@ ENV XORG_VER 21.1.15
 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 \

From e8f1787dc208909ea6756a70c821997351b537af Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Tue, 21 Jan 2025 15:35:48 -0500
Subject: [PATCH 3/3] KASM-6852 fix 41

---
 builder/dockerfile.fedora_fortyone.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/dockerfile.fedora_fortyone.build b/builder/dockerfile.fedora_fortyone.build
index 49cdfa0..5c2bf48 100644
--- a/builder/dockerfile.fedora_fortyone.build
+++ b/builder/dockerfile.fedora_fortyone.build
@@ -1,7 +1,7 @@
 FROM fedora:41
 
 ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME forty
+ENV KASMVNC_BUILD_OS_CODENAME fortyone
 ENV XORG_VER 21.1.15
 
 RUN \