From 169edcec4a0738cabc5fabb98ef805de2ee39046 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 13 Nov 2025 09:51:17 -0600
Subject: [PATCH 1/3] Added skip for run_lastseen_threaded_load.sh test on
 HP/UX

Ticket: ENT-7541
Changelog: none
(cherry picked from commit 519f54f42f194ea0159bea1950fc951e2e49a81d)
---
 tests/load/run_lastseen_threaded_load.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/load/run_lastseen_threaded_load.sh b/tests/load/run_lastseen_threaded_load.sh
index aebcf21a91..64293cbb9a 100755
--- a/tests/load/run_lastseen_threaded_load.sh
+++ b/tests/load/run_lastseen_threaded_load.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-if [ "x$label" = "xPACKAGES_x86_64_solaris_10" ] ;
-then
-    echo "Skipping lastseen_threaded_load on $label"
+for skip_label in PACKAGES_x86_64_solaris_10 PACKAGES_ia64_hpux_11.23; do
+  if [ "$label" = "$skip_label" ]; then
+    echo "Skipping $0 on label $skip_label"
     exit 0;
-fi
+  fi
+done
 
 echo "Starting run_lastseen_threaded_load.sh test"
 

From a3921ebf639e0fffd8cbf5ec064e7c6bd4c5b115 Mon Sep 17 00:00:00 2001
From: Lars Erik Wik <lars.erik.wik@northern.tech>
Date: Thu, 20 Nov 2025 16:20:21 +0100
Subject: [PATCH 2/3] Fixed struct stat layout mismatch on HP-UX due to include
 order

On HP-UX IA-64, verify_files_utils.c included <sys/types.h> before
config.h was loaded, causing struct stat and off_t to use 32-bit layout
instead of the 64-bit layout required by _FILE_OFFSET_BITS=64.

This resulted in st_size being read from the wrong offset, producing
garbage values (e.g., 236662833 instead of 821 bytes) and "file
corrupted in transit" errors during local file copies.

Fixed by including platform.h first to ensure _FILE_OFFSET_BITS=64 is
defined before any system headers.

Ticket: ENT-13508
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
(cherry picked from commit 2b418c02fa72e7bd25939de3de073d83b913d28f)
---
 cf-agent/verify_files_utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cf-agent/verify_files_utils.c b/cf-agent/verify_files_utils.c
index 03b55aa160..8882164f6d 100644
--- a/cf-agent/verify_files_utils.c
+++ b/cf-agent/verify_files_utils.c
@@ -22,6 +22,7 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <verify_files_utils.h>

From 2cc6a1c79d6491f1ba961fbaad103bcc8aa2944d Mon Sep 17 00:00:00 2001
From: Lars Erik Wik <lars.erik.wik@northern.tech>
Date: Fri, 21 Nov 2025 10:17:36 +0100
Subject: [PATCH 3/3] Fixed diskfree() returning garbage value

Always include platform.h before system headers. Otherwise types such as
off_t will use 32-bit layout instead of the 64-bit layout required by
_FILE_OFFSET_BITS=64 on HP-UX.

Ticket: ENT-13531
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
(cherry picked from commit c30bead8b473df8397c9c91091315ce36f7a351f)
---
 libpromises/evalfunction.c  | 1 +
 libpromises/storage_tools.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/libpromises/evalfunction.c b/libpromises/evalfunction.c
index 49aceeed68..852d7fde43 100644
--- a/libpromises/evalfunction.c
+++ b/libpromises/evalfunction.c
@@ -22,6 +22,7 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
 #include <evalfunction.h>
 
 #include <policy_server.h>
diff --git a/libpromises/storage_tools.c b/libpromises/storage_tools.c
index 5e44dc0341..1edd3052f8 100644
--- a/libpromises/storage_tools.c
+++ b/libpromises/storage_tools.c
@@ -22,6 +22,8 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+
 #include <cf3.defs.h>
 
 #ifdef HAVE_SYS_STATFS_H