From b8079bb6eb058b635baa265fcc3ae950eb0c2974 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 19 Feb 2025 16:45:44 +0100
Subject: [PATCH] CI updates

---
 .github/workflows/ci.yml | 7 ++++---
 CMakeLists.txt           | 1 +
 NEWS                     | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97cde66a..4e9df529 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-29
-  ZIG_DIST_VERSION: 0.14.0-dev.2987+183bb8b08
+  # 2025-02-18
+  ZIG_DIST_VERSION: 0.14.0-dev.3258+d2e70ef84
 
 jobs:
   job-rebuild-and-verify-stubs:
@@ -425,7 +425,8 @@ jobs:
           %RUN_LIB% -out:ucl.lib *.obj
           @REM ===== build zlib =====
           cd %BDIR%\zlib
-          %RUN_CL% -J -O2 -W3 -WX %DEFS% -DHAVE_VSNPRINTF -c %H%\vendor\zlib\*.c
+          set s=%H%\vendor\zlib
+          %RUN_CL% -J -O2 -W3 -WX %DEFS% -I%s% -DHAVE_VSNPRINTF -c %H%\vendor\zlib\*.c
           %RUN_LIB% -out:zlib.lib *.obj
           @REM ===== build zstd =====
           cd %BDIR%\zstd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9dbbdfa..2b31aac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,6 +369,7 @@ endif()
 upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL)
 
 set(t upx_vendor_zlib)
+target_include_directories(${t} PRIVATE vendor/zlib)
 upx_compile_target_debug_with_O2(${t})
 upx_sanitize_target(${t})
 target_compile_definitions(${t} PRIVATE HAVE_VSNPRINTF=1)
diff --git a/NEWS b/NEWS
index 73b201ff..a05ca396 100644
--- a/NEWS
+++ b/NEWS
@@ -3,11 +3,11 @@ User visible changes for UPX
 ==================================================================
 
 Changes in 5.0.0 (XX XXX XXXX):
-  * ELF: PT_MIPS_ABIFLAGS is now forwarded into the compressed output;
-    qemu-mips can choose the right floating-point emulation
-  * ELF: --unmap-all-pages completely avoids /proc/self/exe
   * ELF: use of memfd_create supports Enforcing mode of SELinux
   * ELF: two-step de-compression enables future per-PT_LOAD work
+  * ELF: --unmap-all-pages completely avoids /proc/self/exe
+  * ELF: PT_MIPS_ABIFLAGS is now forwarded into the compressed output;
+    qemu-mips can choose the right floating-point emulation
   * ELF: many minor internal changes fix nits revealed by fuzzing
   * bug fixes - see https://github.com/upx/upx/milestone/18