Merge branch 'main' into sort-utf

Author: sylvestre

.cargo/config.toml

@@ -6,7 +6,13 @@
 linker = "x86_64-unknown-redox-gcc"
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
+[target.riscv64gc-unknown-linux-musl]
+rustflags = ["-C", "target-feature=+crt-static"]
 
 [env]
 # See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml
 LIBSTDBUF_DIR = "/usr/local/libexec/coreutils"
+
+# remove me
+[build]
+rustflags = ["-A", "clippy::collapsible_if"]

.clippy.toml

@@ -1,5 +1,5 @@
-msrv = "1.85.0"
 avoid-breaking-exported-api = false
 check-private-items = true
 cognitive-complexity-threshold = 24
 missing-docs-in-crate-items = true
+allow-mixed-uninlined-format-args = false

.config/nextest.toml

@@ -5,9 +5,15 @@ final-status-level = "skip"
 failure-output = "immediate-final"
 fail-fast = false
 
+[profile.ci.junit]
+path = "junit.xml"
+
 [profile.coverage]
 retries = 0
 status-level = "all"
 final-status-level = "skip"
 failure-output = "immediate-final"
 fail-fast = false
+
+[profile.coverage.junit]
+path = "junit.xml"

.editorconfig

@@ -57,6 +57,10 @@ switch_case_indent = true
 end_of_line = crlf
 insert_final_newline = false
 
+[*.toml]
+indent_size = 2
+indent_style = space
+
 [*.{yaml,yml,[Yy][Mm][Ll],[Yy][Aa][Mm][Ll]}]
 # YAML
 indent_size = 2

.github/workflows/CICD.yml

@@ -46,7 +46,7 @@ jobs:
         # Ensure updated '*/Cargo.lock'
         # * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38)
         for dir in "." "fuzz"; do
-          ( cd "$dir" && (cargo fetch --locked --quiet || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
+          ( cd "$dir" && (cargo fetch --locked --quiet --target $(rustc --print host-tuple) || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
         done
     - name: Info
       shell: bash
@@ -65,9 +65,9 @@ jobs:
         cargo tree -V
         ## dependencies
         echo "## dependency list"
-        cargo fetch --locked --quiet
+        cargo fetch --locked --quiet --target $(rustc --print host-tuple)
         ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
-        RUSTUP_TOOLCHAIN=stable cargo tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
+        cargo +stable tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
     - name: Commit any changes (to '${{ env.BRANCH_TARGET }}')
       uses: EndBug/add-and-commit@v9
       with:

.github/workflows/FixPR.yml

@@ -59,4 +59,4 @@ jobs:
                 issue_number: issue_number,
                 body: 'GNU testsuite comparison:\n```\n' + content + '```'
               });
-            } 
+            }

.github/workflows/GnuComment.yml

@@ -2,11 +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 dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt texinfo valgrind libattr libcap taiki-e zstd cpio
+# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt 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
+# spell-checker:ignore userns nodocs
 
 # * note: to run a single test => `REPO/util/run-gnu-test.sh PATH/TO/TEST/SCRIPT`
 
@@ -31,7 +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'
+  TEST_QEMU_FULL_SUMMARY_FILE: 'qemu-gnu-full-result.json'
 
 jobs:
   native:
@@ -44,10 +44,6 @@ jobs:
       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"
@@ -69,7 +65,7 @@ jobs:
         ## Install dependencies
         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
+        sudo apt-get install -y 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
@@ -105,7 +101,7 @@ 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'
@@ -208,13 +204,6 @@ jobs:
       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)
 
@@ -235,20 +224,10 @@ jobs:
         lima ls -laZ /etc/selinux
         lima sudo sestatus
 
-        # Ensure we're running in enforcing mode
-        lima sudo setenforce 1
-        lima getenforce
-
-        # Create test files with SELinux contexts for testing
-        lima sudo mkdir -p /var/test_selinux
-        lima sudo touch /var/test_selinux/test_file
-        lima sudo chcon -t etc_t /var/test_selinux/test_file
-        lima ls -Z /var/test_selinux/test_file  # Verify context
     - name: Install dependencies in VM
       run: |
-        lima sudo dnf -y update
-        lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex automake patch quilt
-        lima rustup-init -y --default-toolchain stable
+        lima sudo dnf -y install --nodocs autoconf bison gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel automake patch quilt
+        lima rustup-init -y --profile=minimal --default-toolchain stable
     - name: Copy the sources to VM
       run: |
         rsync -a -e ssh . lima-default:~/work/
@@ -269,8 +248,16 @@ jobs:
         lima bash -c "cd ~/work/uutils/ && echo 'Found SELinux tests:'; wc -l selinux-tests.txt"
     - name: Run GNU SELinux tests
       run: |
+        # Ensure we're running in enforcing mode
         lima sudo setenforce 1
         lima getenforce
+
+        # Create test files with SELinux contexts for testing
+        lima sudo mkdir -p /var/test_selinux
+        lima sudo touch /var/test_selinux/test_file
+        lima sudo chcon -t etc_t /var/test_selinux/test_file
+        lima ls -Z /var/test_selinux/test_file  # Verify context
+
         lima cat /proc/filesystems
         lima bash -c "cd ~/work/uutils/ && bash util/run-gnu-test.sh \$(cat selinux-tests.txt)"
     - name: Extract testing info from individual logs into JSON
@@ -319,19 +306,15 @@ jobs:
           gnu/tests-selinux/*.log
           gnu/tests-selinux/*/*.log.gz
 
-  smack:
-    name: Run GNU tests (SMACK)
+  qemu:
+    name: Run GNU tests (SMACK/ROOTFS)
     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"
@@ -341,30 +324,30 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y qemu-system-x86 zstd cpio
-    - name: Run GNU SMACK tests
+    - name: Run GNU SMACK/ROOTFS tests
       run: |
         cd uutils
-        bash util/run-gnu-tests-smack-ci.sh "$GITHUB_WORKSPACE/gnu" "$GITHUB_WORKSPACE/gnu/tests-smack"
+        bash util/run-gnu-tests-smack-ci.sh "$GITHUB_WORKSPACE/gnu" "$GITHUB_WORKSPACE/gnu/tests-qemu"
     - 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
+        python3 uutils/util/gnu-json-result.py gnu/tests-qemu > ${{ env.TEST_QEMU_FULL_SUMMARY_FILE }}
+    - name: Upload SMACK/ROOTFS 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
+        name: qemu-gnu-full-result
+        path: ${{ env.TEST_QEMU_FULL_SUMMARY_FILE }}
+    - name: Compress SMACK/ROOTFS test logs
+      run: gzip gnu/tests-qemu/*/*.log 2>/dev/null || true
+    - name: Upload SMACK/ROOTFS test logs
       uses: actions/upload-artifact@v6
       with:
-        name: smack-test-logs
+        name: qemu-test-logs
         path: |
-          gnu/tests-smack/*.log
-          gnu/tests-smack/*/*.log.gz
+          gnu/tests-qemu/*.log
+          gnu/tests-qemu/*/*.log.gz
 
   aggregate:
-    needs: [native, selinux, smack]
+    needs: [native, selinux, qemu]
     permissions:
       actions: read  # for dawidd6/action-download-artifact to query and download artifacts
       contents: read  # for actions/checkout to fetch code
@@ -389,7 +372,7 @@ jobs:
         path: 'uutils'
         persist-credentials: false
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v12
+      uses: dawidd6/action-download-artifact@v14
       # 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:
@@ -429,10 +412,10 @@ jobs:
         name: selinux-root-gnu-full-result
         path: results
         merge-multiple: true
-    - name: Download smack json results
+    - name: Download SMACK/ROOTFS json results
       uses: actions/download-artifact@v7
       with:
-        name: smack-gnu-full-result
+        name: qemu-gnu-full-result
         path: results
         merge-multiple: true
     - name: Extract/summarize testing info

.github/workflows/GnuTests.yml

@@ -22,7 +22,7 @@ concurrency:
 env:
   TERMUX: v0.118.0
   KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc18
-  COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu off
+  COMMON_EMULATOR_OPTIONS: -no-metrics -no-window -noaudio -no-boot-anim -camera-back none -gpu off
   EMULATOR_DISK_SIZE: 12GB
   EMULATOR_HEAP_SIZE: 2048M
   EMULATOR_BOOT_TIMEOUT: 1200 # 20min
@@ -39,7 +39,7 @@ jobs:
         ram: [4096]
         api-level: [28]
         target: [google_apis_playstore]
-        arch: [x86, x86_64] # , arm64-v8a
+        arch: [x86_64] # ,x86 ,arm64-v8a
     runs-on: ${{ matrix.os }}
     env:
       EMULATOR_RAM_SIZE: ${{ matrix.ram }}

.github/workflows/android.yml

@@ -0,0 +1,15 @@
+name: Security audit
+
+# spell-checker:ignore (misc) rustsec
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: rustsec/audit-check@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}