Merge branch 'main' into mv-fchown-cross-device

Author: sylvestre

.github/workflows/CICD.yml

@@ -876,7 +876,7 @@ jobs:
           - { os: ubuntu-latest, features: "md5sum,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,cksum,openssl" }
           # macOS: vendored only — system libcrypto needs OPENSSL_DIR
           # pointing at Homebrew, which isn't worth wiring up for a smoke test.
-          # todo: check Windows (MinGW's system openssl)
+          # MinGW(UCRT): done at make.yml as actual consumer is MSYS2 only
     steps:
     - uses: actions/checkout@v7
       with:

.github/workflows/GnuComment.yml

@@ -17,7 +17,9 @@ jobs:
 
     runs-on: ubuntu-latest
     if: >
-      github.event.workflow_run.event == 'pull_request'
+      github.event.workflow_run.event == 'pull_request' &&
+      (github.event.workflow_run.conclusion == 'success' ||
+       github.event.workflow_run.conclusion == 'failure')
     steps:
       - name: 'Download artifact'
         uses: actions/github-script@v9
@@ -34,6 +36,10 @@ jobs:
             var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
               return artifact.name == "comment"
             })[0];
+            if (!matchArtifact) {
+              core.info("No comment artifact found; skipping.");
+              return;
+            }
             var download = await github.rest.actions.downloadArtifact({
               owner: context.repo.owner,
               repo: context.repo.repo,

.github/workflows/make.yml

@@ -311,15 +311,16 @@ jobs:
       # Upgrading it mid-session changes the shared memory layout (60344 -> 59320),
       # which causes subsequent fork() calls to fail with EAGAIN (exit code 254).
       shell: 'C:\msys64\usr\bin\bash.exe --login -eo pipefail {0}'
+      # test Cygwin & MinGW(UCRT) instead of pre-installed Rust.
       run: |
-        pacman -Sy --noconfirm --needed base-devel libopenssl make openssl-devel pkgconf rust
+        pacman -Sy --noconfirm --needed base-devel libopenssl make openssl-devel pkgconf rust \
+          mingw-w64-ucrt-x86_64-openssl mingw-w64-ucrt-x86_64-rust
       env:
         CHERE_INVOKING: 1
     - name: "`(x86_64-pc-cygwin) make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: 'C:\msys64\usr\bin\bash.exe --login -eo pipefail {0}'
       run: |
         set -x
-        export OPENSSL_NO_VENDOR=1
         export CARGOFLAGS="--features openssl"
         DESTDIR=/tmp/c make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
         # Check that cksum is linked with openssl (e.g. msys-crypto-*.dll)
@@ -339,6 +340,7 @@ jobs:
         bsdtar -caf x86_64-pc-cygwin.tar.zst -C /tmp/c/usr/local bin
       env:
         CHERE_INVOKING: 1
+        OPENSSL_NO_VENDOR: "1"
         RUST_BACKTRACE: "1"
     - name: Publish
       uses: softprops/action-gh-release@v3
@@ -351,14 +353,21 @@ jobs:
           individual-x86_64-pc-cygwin.tar.zst
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: "`make install`"
-      shell: bash
+    - name: "`make install` (MinGW UCRT)"
+      shell: 'C:\msys64\usr\bin\bash.exe --login -eo pipefail {0}'
+      env:
+        CHERE_INVOKING: 1
+        MSYSTEM: "UCRT64"
+        OPENSSL_DIR: "/ucrt64"
+        OPENSSL_NO_VENDOR: "1"
+        OPENSSL_STATIC: "0"
       run: |
         set -x
+        export CARGOFLAGS="--features openssl"
         # Check that we exclude unix programs to avoid build failure
         # Windows's stdbuf depends on Cygwin's libstdbuf. So make should not try to install libstdbuf
         make install DESTDIR=/tmp/w PREFIX=/tmp/usr MULTICALL=y COMPLETIONS=n MANPAGES=n LOCALES=n \
-         SKIP_UTILS="arch b2sum base32 base64 basename basenc cat cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold head hostname hostid join link ln ls md5sum mkdir mktemp more mv nl nproc numfmt od paste pathchk pr printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split sum sync tac tail tee test touch tr true truncate tsort tty uname unexpand uniq unlink vdir wc whoami yes"
+         SKIP_UTILS="arch b2sum base32 base64 basename basenc cat comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold head hostname hostid join link ln ls md5sum mkdir mktemp more mv nl nproc numfmt od paste pathchk pr printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split sum sync tac tail tee test touch tr true truncate tsort tty uname unexpand uniq unlink vdir wc whoami yes"
         target/release/coreutils.exe stdbuf --version
 
   test_busybox:

Cargo.lock

@@ -21,6 +21,7 @@ pub fn main() {
 
     // Check for tldr.zip when building uudoc to warn users once at build time
     // instead of repeatedly at runtime for each utility
+    println!("cargo:rerun-if-changed=docs/tldr.zip");
     if env::var("CARGO_FEATURE_UUDOC").is_ok() && !Path::new("docs/tldr.zip").exists() {
         println!(
             "cargo:warning=No tldr archive found, so the documentation will not include examples."

build.rs

@@ -66,8 +66,6 @@ skip = [
   { name = "itertools", version = "0.13.0" },
   # codspeed-divan-compat-macros
   { name = "itertools", version = "0.14.0" },
-  # ordered-multimap
-  { name = "hashbrown", version = "0.14.5" },
   # lru (via num-prime)
   { name = "hashbrown", version = "0.16.1" },
   # cexpr (via bindgen)

deny.toml

@@ -2,6 +2,7 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+
 // spell-checker:ignore chdir putenv
 
 #![no_main]

fuzz/fuzz_targets/fuzz_env.rs

@@ -4,6 +4,7 @@
 // file that was distributed with this source code.
 
 // spell-checker:ignore (ToDO) NEWROOT Userspec chrooting chroots chdir pstatus repointed
+
 mod error;
 
 use crate::error::ChrootError;

src/uu/chroot/src/chroot.rs

@@ -1892,6 +1892,11 @@ pub(crate) fn copy_attributes(
         attributes.mode
     };
 
+    // A created directory only defaults to copying the source mode; unlike an
+    // explicit preserve (-p/-a), GNU applies the umask to it.
+    let apply_umask_to_mode =
+        dest_is_freshly_created_dir && !matches!(attributes.mode, Preserve::Yes { .. });
+
     // Track whether `chown` to the source's uid succeeded. If it did not
     // (typical case: non-root user copying a root-owned setuid file), the
     // mode preservation below must strip setuid/setgid so the destination
@@ -1956,6 +1961,12 @@ pub(crate) fn copy_attributes(
                     let mode = perms.mode() & !0o6000;
                     perms.set_mode(mode);
                 }
+                if apply_umask_to_mode {
+                    // The umask never covers setuid/setgid, so clear them
+                    // explicitly: a non-preserving copy must not carry the
+                    // source's set-user/group-ID bits into the new directory.
+                    perms.set_mode(perms.mode() & !0o6000 & !uucore::mode::get_umask());
+                }
                 perms
             };
             #[cfg(not(unix))]

src/uu/cp/src/cp.rs

@@ -4,6 +4,7 @@
 // file that was distributed with this source code.
 
 // spell-checker:ignore rustdoc
+
 #![allow(rustdoc::private_intra_doc_links)]
 
 use std::borrow::Borrow;