From 4b41aa122616df1b438c7411bd3d5e817a202acf Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 29 Jan 2025 16:11:03 +0100
Subject: [PATCH] CI updates

---
 .github/workflows/ci.yml | 4 ++--
 src/msg.cpp              | 2 +-
 src/p_lx_interp.cpp      | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4aecc71a..97cde66a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,8 +19,8 @@ env:
   UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1
   UPX_DEBUG_TEST_LIBC_QSORT: 1
   ZSTD_CLEVEL: 9
-  # 2025-01-20
-  ZIG_DIST_VERSION: 0.14.0-dev.2851+b074fb7dd
+  # 2025-01-29
+  ZIG_DIST_VERSION: 0.14.0-dev.2987+183bb8b08
 
 jobs:
   job-rebuild-and-verify-stubs:
diff --git a/src/msg.cpp b/src/msg.cpp
index 7ae6df70..c2a1b495 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -51,7 +51,7 @@ void printClearLine(FILE *f) noexcept {
     fflush(stderr);
     if (f == nullptr)
         f = stdout;
-    con_fprintf(f, "%s", clear_line_msg);
+    con_fprintf(f, "%s", clear_line_msg); // NOLINT(clang-analyzer-unix.Stream)
     fflush(f);
     printSetNl(0);
 }
diff --git a/src/p_lx_interp.cpp b/src/p_lx_interp.cpp
index 8d52ddf6..6804c0b9 100644
--- a/src/p_lx_interp.cpp
+++ b/src/p_lx_interp.cpp
@@ -109,7 +109,8 @@ void PackLinuxElf32x86interp::pack1(OutputFile *fo, Filter &)
     h3.phdr[1].p_flags = Elf32_Phdr::PF_W | Elf32_Phdr::PF_R;
     h3.phdr[1].p_align = 1;
     h3.phdr[2].p_type = PT_INTERP;
-    h3.phdr[2].p_offset = (char *)&h3.phdr[2].p_vaddr - (char *)&h3;
+    // h3.phdr[2].p_offset = (char *)&h3.phdr[2].p_vaddr - (char *)&h3;
+    h3.phdr[2].p_offset = offsetof(cprElfHdr3, phdr[2].p_vaddr);
     memcpy(&h3.phdr[2].p_vaddr, "/upxrun", h3.phdr[2].p_filesz = 8);
     h3.phdr[2].p_align = 1;