Merge branch 'main' into fold_fix

Author: mattsu2020

.github/workflows/CICD.yml

@@ -300,14 +300,14 @@ jobs:
         mv -t target/ target.cache/release 2>/dev/null || true
     - name: "`make nextest`"
       shell: bash
-      run: make nextest CARGOFLAGS="--profile ci --hide-progress-bar"
+      run: make nextest PROFILE=ci CARGOFLAGS="--hide-progress-bar"
       env:
         RUST_BACKTRACE: "1"
-    - name: "`make install COMPLETIONS=n MANPAGES=n`"
+    - name: "`make install COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: bash
       run: |
         set -x
-        DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n install
+        DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n LOCALES=n install
         # Check that the utils are present
         test -f /tmp/usr/local/bin/tty
         # Check that the manpage is not present
@@ -355,20 +355,12 @@ jobs:
         test -f /tmp/usr/local/bin/hashsum
         # Check that hashsum symlinks are present
         test -h /tmp/usr/local/bin/b2sum
-        test -h /tmp/usr/local/bin/b3sum
         test -h /tmp/usr/local/bin/md5sum
         test -h /tmp/usr/local/bin/sha1sum
         test -h /tmp/usr/local/bin/sha224sum
         test -h /tmp/usr/local/bin/sha256sum
-        test -h /tmp/usr/local/bin/sha3-224sum
-        test -h /tmp/usr/local/bin/sha3-256sum
-        test -h /tmp/usr/local/bin/sha3-384sum
-        test -h /tmp/usr/local/bin/sha3-512sum
         test -h /tmp/usr/local/bin/sha384sum
-        test -h /tmp/usr/local/bin/sha3sum
         test -h /tmp/usr/local/bin/sha512sum
-        test -h /tmp/usr/local/bin/shake128sum
-        test -h /tmp/usr/local/bin/shake256sum
     - name: "`make install MULTICALL=y LN=ln -svf`"
       shell: bash
       run: |
@@ -1269,7 +1261,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=30 --memory=4 --network=lima:user-v2 template://fedora
+      run: limactl start --plain --name=default --cpus=4 --disk=30 --memory=4 --network=lima:user-v2 template:fedora
     - run: rsync -v -a -e ssh . lima-default:~/work/
     - name: Setup Rust and other build deps in VM
       run: |

.github/workflows/GnuTests.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:
@@ -42,6 +41,16 @@ 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
@@ -164,6 +173,16 @@ 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
@@ -197,7 +216,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
+      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

.github/workflows/android.yml

@@ -116,7 +116,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 +161,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/benchmarks.yml

@@ -43,6 +43,7 @@ jobs:
           - { package: uu_unexpand }
           - { package: uu_uniq }
           - { package: uu_wc }
+          - { package: uu_factor }
     steps:
       - uses: actions/checkout@v5
         with:

.github/workflows/code-quality.yml

@@ -133,7 +133,7 @@ jobs:
           else
             extra="--features ${{ matrix.job.features }}"
           fi
-          case '${{ matrix.job.workspace-tests }}' in
+          case '${{ matrix.job.workspace }}' in
           1|t|true|y|yes)
             extra="${extra} --workspace"
             ;;
@@ -186,7 +186,7 @@ jobs:
         cfg_files=($(shopt -s nullglob ; echo {.vscode,.}/{,.}c[sS]pell{.json,.config{.js,.cjs,.json,.yaml,.yml},.yaml,.yml} ;))
         cfg_file=${cfg_files[0]}
         unset CSPELL_CFG_OPTION ; if [ -n "$cfg_file" ]; then CSPELL_CFG_OPTION="--config $cfg_file" ; fi
-        S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/${PWD//\//\\/}\/(.*):(.*):(.*) - (.*)/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \4 (file:'\1', line:\2)/p" ; fault=true ; true ; }
+        S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/^(.*):([0-9]+):([0-9]+) - Unknown word \(([^)]+)\).*$/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \`cspell\`: Unknown word '\4' (file:'\1', line:\2)/p" ; fault=true ; true ; }
         if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
 
   toml_format:

.github/workflows/freebsd.yml

@@ -40,8 +40,10 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.9
+      with:
+        disable_annotations: true
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.5
+      uses: vmactions/freebsd-vm@v1.2.6
       with:
         usesh: true
         sync: rsync
@@ -134,8 +136,10 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.9
+      with:
+        disable_annotations: true
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.5
+      uses: vmactions/freebsd-vm@v1.2.6
       with:
         usesh: true
         sync: rsync
@@ -196,7 +200,7 @@ jobs:
           if (test -z "\$FAULT"); then cargo nextest run --hide-progress-bar --profile ci --features '${{ matrix.job.features }}' || FAULT=1 ; fi
           # There is no systemd-logind on FreeBSD, so test all features except feat_systemd_logind ( https://github.com/rust-lang/cargo/issues/3126#issuecomment-2523441905 )
           if (test -z "\$FAULT"); then
-            UUCORE_FEATURES=\$(cargo metadata --format-version=1 --no-deps -p uucore | jq -r '.packages[] | select(.name == "uucore") | .features | keys | .[]' | grep -v "feat_systemd_logind" | paste -s -d "," -)
+            UUCORE_FEATURES=\$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "uucore") | .features | keys | .[]' | grep -v "feat_systemd_logind" | paste -s -d "," -)
             cargo nextest run --hide-progress-bar --profile ci --features "\$UUCORE_FEATURES" -p uucore || FAULT=1
           fi
           # Test building with make

.github/workflows/l10n.yml

@@ -1245,10 +1245,138 @@ jobs:
           exit 1
         fi
 
+  l10n_locale_embedding_cargo_install:
+    name: L10n/Locale Embedding - Cargo Install
+    runs-on: ubuntu-latest
+    env:
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        persist-credentials: false
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: Swatinem/rust-cache@v2
+      with:
+        key: cargo-install-locale-embedding
+    - name: Run sccache-cache
+      uses: mozilla-actions/sccache-action@v0.0.9
+    - name: Install prerequisites
+      run: |
+        sudo apt-get -y update
+        sudo apt-get -y install libselinux1-dev locales
+        # Generate French locale for testing
+        sudo locale-gen --keep-existing fr_FR.UTF-8
+        locale -a | grep -i fr || exit 1
+
+    - name: Test English locale embedding (default)
+      run: |
+        export LANG=en_US.UTF-8
+        export LC_ALL=en_US.UTF-8
+
+        echo "Building uu_yes with LANG=$LANG"
+        cargo build --package uu_yes --release
+
+        # Find the generated embedded_locales.rs
+        locale_file=$(find target/release/build -path "*/uu_yes-*/out/embedded_locales.rs" -o -path "*/uucore-*/out/embedded_locales.rs" | head -1)
+        if [ -z "$locale_file" ]; then
+          echo "ERROR: Could not find embedded_locales.rs"
+          exit 1
+        fi
+
+        echo "Found embedded_locales.rs at: $locale_file"
+        echo "Checking embedded locales..."
+
+        # Should contain en-US
+        if grep -q 'yes/en-US\.ftl' "$locale_file" || grep -q 'uucore/en-US\.ftl' "$locale_file"; then
+          echo "✓ Found en-US locale (fallback)"
+        else
+          echo "✗ ERROR: en-US locale not found"
+          exit 1
+        fi
+
+        # Should NOT contain fr-FR when building with en_US.UTF-8
+        if grep -q 'yes/fr-FR\.ftl' "$locale_file" || grep -q 'uucore/fr-FR\.ftl' "$locale_file"; then
+          echo "✗ ERROR: Unexpectedly found fr-FR locale when LANG=en_US.UTF-8"
+          exit 1
+        else
+          echo "✓ Correctly omitted fr-FR locale"
+        fi
+
+        echo "✓ SUCCESS: English locale embedding working correctly"
+
+    - name: Test French locale embedding (system locale)
+      run: |
+        export LANG=fr_FR.UTF-8
+        export LC_ALL=fr_FR.UTF-8
+
+        # Clean previous build to ensure fresh compile
+        cargo clean -p uu_yes
+        cargo clean -p uucore
+
+        echo "Building uu_yes with LANG=$LANG"
+        cargo build --package uu_yes --release
+
+        # Find the generated embedded_locales.rs
+        locale_file=$(find target/release/build -path "*/uu_yes-*/out/embedded_locales.rs" -o -path "*/uucore-*/out/embedded_locales.rs" | head -1)
+        if [ -z "$locale_file" ]; then
+          echo "ERROR: Could not find embedded_locales.rs"
+          exit 1
+        fi
+
+        echo "Found embedded_locales.rs at: $locale_file"
+        echo "Checking embedded locales..."
+
+        # Should contain en-US (fallback)
+        if grep -q 'yes/en-US\.ftl' "$locale_file" || grep -q 'uucore/en-US\.ftl' "$locale_file"; then
+          echo "✓ Found en-US locale (fallback)"
+        else
+          echo "✗ ERROR: en-US locale not found"
+          exit 1
+        fi
+
+        # Should contain fr-FR when building with fr_FR.UTF-8
+        if grep -q 'yes/fr-FR\.ftl' "$locale_file" || grep -q 'uucore/fr-FR\.ftl' "$locale_file"; then
+          echo "✓ Found fr-FR locale (system locale from LANG)"
+        else
+          echo "Note: fr-FR locale not found - this is expected if French translation doesn't exist yet"
+          echo "::notice::French locale for 'yes' utility may not be available"
+        fi
+
+        echo "✓ SUCCESS: System locale detection working correctly"
+
+    - name: Test locale count is reasonable
+      run: |
+        export LANG=fr_FR.UTF-8
+        cargo clean -p uu_yes
+        cargo build --package uu_yes --release
+
+        locale_file=$(find target/release/build -path "*/uucore-*/out/embedded_locales.rs" | head -1)
+        if [ -z "$locale_file" ]; then
+          echo "ERROR: Could not find uucore embedded_locales.rs"
+          exit 1
+        fi
+
+        # Count embedded locales (should be en-US + system locale, not all locales)
+        locale_count=$(grep -c '/en-US\.ftl\|/fr-FR\.ftl' "$locale_file" || echo "0")
+        echo "uu_yes has $locale_count embedded locale entries for yes utility"
+
+        # For a single utility build, should have minimal locales (en-US + optionally system locale)
+        # Not the full multicall set
+        total_match_count=$(grep -c '=> Some(r###' "$locale_file" || echo "0")
+        echo "Total embedded entries: $total_match_count"
+
+        if [ "$total_match_count" -le 10 ]; then
+          echo "✓ SUCCESS: Locale embedding is targeted ($total_match_count entries)"
+        else
+          echo "::warning::More locales than expected ($total_match_count entries)"
+          echo "This might be expected for utility + uucore locales"
+        fi
+
   l10n_locale_embedding_regression_test:
     name: L10n/Locale Embedding Regression Test
     runs-on: ubuntu-latest
-    needs: [l10n_locale_embedding_cat, l10n_locale_embedding_ls, l10n_locale_embedding_multicall]
+    needs: [l10n_locale_embedding_cat, l10n_locale_embedding_ls, l10n_locale_embedding_multicall, l10n_locale_embedding_cargo_install]
     steps:
     - name: All locale embedding tests passed
       run: echo "✓ All locale embedding tests passed successfully"