Merge branch 'main' into unit1

Author: oech3

.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

@@ -27,9 +27,9 @@ env:
   DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
   TEST_FULL_SUMMARY_FILE: 'gnu-full-result.json'
   TEST_ROOT_FULL_SUMMARY_FILE: 'gnu-root-full-result.json'
+  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'
-  REPO_GNU_REF: "v9.8"
 
 jobs:
   native:
@@ -38,10 +38,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 +60,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 +81,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 +100,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 +114,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
@@ -124,12 +138,34 @@ jobs:
         path_GNU='gnu'
         path_UUTILS='uutils'
         bash "uutils/util/run-gnu-test.sh" run-root
+
     - name: Extract testing info from individual logs (run as root) into JSON
       shell: bash
       run : |
         path_UUTILS='uutils'
         python uutils/util/gnu-json-result.py gnu/tests > ${{ env.TEST_ROOT_FULL_SUMMARY_FILE }}
 
+    ### This shell has been changed from "bash" to this command
+    ### "script" will start a pty and the -q command removes the "script" initiation log
+    ### the -e flag makes it propagate the error code and -c runs the command in a pty
+    ### the primary purpose of this change is to run the tty GNU tests
+    ### The reason its separated from the rest of the tests is because one test can corrupt the other
+    ### tests through the use of the shared terminal and it changes the environment that the other
+    ### tests are run in, which can cause different results.
+    - name: Run GNU stty tests
+      shell: 'script -q -e -c "bash {0}"'
+      run: |
+        ## Run GNU root tests
+        path_GNU='gnu'
+        path_UUTILS='uutils'
+        bash "uutils/util/run-gnu-test.sh" run-tty
+
+    - name: Extract testing info from individual logs (stty) into JSON
+      shell: bash
+      run : |
+        path_UUTILS='uutils'
+        python uutils/util/gnu-json-result.py gnu/tests > ${{ env.TEST_STTY_FULL_SUMMARY_FILE }}
+
     ### Upload artifacts
     - name: Upload full json results
       uses: actions/upload-artifact@v5
@@ -141,6 +177,12 @@ jobs:
       with:
         name: gnu-root-full-result
         path: ${{ env.TEST_ROOT_FULL_SUMMARY_FILE }}
+    - name: Upload stty json results
+      uses: actions/upload-artifact@v5
+      with:
+        name: gnu-stty-full-result
+        path: ${{ env.TEST_STTY_FULL_SUMMARY_FILE }}
+
     - name: Compress test logs
       shell: bash
       run : |
@@ -160,10 +202,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 +224,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 +249,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 +268,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 +277,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
@@ -311,7 +361,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
@@ -337,6 +387,13 @@ jobs:
         name: gnu-root-full-result
         path: results
         merge-multiple: true
+    - name: Download stty json results
+      uses: actions/download-artifact@v6
+      with:
+        name: gnu-stty-full-result
+        path: results
+        merge-multiple: true
+
     - name: Download selinux json results
       uses: actions/download-artifact@v6
       with:
@@ -359,7 +416,7 @@ jobs:
         path_UUTILS='uutils'
 
         json_count=$(ls -l results/*.json | wc -l)
-        if [[ "$json_count" -ne 4 ]]; then
+        if [[ "$json_count" -ne 5 ]]; then
           echo "::error ::Failed to download all results json files (expected 4 files, found $json_count); failing early"
           ls -lR results || true
           exit 1

.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 swiftshader_indirect -metrics-collection
+  COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu off
   EMULATOR_DISK_SIZE: 12GB
   EMULATOR_HEAP_SIZE: 2048M
   EMULATOR_BOOT_TIMEOUT: 1200 # 20min
@@ -36,15 +36,10 @@ jobs:
       matrix:
         os: [ubuntu-latest] # , macos-latest
         cores: [4] # , 6
-        ram: [4096, 8192]
+        ram: [4096]
         api-level: [28]
         target: [google_apis_playstore]
         arch: [x86, x86_64] # , arm64-v8a
-        exclude:
-          - ram: 8192
-            arch: x86
-          - ram: 4096
-            arch: x86_64
     runs-on: ${{ matrix.os }}
     env:
       EMULATOR_RAM_SIZE: ${{ matrix.ram }}
@@ -80,7 +75,7 @@ jobs:
         echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
         sudo udevadm control --reload-rules
         sudo udevadm trigger --name-match=kvm
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Collect information about runner
@@ -116,7 +111,7 @@ jobs:
           ~/.android/avd/*/*.lock
     - name: Create and cache emulator image
       if: steps.avd-cache.outputs.cache-hit != 'true'
-      uses: reactivecircus/android-emulator-runner@v2.34.0
+      uses: reactivecircus/android-emulator-runner@v2.35.0
       with:
         api-level: ${{ matrix.api-level }}
         target: ${{ matrix.target }}
@@ -161,7 +156,7 @@ jobs:
         free -mh
         df -Th
     - name: Build and Test
-      uses: reactivecircus/android-emulator-runner@v2.34.0
+      uses: reactivecircus/android-emulator-runner@v2.35.0
       with:
         api-level: ${{ matrix.api-level }}
         target: ${{ matrix.target }}

.github/workflows/android.yml

@@ -24,6 +24,7 @@ jobs:
       matrix:
         benchmark-target:
           - { package: uu_base64 }
+          - { package: uu_cksum }
           - { package: uu_cp }
           - { package: uu_cut }
           - { package: uu_du }
@@ -36,14 +37,16 @@ jobs:
           - { package: uu_numfmt }
           - { package: uu_rm }
           - { package: uu_seq }
+          - { package: uu_shuf }
           - { package: uu_sort }
           - { package: uu_split }
           - { package: uu_tsort }
           - { package: uu_unexpand }
           - { package: uu_uniq }
           - { package: uu_wc }
+          - { package: uu_factor }
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false