Merge branch 'origin/main' into fix-cksum-sha3-debug-8933

Resolved merge conflicts in src/uu/cksum/src/cksum.rs by keeping
SHA3/SHAKE algorithm support from the feature branch.

Conflicts resolved:
- Kept imports for HashAlgorithm, LEGACY_ALGORITHMS, detect_algo
- Kept SHA3/SHAKE length handling logic
- Maintained --length support for sha3, shake128, shake256

Author: naoNao89

.cargo/config.toml

@@ -4,6 +4,8 @@
 
 [target.x86_64-unknown-redox]
 linker = "x86_64-unknown-redox-gcc"
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
 
 [env]
 # See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml

.github/workflows/CICD.yml

@@ -122,7 +122,7 @@ jobs:
     - name: Install/setup prerequisites
       shell: bash
       run: |
-        sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
+        sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu libselinux1-dev
     - name: Initialize workflow variables
       id: vars
       shell: bash
@@ -269,6 +269,8 @@ jobs:
       with:
         persist-credentials: false
     - uses: dtolnay/rust-toolchain@stable
+      with:
+        target: aarch64-unknown-linux-gnu
     - uses: taiki-e/install-action@nextest
     - uses: Swatinem/rust-cache@v2
     - name: Install/setup prerequisites
@@ -287,7 +289,10 @@ jobs:
         if [[ -d target ]]; then
           mv -T target target.cache
         fi
-        # Actually do the build
+        # Check that we don't cross-build uudoc
+        # also do not try to generate manpages for part of hashsum
+        make install-manpages PREFIX=/tmp/usr UTILS=true RUSTC_ARCH="--target aarch64-unknown-linux-gnu"
+        # build (host)
         make build
         echo "Check that target directory will be ignored by backup tools"
         test -f target/CACHEDIR.TAG
@@ -549,12 +554,12 @@ jobs:
         previous_multisize=$(cat dl/size-result.json | jq -r '.[] | .multisize')
         check 'multicall binary' "$multisize" "$previous_multisize" 'size-result.json'
     - name: Upload the individual size result
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: individual-size-result
         path: individual-size-result.json
     - name: Upload the size result
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: size-result
         path: size-result.json
@@ -845,7 +850,7 @@ jobs:
       env:
         RUST_BACKTRACE: "1"
     - name: Archive executable artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}${{ steps.vars.outputs.ARTIFACTS_SUFFIX }}
         path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
@@ -961,17 +966,17 @@ jobs:
           HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
           echo "HASH=${HASH}" >> $GITHUB_OUTPUT
     - name: Reserve SHA1/ID of 'test-summary'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: "${{ steps.summary.outputs.HASH }}"
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Reserve test results summary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: busybox-test-summary
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Upload json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: busybox-result.json
         path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}
@@ -1054,17 +1059,17 @@ jobs:
         HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
           echo "HASH=${HASH}" >> $GITHUB_OUTPUT
     - name: Reserve SHA1/ID of 'test-summary'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: "${{ steps.summary.outputs.HASH }}"
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Reserve test results summary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: toybox-test-summary
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Upload json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: toybox-result.json
         path: ${{ steps.vars.outputs.TEST_SUMMARY_FILE }}

.github/workflows/FixPR.yml

@@ -77,49 +77,3 @@ jobs:
         add: Cargo.lock fuzz/Cargo.lock
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  code_format:
-    # Recheck/refresh code formatting
-    if: github.event.pull_request.merged == true ## only for PR merges
-    name: Update/format
-    runs-on: ${{ matrix.job.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        job:
-          - { os: ubuntu-latest , features: feat_os_unix }
-    steps:
-    - uses: actions/checkout@v5
-      with:
-        persist-credentials: false
-    - name: Initialize job variables
-      id: vars
-      shell: bash
-      run: |
-        # target-specific options
-        # * CARGO_FEATURES_OPTION
-        CARGO_FEATURES_OPTION='' ;
-        if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
-        echo "CARGO_FEATURES_OPTION=${CARGO_FEATURES_OPTION}" >> $GITHUB_OUTPUT
-    - uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: stable
-        components: rustfmt
-    - uses: Swatinem/rust-cache@v2
-    - name: "`cargo fmt`"
-      shell: bash
-      run: |
-        cargo fmt
-    - name: "`cargo fmt` tests"
-      shell: bash
-      run: |
-        # `cargo fmt` of tests
-        find tests -name "*.rs" -print0 | xargs -0 cargo fmt --
-    - name: Commit any changes (to '${{ env.BRANCH_TARGET }}')
-      uses: EndBug/add-and-commit@v9
-      with:
-        new_branch: ${{ env.BRANCH_TARGET }}
-        default_author: github_actions
-        message: "maint ~ rustfmt (`cargo fmt`)"
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/GnuTests.yml

@@ -132,12 +132,12 @@ jobs:
 
     ### Upload artifacts
     - name: Upload full json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: gnu-full-result
         path: ${{ env.TEST_FULL_SUMMARY_FILE }}
     - name: Upload root json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: gnu-root-full-result
         path: ${{ env.TEST_ROOT_FULL_SUMMARY_FILE }}
@@ -147,7 +147,7 @@ jobs:
         # Compress logs before upload (fails otherwise)
         gzip gnu/tests/*/*.log
     - name: Upload test logs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: test-logs
         path: |
@@ -268,12 +268,12 @@ jobs:
         # Copy the test directory now
         rsync -v -a -e ssh lima-default:~/work/gnu/tests/ ./gnu/tests-selinux/
     - name: Upload SELinux json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: selinux-gnu-full-result
         path: ${{ env.TEST_SELINUX_FULL_SUMMARY_FILE }}
     - name: Upload SELinux root json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: selinux-root-gnu-full-result
         path: ${{ env.TEST_SELINUX_ROOT_FULL_SUMMARY_FILE }}
@@ -283,7 +283,7 @@ jobs:
         # Compress logs before upload (fails otherwise)
         gzip gnu/tests-selinux/*/*.log
     - name: Upload SELinux test logs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: selinux-test-logs
         path: |
@@ -326,25 +326,25 @@ jobs:
         workflow_conclusion: completed ## continually recalibrates to last commit of default branch with a successful GnuTests (ie, "self-heals" from GnuTest regressions, but needs more supervision for/of regressions)
         path: "reference"
     - name: Download full json results
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: gnu-full-result
         path: results
         merge-multiple: true
     - name: Download root json results
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: gnu-root-full-result
         path: results
         merge-multiple: true
     - name: Download selinux json results
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: selinux-gnu-full-result
         path: results
         merge-multiple: true
     - name: Download selinux root json results
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: selinux-root-gnu-full-result
         path: results
@@ -393,17 +393,17 @@ jobs:
         HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
         outputs HASH
     - name: Upload SHA1/ID of 'test-summary'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: "${{ steps.summary.outputs.HASH }}"
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Upload test results summary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: test-summary
         path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
     - name: Upload aggregated json results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: aggregated-result
         path: ${{ steps.vars.outputs.AGGREGATED_SUMMARY_FILE }}
@@ -455,7 +455,7 @@ jobs:
         fi
     - name: Upload comparison log (for GnuComment workflow)
       if: success() || failure() # run regardless of prior step success/failure
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: comment
         path: reference/comment/

.github/workflows/android.yml

@@ -195,7 +195,7 @@ jobs:
         key: ${{ matrix.arch }}_${{ matrix.target}}_${{ steps.read_rustc_hash.outputs.content }}_${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}_v3
     - name: archive any output (error screenshots)
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: test_output_${{ env.AVD_CACHE_KEY }}
         path: output

.github/workflows/fuzzing.yml

@@ -198,7 +198,7 @@ jobs:
         path: |
           fuzz/corpus/${{ matrix.test-target.name }}
     - name: Upload Stats
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: fuzz-stats-${{ matrix.test-target.name }}
         path: |
@@ -215,7 +215,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all stats
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: fuzz/stats-artifacts
           pattern: fuzz-stats-*
@@ -309,7 +309,7 @@ jobs:
         run: |
           cat fuzzing_summary.md
       - name: Upload Summary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: fuzzing-summary
           path: fuzzing_summary.md

.vscode/cspell.dictionaries/jargon.wordlist.txt

@@ -6,6 +6,7 @@ autogenerated
 autogenerates
 bitmask
 bitwise
+bufferram
 bytewise
 canonicalization
 canonicalize
@@ -28,6 +29,12 @@ denoland
 deque
 dequeue
 dev
+EINTR
+eintr
+nextest
+SIGUSR
+nonprinting
+multibyte
 devs
 discoverability
 duplicative
@@ -45,6 +52,7 @@ fileio
 filesystem
 filesystems
 flamegraph
+freeram
 fsxattr
 fullblock
 getfacl
@@ -123,6 +131,7 @@ shortcode
 shortcodes
 siginfo
 sigusr
+strcasecmp
 subcommand
 subexpression
 submodule
@@ -131,8 +140,10 @@ symlink
 symlinks
 syscall
 syscalls
+sysconf
 tokenize
 toolchain
+totalram
 truthy
 ucase
 unbuffered

.vscode/cspell.dictionaries/shell.wordlist.txt

@@ -13,6 +13,19 @@ mountinfo
 mountpoint
 mtab
 nullglob
+
+# * Signals
+SIGUSR
+SIGUSR1
+SIGUSR2
+SIGINT
+SIGTERM
+SIGKILL
+SIGSTOP
+SIGCONT
+SIGPIPE
+SIGALRM
+SIGCHLD
 passwd
 pipefail
 popd

.vscode/cspell.dictionaries/workspace.wordlist.txt

@@ -8,6 +8,19 @@ advapi32-sys
 aho-corasick
 backtrace
 blake2b_simd
+
+# * uutils project
+uutils
+coreutils
+uucore
+uutests
+ucmd
+uumain
+rlimit
+mkfifo
+urandom
+uchild
+ello
 bstr
 bytecount
 byteorder