Merge branch 'main' into renovate/ctrlc-3.x-lockfile

Author: sylvestre

.busybox-config

@@ -2,3 +2,8 @@ CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_UNICODE_SUPPORT=y
 CONFIG_DESKTOP=y
 CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_FEATURE_CATV=y
+CONFIG_FEATURE_CATN=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_READLINK_FOLLOW=y

.github/workflows/CICD.yml

@@ -300,22 +300,22 @@ jobs:
       run: make nextest PROFILE=ci CARGOFLAGS="--hide-progress-bar"
       env:
         RUST_BACKTRACE: "1"
-
-    - name: "`make install PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
+    - name: "`make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: bash
       run: |
         set -x
-        DESTDIR=/tmp/ make PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n install
+        DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n
         # Check that utils are built with given profile
         ./target/release-fast/true
-        # Check that the utils are present
-        test -f /tmp/usr/local/bin/tty
+        # Check that the progs have prefix
+        test -f /tmp/usr/local/bin/uu-tty
+        test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*   
         # Check that the manpage is not present
-        ! test -f /tmp/usr/local/share/man/man1/whoami.1
+        ! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
         # Check that the completion is not present
-        ! test -f /tmp/usr/local/share/zsh/site-functions/_install
-        ! test -f /tmp/usr/local/share/bash-completion/completions/head.bash
-        ! test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
+        ! test -f /tmp/usr/local/share/zsh/site-functions/_uu-install
+        ! test -f /tmp/usr/local/share/bash-completion/completions/uu-head.bash
+        ! test -f /tmp/usr/local/share/fish/vendor_completions.d/uu-cat.fish
       env:
         RUST_BACKTRACE: "1"
     - name: "`make install`"
@@ -502,14 +502,14 @@ jobs:
               --arg multisize "$SIZE_MULTI" \
               '{($date): { sha: $sha, size: $size, multisize: $multisize, }}' > size-result.json
     - name: Download the previous individual size result
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       with:
         workflow: CICD.yml
         name: individual-size-result
         repo: uutils/coreutils
         path: dl
     - name: Download the previous size result
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       with:
         workflow: CICD.yml
         name: size-result

.github/workflows/GnuTests.yml

@@ -2,10 +2,11 @@ name: GnuTests
 
 # spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
 # spell-checker:ignore (jargon) submodules devel
-# spell-checker:ignore (libs/utils) autopoint chksum getenforce gperf lcov libexpect limactl pyinotify setenforce shopt texinfo valgrind libattr libcap taiki-e
+# spell-checker:ignore (libs/utils) autopoint chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt texinfo valgrind libattr libcap taiki-e zstd cpio
 # spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
 # spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
 # spell-checker:ignore (vars) FILESET SUBDIRS XPASS
+# spell-checker:ignore userns
 
 # * note: to run a single test => `REPO/util/run-gnu-test.sh PATH/TO/TEST/SCRIPT`
 
@@ -30,6 +31,7 @@ env:
   TEST_STTY_FULL_SUMMARY_FILE: 'gnu-stty-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'
+  TEST_SMACK_FULL_SUMMARY_FILE: 'smack-gnu-full-result.json'
 
 jobs:
   native:
@@ -42,16 +44,6 @@ jobs:
       with:
         path: 'uutils'
         persist-credentials: false
-    - name: Extract GNU version from build-gnu.sh
-      id: gnu-version
-      run: |
-        GNU_VERSION=$(grep '^release_tag_GNU=' uutils/util/build-gnu.sh | cut -d'"' -f2)
-        if [ -z "$GNU_VERSION" ]; then
-          echo "Error: Failed to extract GNU version from build-gnu.sh"
-          exit 1
-        fi
-        echo "REPO_GNU_REF=${GNU_VERSION}" >> $GITHUB_ENV
-        echo "Extracted GNU version: ${GNU_VERSION}"
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
@@ -60,20 +52,15 @@ jobs:
       with:
         workspaces: "./uutils -> target"
     - name: Checkout code (GNU coreutils)
-      uses: actions/checkout@v6
+      run: (mkdir -p gnu && cd gnu && bash ../uutils/util/fetch-gnu.sh)
+    - name: Restore files for faster configure and skipping make
+      uses: actions/cache@v5
+      id: cache-config-gnu
       with:
-        repository: 'coreutils/coreutils'
-        path: 'gnu'
-        ref: ${{ env.REPO_GNU_REF }}
-        submodules: false
-        persist-credentials: false
-    - name: Override submodule URL and initialize submodules
-      # Use github instead of upstream git server
-      run: |
-        git submodule sync --recursive
-        git config submodule.gnulib.url https://github.com/coreutils/gnulib.git
-        git submodule update --init --recursive --depth 1
-      working-directory: gnu
+        path: |
+          gnu/config.cache
+          gnu/src/getlimits
+        key: ${{ runner.os }}-gnu-config-${{ hashFiles('gnu/NEWS') }}-${{ hashFiles('uutils/util/build-gnu.sh') }} # use build-gnu.sh for extremely safe caching
 
     #### Build environment setup
     - name: Install dependencies
@@ -83,6 +70,8 @@ jobs:
         sudo apt-get update
         ## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
         sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
+        curl http://launchpadlibrarian.net/831710181/automake_1.18.1-3_all.deb > automake-1.18.deb
+        sudo dpkg -i --force-depends automake-1.18.deb
     - name: Add various locales
       shell: bash
       run: |
@@ -103,6 +92,7 @@ jobs:
         sudo locale-gen --keep-existing fa_IR.UTF-8 # Iran
         sudo locale-gen --keep-existing am_ET.UTF-8 # Ethiopia
         sudo locale-gen --keep-existing th_TH.UTF-8 # Thailand
+        sudo locale-gen --keep-existing zh_CN.GB18030 # China
 
         sudo update-locale
         echo "After:"
@@ -115,11 +105,23 @@ jobs:
         ## Build binaries
         cd 'uutils'
         env PROFILE=release-small bash util/build-gnu.sh
+        
+    - name: Save files for faster configure and skipping make
+      uses: actions/cache/save@v5
+      if: always() && steps.cache-config-gnu.outputs.cache-hit != 'true'
+      with:
+        path: |
+          gnu/config.cache
+          gnu/src/getlimits
+        key: ${{ runner.os }}-gnu-config-${{ hashFiles('gnu/NEWS') }}-${{ hashFiles('uutils/util/build-gnu.sh') }}
 
     ### Run tests as user
     - name: Run GNU tests
       shell: bash
       run: |
+        ## Use unshare
+        sudo sysctl -w kernel.unprivileged_userns_clone=1
+        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
         ## Run GNU tests
         path_GNU='gnu'
         path_UUTILS='uutils'
@@ -206,16 +208,6 @@ jobs:
       with:
         path: 'uutils'
         persist-credentials: false
-    - name: Extract GNU version from build-gnu.sh
-      id: gnu-version-selinux
-      run: |
-        GNU_VERSION=$(grep '^release_tag_GNU=' uutils/util/build-gnu.sh | cut -d'"' -f2)
-        if [ -z "$GNU_VERSION" ]; then
-          echo "Error: Failed to extract GNU version from build-gnu.sh"
-          exit 1
-        fi
-        echo "REPO_GNU_REF=${GNU_VERSION}" >> $GITHUB_ENV
-        echo "Extracted GNU version: ${GNU_VERSION}"
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
@@ -224,20 +216,7 @@ jobs:
       with:
         workspaces: "./uutils -> target"
     - name: Checkout code (GNU coreutils)
-      uses: actions/checkout@v6
-      with:
-        repository: 'coreutils/coreutils'
-        path: 'gnu'
-        ref: ${{ env.REPO_GNU_REF }}
-        submodules: false
-        persist-credentials: false
-    - name: Override submodule URL and initialize submodules
-      # Use github instead of upstream git server
-      run: |
-        git submodule sync --recursive
-        git config submodule.gnulib.url https://github.com/coreutils/gnulib.git
-        git submodule update --init --recursive --depth 1
-      working-directory: gnu
+      run: (mkdir -p gnu && cd gnu && bash ../uutils/util/fetch-gnu.sh)
 
     #### Lima build environment setup
     - name: Setup Lima
@@ -340,8 +319,52 @@ jobs:
           gnu/tests-selinux/*.log
           gnu/tests-selinux/*/*.log.gz
 
+  smack:
+    name: Run GNU tests (SMACK)
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout code (uutils)
+      uses: actions/checkout@v6
+      with:
+        path: 'uutils'
+        persist-credentials: false
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: stable
+        components: rustfmt
+    - uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: "./uutils -> target"
+    - name: Checkout code (GNU coreutils)
+      run: (mkdir -p gnu && cd gnu && bash ../uutils/util/fetch-gnu.sh)
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y qemu-system-x86 zstd cpio
+    - name: Run GNU SMACK tests
+      run: |
+        cd uutils
+        bash util/run-gnu-tests-smack-ci.sh "$GITHUB_WORKSPACE/gnu" "$GITHUB_WORKSPACE/gnu/tests-smack"
+    - name: Extract testing info into JSON
+      run: |
+        python3 uutils/util/gnu-json-result.py gnu/tests-smack > ${{ env.TEST_SMACK_FULL_SUMMARY_FILE }}
+    - name: Upload SMACK json results
+      uses: actions/upload-artifact@v6
+      with:
+        name: smack-gnu-full-result
+        path: ${{ env.TEST_SMACK_FULL_SUMMARY_FILE }}
+    - name: Compress SMACK test logs
+      run: gzip gnu/tests-smack/*/*.log 2>/dev/null || true
+    - name: Upload SMACK test logs
+      uses: actions/upload-artifact@v6
+      with:
+        name: smack-test-logs
+        path: |
+          gnu/tests-smack/*.log
+          gnu/tests-smack/*/*.log.gz
+
   aggregate:
-    needs: [native, selinux]
+    needs: [native, selinux, smack]
     permissions:
       actions: read  # for dawidd6/action-download-artifact to query and download artifacts
       contents: read  # for actions/checkout to fetch code
@@ -366,7 +389,7 @@ jobs:
         path: 'uutils'
         persist-credentials: false
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       # ref: <https://github.com/dawidd6/action-download-artifact>
       continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
       with:
@@ -406,6 +429,12 @@ jobs:
         name: selinux-root-gnu-full-result
         path: results
         merge-multiple: true
+    - name: Download smack json results
+      uses: actions/download-artifact@v7
+      with:
+        name: smack-gnu-full-result
+        path: results
+        merge-multiple: true
     - name: Extract/summarize testing info
       id: summary
       shell: bash
@@ -416,8 +445,8 @@ jobs:
         path_UUTILS='uutils'
 
         json_count=$(ls -l results/*.json | wc -l)
-        if [[ "$json_count" -ne 5 ]]; then
-          echo "::error ::Failed to download all results json files (expected 4 files, found $json_count); failing early"
+        if [[ "$json_count" -ne 6 ]]; then
+          echo "::error ::Failed to download all results json files (expected 6 files, found $json_count); failing early"
           ls -lR results || true
           exit 1
         fi

.github/workflows/fuzzing.yml

@@ -79,8 +79,7 @@ jobs:
       matrix:
         test-target:
           - { name: fuzz_test, should_pass: true }
-          # https://github.com/uutils/coreutils/issues/5311
-          - { name: fuzz_date, should_pass: false }
+          - { name: fuzz_date, should_pass: true }
           - { name: fuzz_expr, should_pass: true }
           - { name: fuzz_printf, should_pass: true }
           - { name: fuzz_echo, should_pass: true }

.github/workflows/openbsd.yml

@@ -44,7 +44,14 @@ jobs:
         # We need jq and GNU coreutils to run show-utils.sh and bash to use inline shell string replacement
         # Use sudo-- to get the default sudo package without ambiguity
         # Install rust and cargo from OpenBSD packages
-        prepare: pkg_add curl sudo-- jq coreutils bash rust rust-clippy rust-rustfmt llvm--
+        prepare: |
+          # Clean up disk space before installing packages
+          df -h
+          rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
+          pkg_add curl sudo-- jq coreutils bash rust rust-clippy rust-rustfmt llvm--
+          # Clean up package cache after installation
+          pkg_delete -a || true
+          df -h
         run: |
           ## Prepare, build, and test
           # implementation modelled after ref: <https://github.com/rust-lang/rustup/pull/2783>
@@ -106,8 +113,10 @@ jobs:
             # * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
             S=\$(cargo clippy --all-targets \${CARGO_UTILITY_LIST_OPTIONS} -- -D warnings 2>&1) && printf "%s\n" "\$S" || { printf "%s\n" "\$S" ; printf "%s" "\$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*\$/::\${FAULT_TYPE} file=\2,line=\3,col=\4::\${FAULT_PREFIX}: \\\`cargo clippy\\\`: \1 (file:'\2', line:\3)/p;" -e '}' ; FAULT=true ; }
           fi
-          # Clean to avoid to rsync back the files
+          # Clean to avoid to rsync back the files and free up disk space
           cargo clean
+          # Additional cleanup to free disk space
+          rm -rf ~/.cargo/registry/cache ~/.cargo/git/db || true
           if [ -n "\${FAIL_ON_FAULT}" ] && [ -n "\${FAULT}" ]; then exit 1 ; fi
           EOF
 
@@ -132,7 +141,14 @@ jobs:
         copyback: false
         mem: 4096
         # Install rust and build dependencies from OpenBSD packages (llvm provides libclang for bindgen)
-        prepare: pkg_add curl gmake sudo-- jq rust llvm--
+        prepare: |
+          # Clean up disk space before installing packages
+          df -h
+          rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
+          pkg_add curl gmake sudo-- jq rust llvm--
+          # Clean up package cache after installation
+          pkg_delete -a || true
+          df -h
         run: |
           ## Prepare, build, and test
           # implementation modelled after ref: <https://github.com/rust-lang/rustup/pull/2783>
@@ -181,9 +197,13 @@ jobs:
           cd "${WORKSPACE}"
           unset FAULT
           cargo build || FAULT=1
+          # Clean build artifacts to save disk space before testing
+          rm -rf target/debug/build target/debug/incremental || true
           export PATH=~/.cargo/bin:${PATH}
           export RUST_BACKTRACE=1
           export CARGO_TERM_COLOR=always
+          # Avoid filling disk space
+          export RUSTFLAGS="-C strip=symbols"
           # Use cargo test since nextest might not support OpenBSD
           if (test -z "\$FAULT"); then cargo test --features '${{ matrix.job.features }}' || FAULT=1 ; fi
           # There is no systemd-logind on OpenBSD, so test all features except feat_systemd_logind
@@ -193,7 +213,9 @@ jobs:
           fi
           # Test building with make
           if (test -z "\$FAULT"); then make || FAULT=1 ; fi
-          # Clean to avoid to rsync back the files
+          # Clean to avoid to rsync back the files and free up disk space
           cargo clean
+          # Additional cleanup to free disk space
+          rm -rf ~/.cargo/registry/cache ~/.cargo/git/db target/debug/deps target/release/deps || true
           if (test -n "\$FAULT"); then exit 1 ; fi
           EOF

.vscode/cspell.dictionaries/acronyms+names.wordlist.txt

@@ -3,6 +3,8 @@ aarch
 AIX
 ASLR # address space layout randomization
 AST # abstract syntax tree
+CATN # busybox cat -n feature flag
+CATV # busybox cat -v feature flag
 CICD # continuous integration/deployment
 CPU
 CPUs