CVS commit: pkgsrc/devel/cmake

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug 22 10:17:17 UTC 2025

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_cmForEachCommand.cxx

Log Message:
cmake: add upstream patch for CVE-2025-9301

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.253 -r1.254 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_cmForEachCommand.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.230 pkgsrc/devel/cmake/Makefile:1.231
--- pkgsrc/devel/cmake/Makefile:1.230   Wed Aug 20 11:34:12 2025
+++ pkgsrc/devel/cmake/Makefile Fri Aug 22 10:17:17 2025
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.230 2025/08/20 11:34:12 wiz Exp $
+# $NetBSD: Makefile,v 1.231 2025/08/22 10:17:17 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 COMMENT=       Cross platform make
 
 USE_TOOLS+=            gmake pkg-config

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.253 pkgsrc/devel/cmake/distinfo:1.254
--- pkgsrc/devel/cmake/distinfo:1.253   Wed Aug 20 11:34:12 2025
+++ pkgsrc/devel/cmake/distinfo Fri Aug 22 10:17:17 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.253 2025/08/20 11:34:12 wiz Exp $
+$NetBSD: distinfo,v 1.254 2025/08/22 10:17:17 wiz Exp $
 
 BLAKE2s (cmake-4.1.0.tar.gz) = e519a976ffacd3524615a9e171193b861bbe30fd1d0958e3d5707567c5d573d1
 SHA512 (cmake-4.1.0.tar.gz) = 644b6b13539ba0e7f35a7496e4240b1d3361606163f35b69006e47d03ffd9759d35c62a73826253ed168af4196df29983ec10c0f561ea74d7ed6ffee0c2cd8e4
@@ -20,6 +20,7 @@ SHA1 (patch-Source_Checks_Curses_CheckCu
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
 SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = e4f2ad39f0899074c2b66d97ef12d03c48e82950
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = ca57d666f0a30d87aa1db49f82c62c41b05d87f9
+SHA1 (patch-Source_cmForEachCommand.cxx) = e42ad98e9a7964ecd170df29c5e999cb788d076d
 SHA1 (patch-Source_kwsys_ProcessUNIX.c) = e333da03c3ac31be6a992809062a60a9cccc62c0
 SHA1 (patch-Tests_CMakeLists.txt) = 555e0be38ef92530c7315a87db65dd3004d7744c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_cmForEachCommand.cxx
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_cmForEachCommand.cxx:1.1
--- /dev/null   Fri Aug 22 10:17:17 2025
+++ pkgsrc/devel/cmake/patches/patch-Source_cmForEachCommand.cxx        Fri Aug 22 10:17:17 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_cmForEachCommand.cxx,v 1.1 2025/08/22 10:17:17 wiz Exp $
+
+https://gitlab.kitware.com/cmake/cmake/-/commit/37e27f71bc356d880c908040cd0cb68fa2c371b8
+
+--- Source/cmForEachCommand.cxx.orig   2025-08-05 14:55:57.000000000 +0000
++++ Source/cmForEachCommand.cxx
+@@ -100,6 +100,9 @@ bool cmForEachFunctionBlocker::Arguments
+ bool cmForEachFunctionBlocker::Replay(
+   std::vector<cmListFileFunction> functions, cmExecutionStatus& inStatus)
+ {
++  if (this->Args.size() == this->IterationVarsCount) {
++    return true;
++  }
+   return this->ZipLists ? this->ReplayZipLists(functions, inStatus)
+                         : this->ReplayItems(functions, inStatus);
+ }