Merge branch 'main' into du_files0_from_stdin

Author: sylvestre

.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

.devcontainer/Dockerfile

@@ -12,7 +12,6 @@ RUN apt-get update \
        gcc \
        gdb \
        gperf \
-       jq \
        libacl1-dev \
        libattr1-dev \
        libcap-dev \

.github/workflows/CICD.yml

@@ -29,7 +29,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Run ShellCheck
@@ -47,7 +47,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Setup shfmt

.github/workflows/CheckScripts.yml

@@ -26,7 +26,7 @@ jobs:
         job:
           - { os: ubuntu-latest , features: feat_os_unix }
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Initialize job variables
@@ -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/FixPR.yml

@@ -29,7 +29,6 @@ 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.8"
 
 jobs:
   native:
@@ -38,10 +37,20 @@ jobs:
     steps:
     #### Get the code, setup cache
     - name: Checkout code (uutils)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       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
@@ -50,7 +59,7 @@ jobs:
       with:
         workspaces: "./uutils -> target"
     - name: Checkout code (GNU coreutils)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: 'coreutils/coreutils'
         path: 'gnu'
@@ -71,7 +80,8 @@ jobs:
       run: |
         ## Install dependencies
         sudo apt-get update
-        sudo apt-get install -y autoconf autopoint bison texinfo gperf gcc g++ gdb python3-pyinotify jq valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev libselinux1-dev attr quilt
+        ## 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
     - name: Add various locales
       shell: bash
       run: |
@@ -89,6 +99,9 @@ jobs:
         sudo locale-gen --keep-existing en_US
         sudo locale-gen --keep-existing en_US.UTF-8
         sudo locale-gen --keep-existing ru_RU.KOI8-R
+        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 update-locale
         echo "After:"
@@ -100,7 +113,7 @@ jobs:
       run: |
         ## Build binaries
         cd 'uutils'
-        bash util/build-gnu.sh --release-build
+        env PROFILE=release-small bash util/build-gnu.sh
 
     ### Run tests as user
     - name: Run GNU tests
@@ -132,12 +145,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 +160,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: |
@@ -160,10 +173,20 @@ jobs:
     steps:
     #### Get the code, setup cache
     - name: Checkout code (uutils)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       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
@@ -172,7 +195,7 @@ jobs:
       with:
         workspaces: "./uutils -> target"
     - name: Checkout code (GNU coreutils)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: 'coreutils/coreutils'
         path: 'gnu'
@@ -197,9 +220,7 @@ jobs:
         path: ~/.cache/lima
         key: lima-${{ steps.lima-actions-setup.outputs.version }}
     - name: Start Fedora VM with SELinux
-      run: limactl start --plain --name=default --cpus=4 --disk=40 --memory=8 --network=lima:user-v2 template://fedora
-    - name: Setup SSH
-      uses: lima-vm/lima-actions/ssh@v1
+      run: limactl start --plain --name=default --cpus=4 --disk=40 --memory=8 --network=lima:user-v2 template:fedora
     - name: Verify SELinux Status and Configuration
       run: |
         lima getenforce
@@ -218,7 +239,7 @@ jobs:
     - name: Install dependencies in VM
       run: |
         lima sudo dnf -y update
-        lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc g++ gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex wget automake patch quilt
+        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
     - name: Copy the sources to VM
       run: |
@@ -227,7 +248,7 @@ jobs:
     ### Build
     - name: Build binaries
       run: |
-        lima bash -c "cd ~/work/uutils/ && bash util/build-gnu.sh --release-build"
+        lima bash -c "cd ~/work/uutils/ && SELINUX_ENABLED=1 PROFILE=release-small bash util/build-gnu.sh"
 
     ### Run tests as user
     - name: Generate SELinux tests list
@@ -268,12 +289,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 +304,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: |
@@ -311,7 +332,7 @@ jobs:
 
         outputs TEST_SUMMARY_FILE AGGREGATED_SUMMARY_FILE
     - name: Checkout code (uutils)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         path: 'uutils'
         persist-credentials: false
@@ -326,25 +347,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 +414,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 +476,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/