From 979be68da3c5af1046c85c54f59275a1f902a026 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Tue, 1 Oct 2024 16:05:47 +0100
Subject: [PATCH 1/6] UnixPB: Remove libnss3 on Fedora

---
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
index 795891fa5f..7aa33dd446 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
@@ -31,7 +31,6 @@ Build_Tool_Packages:
   - gnutls-utils
   - libcurl-devel
   - libffi-devel
-  - libnss3.so
   - libpng-devel
   - libXext-devel
   - libXi-devel                   # JDK12+ compilation

From 36280b9f8a05ed8bd4df1e7fdf3eb7b3a7e09cc3 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Tue, 1 Oct 2024 16:09:03 +0100
Subject: [PATCH 2/6] VPC: Add Fedora 40 Vagrantfile

---
 ansible/pbTestScripts/vmDestroy.sh   |  5 ++++-
 ansible/vagrant/Vagrantfile.Fedora40 | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 ansible/vagrant/Vagrantfile.Fedora40

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index 616b4bd3f7..e9a4312fd4 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -61,6 +61,9 @@ checkOS() {
                         osToDestroy="D8" ;;
                 "Debian10" | "debian10" | "D10" | "d10" )
                         osToDestroy="D10" ;;
+								"Fedora40" | "fedora40" | "F40" | "F40" )
+				                osToDestroy="F40" ;;
+
 		"FreeBSD12" | "freebsd12" | "F12" | "f12" )
 			osToDestroy="FBSD12" ;;
 		"Solaris10" | "solaris10" | "Sol10" | "sol10" )
@@ -70,7 +73,7 @@ checkOS() {
   	"Windows2022" | "Win2022" | "W22" | "w22" )
 	                       osToDestroy="W2022";;
 	              "all" )
-                        osToDestroy="U16 U18 U20 U21 U22 C6 C7 C8 D8 D10 FBSD12 Sol10 W2012 W2022" ;;
+                        osToDestroy="U16 U18 U20 U21 U22 C6 C7 C8 D8 D10 F40 FBSD12 Sol10 W2012 W2022" ;;
 		"")
 			echo "No OS detected. Did you miss the '-o' option?" ; usage; exit 1;;
 		*) echo "$OS is not a currently supported OS" ; listOS; exit 1;
diff --git a/ansible/vagrant/Vagrantfile.Fedora40 b/ansible/vagrant/Vagrantfile.Fedora40
new file mode 100644
index 0000000000..70ee8f4f04
--- /dev/null
+++ b/ansible/vagrant/Vagrantfile.Fedora40
@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$script = <<SCRIPT
+# Put the host machine's IP into the authorised_keys file on the VM
+if [ -r /vagrant/id_rsa.pub ]; then
+        mkdir -p $HOME/.ssh && cat /vagrant/id_rsa.pub >> $HOME/.ssh/authorized_keys
+fi
+SCRIPT
+
+# 2 = version of configuration file for Vagrant 1.1+ leading up to 2.0.x
+Vagrant.configure("2") do |config|
+
+  config.vm.define :adoptopenjdkF40 do |adoptopenjdkF40|
+    adoptopenjdkF40.vm.box = "bento/fedora-40"
+    adoptopenjdkF40.vm.synced_folder ".", "/vagrant"
+    adoptopenjdkF40.vm.hostname = "adoptopenjdkF40"
+    adoptopenjdkF40.vm.network :private_network, type: "dhcp"
+    adoptopenjdkF40.vm.provision "shell", inline: $script, privileged: false
+  end
+  config.vm.provider "virtualbox" do |v|
+    v.gui = false
+    v.memory = 4196
+    v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
+  end
+end

From ad688490f68bc3284ef2e2b64cd0f998b7de6efe Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Tue, 1 Oct 2024 16:31:26 +0100
Subject: [PATCH 3/6] UnixPB: Fix fedora install

---
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
index 15bc519c2d..77821b54ea 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
@@ -123,7 +123,7 @@
   when:
     - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
     - not (ansible_distribution_major_version == "8")
-    - not (ansible_distribution_major_version == "35" and ansible_distribution == "Fedora")
+    - not (ansible_distribution_major_version >= "35" and ansible_distribution == "Fedora")
 
 - name: Install Java when RedHat 6 on ppc64
   package: "name={{ item }} state=latest"

From 6067537bceebb325a5362a624a0e81027b45da0a Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Tue, 1 Oct 2024 18:46:51 +0100
Subject: [PATCH 4/6] UnixPB: Add Fedora 40 Support

---
 .../roles/Common/tasks/Fedora.yml                 |  6 +++---
 .../roles/Common/vars/Fedora.yml                  |  3 +--
 .../roles/nasm/tasks/main.yml                     | 15 +++++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
index 77821b54ea..d628975789 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
@@ -94,11 +94,11 @@
     - (ansible_distribution_major_version == "8")
   tags: build_tools
 
-- name: Install additional build tools for FEDORA 35
+- name: Install additional build tools for FEDORA 35+
   package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_FEDORA35 }}"
+  with_items: "{{ Additional_Build_Tools_FEDORA35PLUS }}"
   when:
-    - (ansible_distribution_major_version == "35" and ansible_distribution == "Fedora")
+    - (ansible_distribution_major_version >= "35" and ansible_distribution == "Fedora")
   tags: build_tools
 
 #################
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
index 7aa33dd446..07cc36880a 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
@@ -58,7 +58,7 @@ Additional_Build_Tools_NOT_RHEL8:
   - libmpc-devel                  # now in CodeReady Linux Builder (CRB) repo
   - ntp
 
-Additional_Build_Tools_FEDORA35:
+Additional_Build_Tools_FEDORA35PLUS:
   - glibc.i686                    # a dependency required for executing a 32-bit C binary
   - glibc-devel.i686              # a dependency required for executing a 32-bit C binary
   - libstdc++.i686                # a dependency required for executing a 32-bit C binary
@@ -136,7 +136,6 @@ Test_Tool_Packages:
   - mercurial
   - gnutls
   - gnutls-utils
-  - libnss3.so
   - shared-mime-info
   - nss-devel
   - nss-tools
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index 1a725ba2e8..59b4f269fb 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -89,12 +89,15 @@
     - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
   tags: nasm
 
-- name: Running ./configure & make for nasm ( Not Ubuntu 22+ )
+- name: Running ./configure & make for nasm ( Not Ubuntu 22+ and not Fedora 35+ )
   shell: cd /tmp/nasm-{{ nasm_version }} && CC={{ CC }} && ./configure -prefix=/usr/local && make install
   environment:
     CC: "{{ CC }}"
   when:
-    - (ansible_distribution != "Ubuntu" or ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "22") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) )
+    - (ansible_distribution != "Ubuntu" or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "22"))
+    - (ansible_distribution != "Fedora" or (ansible_distribution == "Fedora" and ansible_distribution_major_version < "35"))
+    - (nasm_installed.rc is defined)
+    - (nasm_installed.rc != 0 or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')))
   tags: nasm
 
 - name: Running ./configure & make for nasm ( Ubuntu 22 x64 )
@@ -106,12 +109,16 @@
     - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "22" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')) )
   tags: nasm
 
-- name: Running ./configure & make for nasm ( Ubuntu 24+ x64 )
+- name: Running ./configure & make for nasm ( Ubuntu 24+ x64 / Fedora 35+)
   shell: cd /tmp/nasm-{{ nasm_version }} && ./configure -prefix=/usr/local && make install
   environment:
     LIBRARY_PATH: /usr/lib/x86_64-linux-gnu
   when:
-    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "24" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')) )
+    - ansible_architecture == "x86_64"
+    - nasm_installed.rc is defined
+    - (nasm_installed.rc != 0) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne'))
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 24)
+      or (ansible_distribution == "Fedora" and ansible_distribution_major_version | int >= 35)
   tags: nasm
 
 - name: Remove downloaded packages for nasm

From 45cb204a23fe1d1197a87364c481de9ad81ee65e Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Thu, 3 Oct 2024 10:44:31 +0100
Subject: [PATCH 5/6] VPC: Fix whitespace

---
 ansible/pbTestScripts/vmDestroy.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh
index e9a4312fd4..d98f477ef7 100755
--- a/ansible/pbTestScripts/vmDestroy.sh
+++ b/ansible/pbTestScripts/vmDestroy.sh
@@ -61,9 +61,8 @@ checkOS() {
                         osToDestroy="D8" ;;
                 "Debian10" | "debian10" | "D10" | "d10" )
                         osToDestroy="D10" ;;
-								"Fedora40" | "fedora40" | "F40" | "F40" )
-				                osToDestroy="F40" ;;
-
+                "Fedora40" | "fedora40" | "F40" | "f40" )
+                        osToDestroy="F40" ;;
 		"FreeBSD12" | "freebsd12" | "F12" | "f12" )
 			osToDestroy="FBSD12" ;;
 		"Solaris10" | "solaris10" | "Sol10" | "sol10" )

From 630d78437ed50f8eaa5f51417e29b183c89a087a Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 4 Oct 2024 13:49:53 +0100
Subject: [PATCH 6/6] UnixPB: Unify version comparison in NASM role.

---
 .../AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index 59b4f269fb..e091847940 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -14,6 +14,7 @@
 - name: Set NASM version
   set_fact:
     nasm_version: "2.16.03"
+  tags: nasm
 
 # checking the common location for ubuntu package installs
 - name: Checking for /usr/bin/gcc-7
@@ -94,8 +95,8 @@
   environment:
     CC: "{{ CC }}"
   when:
-    - (ansible_distribution != "Ubuntu" or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "22"))
-    - (ansible_distribution != "Fedora" or (ansible_distribution == "Fedora" and ansible_distribution_major_version < "35"))
+    - (ansible_distribution != "Ubuntu" or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int < 22 ))
+    - (ansible_distribution != "Fedora" or (ansible_distribution == "Fedora" and ansible_distribution_major_version | int < 35 ))
     - (nasm_installed.rc is defined)
     - (nasm_installed.rc != 0 or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')))
   tags: nasm
@@ -106,7 +107,7 @@
     CC: "{{ CC }}"
     LIBRARY_PATH: /usr/lib/x86_64-linux-gnu
   when:
-    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "22" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')) )
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 22 and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')) )
   tags: nasm
 
 - name: Running ./configure & make for nasm ( Ubuntu 24+ x64 / Fedora 35+)