From 5a42f35a8ab71f0f1c38e8a54687369fd1b60e0a Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 26 Sep 2025 15:19:43 -0500
Subject: [PATCH 1/3] Revert "Revert "Updated Java Development Kit to 21.0.8""

This reverts commit fdec8fa7c6d7409a660713ab9d84da2d05896000.

Working backwards to a working setup related to ENT-13247 changes.
---
 ci/linux-install-jdk21.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/linux-install-jdk21.sh b/ci/linux-install-jdk21.sh
index 4dc633087..5ab921451 100755
--- a/ci/linux-install-jdk21.sh
+++ b/ci/linux-install-jdk21.sh
@@ -9,15 +9,15 @@ install_jdk() {
   baseurl=https://download.oracle.com/java/21/archive/
   major_version=21
   baseurl="https://download.oracle.com/java/${major_version}/archive/"
-  version=21.0.7
+  version=21.0.8
   if uname -m | grep aarch64; then
     tarball=jdk-${version}_linux-aarch64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/archive/jdk-${version}_linux-aarch64_bin.tar.gz.sha256
-    sha=47372cfa9244dc74ec783a1b287381502419b564fbd0b18abc8f2d6b19ac865e
+    sha=708064ee3a1844245d83be483ff42cc9ca0c482886a98be7f889dff69ac77850
   else
     tarball=jdk-${version}_linux-x64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/latest/jdk-${version}_linux-x64_bin.tar.gz.sha256
-    sha=267b10b14b4e5fada19aca3be3b961ce4f81f1bd3ffcd070e90a5586106125eb
+    sha=d87272944278713fc7a120cf024d2818d136b5debc750aa17045e3c6f045b867
   fi
   wget --quiet "$baseurl$tarball"
   echo "$sha  $tarball" | sha256sum --check -

From 6b68c0103fb01321a654353d82270ab8296f79ef Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 26 Sep 2025 15:20:20 -0500
Subject: [PATCH 2/3] Revert "Updated quick install script checksum"

This reverts commit a79dd97320383d37c50d828e573250de52733b5a.
---
 ci/quick-install-cfengine-enterprise.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/quick-install-cfengine-enterprise.sh.sha256 b/ci/quick-install-cfengine-enterprise.sh.sha256
index 66ede6082..084e2d2ce 100644
--- a/ci/quick-install-cfengine-enterprise.sh.sha256
+++ b/ci/quick-install-cfengine-enterprise.sh.sha256
@@ -1 +1 @@
-d0100a2fcec8b6aa700508e44785b66928c593b3e864a811c4216cf671888454  quick-install-cfengine-enterprise.sh
+3ae9149675b1135b64f34967d8ebf1a9c5662c3862fb904a1b761f2a3608ad46  quick-install-cfengine-enterprise.sh

From 668063a1043d3b14dac3d8fa83bd79ad99768608 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 26 Sep 2025 15:20:31 -0500
Subject: [PATCH 3/3] Revert "Updated checksum for quick install script in
 build host scripts"

This reverts commit 88fb795feab82a56f268071e07294bddddbb002b.
---
 ci/quick-install-cfengine-enterprise.sh.sha256 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/quick-install-cfengine-enterprise.sh.sha256 b/ci/quick-install-cfengine-enterprise.sh.sha256
index 084e2d2ce..45ed4e036 100644
--- a/ci/quick-install-cfengine-enterprise.sh.sha256
+++ b/ci/quick-install-cfengine-enterprise.sh.sha256
@@ -1 +1 @@
-3ae9149675b1135b64f34967d8ebf1a9c5662c3862fb904a1b761f2a3608ad46  quick-install-cfengine-enterprise.sh
+83e534ecaa802b66b037d8cad760b4034b2e15bee3e1ead83fc9d707e7adcd81  quick-install-cfengine-enterprise.sh