Merge branch 'uutils:main' into main

Author: Nekrolm

.github/workflows/CICD.yml

@@ -321,9 +321,9 @@ jobs:
         # Check that the utils are present
         test -f /tmp/usr/local/bin/tty
         # Check that the manpage is present
-        test -f /tmp/usr/local/share/man/man1/whoami.1
+        test -f /tmp/usr/local/share/man/man1/md5sum.1
         # Check that the completion is present
-        test -f /tmp/usr/local/share/zsh/site-functions/_install
+        test -f /tmp/usr/local/share/zsh/site-functions/_b2sum
         test -f /tmp/usr/local/share/bash-completion/completions/head
         test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
       env:
@@ -387,7 +387,6 @@ jobs:
         test -h /tmp/usr/local/bin/sha512sum
         test -h /tmp/usr/local/bin/shake128sum
         test -h /tmp/usr/local/bin/shake256sum
-  
   build_rust_stable:
     name: Build/stable
     needs: [ min_version, deps ]
@@ -1294,20 +1293,40 @@ jobs:
         shell: bash
         run: cargo install cargo-codspeed --locked
 
+      - name: Get benchmark list
+        id: benchmark_list
+        shell: bash
+        run: |
+          echo "Finding all utilities with benchmarks..."
+          benchmark_packages=""
+          for bench_dir in $(ls -d src/uu/*/benches 2>/dev/null); do
+            prog_dir=$(dirname "$bench_dir")
+            prog_name=$(basename "$prog_dir")
+            echo "Found benchmarks for uu_$prog_name"
+            benchmark_packages="$benchmark_packages uu_$prog_name"
+          done
+          echo "benchmark_packages=${benchmark_packages}" >> $GITHUB_OUTPUT
+          echo "Found benchmark packages:${benchmark_packages}"
+
+      - name: Build benchmarks
+        shell: bash
+        run: |
+          echo "Building benchmarks for packages: ${{ steps.benchmark_list.outputs.benchmark_packages }}"
+          for package in ${{ steps.benchmark_list.outputs.benchmark_packages }}; do
+            echo "Building benchmarks for $package"
+            cargo codspeed build -p $package
+          done
+
       - name: Run benchmarks
         uses: CodSpeedHQ/action@v4
         env:
           CODSPEED_LOG: debug
         with:
           mode: instrumentation
           run: |
-            # Find all utilities with benchmarks and run them individually
-            echo "Starting CodSpeed benchmark collection..."
-            for bench_dir in $(ls -d src/uu/*/benches 2>/dev/null); do
-              prog_dir=$(dirname "$bench_dir")
-              prog_name=$(basename "$prog_dir")
-              echo "Processing benchmarks for uu_$prog_name"
-              cargo codspeed build -p uu_$prog_name
-              cargo codspeed run -p uu_$prog_name
+            echo "Running benchmarks for packages: ${{ steps.benchmark_list.outputs.benchmark_packages }}"
+            for package in ${{ steps.benchmark_list.outputs.benchmark_packages }}; do
+              echo "Running benchmarks for $package"
+              cargo codspeed run -p $package
             done
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/GnuTests.yml

@@ -29,7 +29,7 @@ env:
   TEST_ROOT_FULL_SUMMARY_FILE: 'gnu-root-full-result.json'
   TEST_SELINUX_FULL_SUMMARY_FILE: 'selinux-gnu-full-result.json'
   TEST_SELINUX_ROOT_FULL_SUMMARY_FILE: 'selinux-root-gnu-full-result.json'
-  REPO_GNU_REF: "v9.7"
+  REPO_GNU_REF: "v9.8"
 
 jobs:
   native:

Cargo.lock

@@ -398,13 +398,13 @@ distclean: clean
 ifeq ($(MANPAGES),y)
 manpages: build-coreutils
 	mkdir -p $(BUILDDIR)/man/
-	$(foreach prog, $(INSTALLEES), \
+	$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS), \
 		$(BUILDDIR)/coreutils manpage $(prog) > $(BUILDDIR)/man/$(PROG_PREFIX)$(prog).1 $(newline) \
 	)
 
 install-manpages: manpages
 	mkdir -p $(DESTDIR)$(DATAROOTDIR)/man/man1
-	$(foreach prog, $(INSTALLEES), \
+	$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS), \
 		$(INSTALL) -m 644 $(BUILDDIR)/man/$(PROG_PREFIX)$(prog).1 $(DESTDIR)$(DATAROOTDIR)/man/man1/ $(newline) \
 	)
 else
@@ -414,7 +414,7 @@ endif
 ifeq ($(COMPLETIONS),y)
 completions: build-coreutils
 	mkdir -p $(BUILDDIR)/completions/zsh $(BUILDDIR)/completions/bash $(BUILDDIR)/completions/fish
-	$(foreach prog, $(INSTALLEES), \
+	$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS) , \
 		$(BUILDDIR)/coreutils completion $(prog) zsh > $(BUILDDIR)/completions/zsh/_$(PROG_PREFIX)$(prog) $(newline) \
 		$(BUILDDIR)/coreutils completion $(prog) bash > $(BUILDDIR)/completions/bash/$(PROG_PREFIX)$(prog) $(newline) \
 		$(BUILDDIR)/coreutils completion $(prog) fish > $(BUILDDIR)/completions/fish/$(PROG_PREFIX)$(prog).fish $(newline) \
@@ -424,7 +424,7 @@ install-completions: completions
 	mkdir -p $(DESTDIR)$(DATAROOTDIR)/zsh/site-functions
 	mkdir -p $(DESTDIR)$(DATAROOTDIR)/bash-completion/completions
 	mkdir -p $(DESTDIR)$(DATAROOTDIR)/fish/vendor_completions.d
-	$(foreach prog, $(INSTALLEES), \
+	$(foreach prog, $(INSTALLEES) $(HASHSUM_PROGS) , \
 		$(INSTALL) -m 644 $(BUILDDIR)/completions/zsh/_$(PROG_PREFIX)$(prog) $(DESTDIR)$(DATAROOTDIR)/zsh/site-functions/ $(newline) \
 		$(INSTALL) -m 644 $(BUILDDIR)/completions/bash/$(PROG_PREFIX)$(prog) $(DESTDIR)$(DATAROOTDIR)/bash-completion/completions/ $(newline) \
 		$(INSTALL) -m 644 $(BUILDDIR)/completions/fish/$(PROG_PREFIX)$(prog).fish $(DESTDIR)$(DATAROOTDIR)/fish/vendor_completions.d/ $(newline) \

GNUmakefile

@@ -27,6 +27,7 @@ allow = [
   "CC0-1.0",
   "Unicode-3.0",
   "Zlib",
+  "MPL-2.0",
 ]
 confidence-threshold = 0.8
 
@@ -106,6 +107,8 @@ skip = [
   { name = "rand_core", version = "0.6.4" },
   # utmp-classic
   { name = "zerocopy", version = "0.7.35" },
+  # divans/codspeed tooling
+  { name = "nix", version = "0.29.0" },
 ]
 # spell-checker: enable
 

deny.toml

@@ -20,7 +20,13 @@ path = "src/chmod.rs"
 [dependencies]
 clap = { workspace = true }
 thiserror = { workspace = true }
-uucore = { workspace = true, features = ["entries", "fs", "mode", "perms"] }
+uucore = { workspace = true, features = [
+  "entries",
+  "fs",
+  "mode",
+  "perms",
+  "safe-traversal",
+] }
 fluent = { workspace = true }
 
 [[bin]]