chore: update dependencies

Update toolchain to include musl fixes, also update curl and fix sbin merge.

Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com>

Author: dsseng

Pkgfile

@@ -5,7 +5,7 @@
 format: v1alpha2
 
 vars:
-  TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v0.14.0-alpha.0-5-gc92f2ed
+  TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v0.14.0-alpha.0-6-g818b320
 
   # renovate: datasource=github-releases depName=abseil/abseil-cpp
   abseil_version: 20250127.0
@@ -58,9 +58,9 @@ vars:
   cpio_sha512: 1e1ca6b3e3e64f206f9d828a152d6b4f8f6974de7a953ff96e02698b1c3c2c777c2111450e6a71c0693e29ca8bc01c3dda9f5e829b8e3221f647414df49dff6a
 
   # renovate: datasource=github-releases extractVersion=^curl-(?<version>.*)$ depName=curl/curl
-  curl_version: 8_12_0
-  curl_sha256: 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d
-  curl_sha512: ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
+  curl_version: 8_12_1
+  curl_sha256: 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202
+  curl_sha512: 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/diffutils.git
   diffutils_version: 3.11

policycoreutils/pkg.yaml

@@ -23,7 +23,7 @@ steps:
         make -j $(nproc) SUBDIRS=setfiles FTS_LDLIBS="-l:libfts.a -lpcre2-8"
     install:
       - |
-        make install DESTDIR=/rootfs/usr SUBDIRS=setfiles
+        make install DESTDIR=/rootfs/usr SBINDIR=/usr/bin SUBDIRS=setfiles
 finalize:
   - from: /rootfs
     to: /

tools/pkg.yaml

@@ -86,9 +86,18 @@ dependencies:
   - stage: zstd
 steps:
   - prepare:
-      - |
-        # clean up some files we don't ever need
-        rm -rf /usr/man /usr/share/doc /usr/share/info /usr/share/locale /usr/share/man
+    - |
+      # clean up some files we don't ever need
+      rm -rf /usr/man /usr/share/doc /usr/share/info /usr/share/locale /usr/share/man
+  - test:
+    - |
+      # Validate usrmerge symlinks from toolchain did not get overwritten
+      [ -L /bin ] && [ -d /bin ]
+      [ -L /lib ] && [ -d /lib ]
+      [ -L /lib64 ] && [ -d /lib64 ]
+      [ -L /usr/lib64 ] && [ -d /usr/lib64 ]
+      [ -L /sbin ] && [ -d /sbin ]
+      [ -L /usr/sbin ] && [ -d /usr/sbin ]
 finalize:
   - from: /
     to: /