Re: HEADS UP: pkgsrc in careful mode, freezing soon

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

Hi!

On some platforms, expat has many dependencies, (on NetBSD, the
built-in is usually used) and it just got a security release.

https://blog.hartwork.org/posts/expat-2-7-0-released/

Should I commit this now or after the freeze?
 Thomas

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/expat/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile	4 Sep 2024 13:08:26 -0000	1.58
+++ Makefile	14 Mar 2025 19:00:09 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.58 2024/09/04 13:08:26 adam Exp $
 
-DISTNAME=	expat-2.6.3
+DISTNAME=	expat-2.7.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libexpat/}
 GITHUB_PROJECT=	libexpat
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/expat/distinfo,v
retrieving revision 1.52
diff -u -r1.52 distinfo
--- distinfo	18 Dec 2024 15:03:58 -0000	1.52
+++ distinfo	14 Mar 2025 19:00:09 -0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.52 2024/12/18 15:03:58 brook Exp $
 
-BLAKE2s (expat-2.6.3.tar.gz) = fcc81c1c25ef679e6c93fe93c7c1b0cc5a306f94163d3e53b506917cb6537185
-SHA512 (expat-2.6.3.tar.gz) = 0c0f0df947bbe7084ba2bffce082bc40e061cbf02363f3043e8e6be33b71277dbf13fd54dcc0f641b704293e3faea5b8c1d3c752737db4c908097bf5df8bd02d
-Size (expat-2.6.3.tar.gz) = 764617 bytes
-SHA1 (patch-cmake_autotools_expat-noconfig____macos.cmake.in) = 21411931ba40ca89435a3a41b3c329039540bfa2
+BLAKE2s (expat-2.7.0.tar.gz) = 8e7ba84a876fe4d2b4939d9ed7fb2b53ab491484b8ad4a543f683ce99530095b
+SHA512 (expat-2.7.0.tar.gz) = 870ba5a2dde7979ee5206680d62754e2a0c32566babf15728e54ae775c65eaf793b5087c84747db2924aaaaee34c040646423ce1d36cf36c802f3540c2ee5a3a
+Size (expat-2.7.0.tar.gz) = 781123 bytes
Index: patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in
===================================================================
RCS file: patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in
diff -N patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in
--- patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in	18 Dec 2024 15:03:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-cmake_autotools_expat-noconfig____macos.cmake.in,v 1.1 2024/12/18 15:03:58 brook Exp $
-
-On Darwin, the installed expat shared library includes only the major
-version number, not minor version and patch, in the name.  The
-corresponding configure check, however, looks for the full name with
-all three parts and fails.
-
-The same problem occurs on Windows and is discussed in issue 485, even
-mentioning that Darwin likely has the same issue:
-
-    https://github.com/libexpat/libexpat/issues/485
-
-For some reason, the fix (removing minor and patch versions from the
-cmake file used by configure) was applied for Windows but not for
-Darwin.
-
-See the upstream issue:
-
-    https://github.com/libexpat/libexpat/issues/935
-
-which was closed with
-
-    https://github.com/libexpat/libexpat/pull/937
-
---- cmake/autotools/expat-noconfig__macos.cmake.in.orig	2023-08-26 12:27:53.000000000 +0000
-+++ cmake/autotools/expat-noconfig__macos.cmake.in
-@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
- # Import target "expat::expat" for configuration "NoConfig"
- set_property(TARGET expat::expat APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
- set_target_properties(expat::expat PROPERTIES
--  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib"
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib"
-   IMPORTED_SONAME_NOCONFIG "@rpath/libexpat.@SO_MAJOR@.dylib"
-   )
- 
- list(APPEND _cmake_import_check_targets expat::expat )
--list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib" )
-+list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib" )
- 
- # Commands beyond this point should not need to know the version.
- set(CMAKE_IMPORT_FILE_VERSION)