Merge branch 'main' into noselinuxprogs

Author: oech3

.github/workflows/CICD.yml

@@ -584,8 +584,7 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl , use-cross: use-cross }
-          # broken by network error
-          # - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
+          - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
           - { os: ubuntu-latest  , target: wasm32-unknown-unknown      , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
           - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
           # PR #7964: Mac should still build even if the feature is not enabled
@@ -785,7 +784,7 @@ jobs:
     - uses: taiki-e/install-action@v2
       if: steps.vars.outputs.CARGO_CMD == 'redoxer'
       with:
-        tool: redoxer@0.2.37
+        tool: redoxer@0.2.56
     - name: Initialize toolchain-dependent workflow variables
       id: dep_vars
       shell: bash

GNUmakefile

@@ -313,8 +313,6 @@ endif
 
 all: build
 
-use_default := 1
-
 build-pkgs:
 ifneq (${MULTICALL}, y)
 ifdef BUILD_SPEC_FEATURE

util/gnu-patches/runcon-no-reorder.patch

@@ -0,0 +1,14 @@
+--git a/tests/runcon/runcon-no-reorder.sh b/tests/runcon/runcon-no-reorder.sh
+index 2027555..956c51e 100644
+--- a/tests/runcon/runcon-no-reorder.sh
++++ b/tests/runcon/runcon-no-reorder.sh
+@@ -16,6 +16,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
++# We don't have runcon buildable without libselinux.
++_require_selinux_
++
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ runcon
+ 

util/gnu-patches/series

@@ -11,3 +11,4 @@ tests_tsort.patch
 tests_du_move_dir_while_traversing.patch
 test_mkdir_restorecon.patch
 error_msg_uniq.diff
+runcon-no-reorder.patch