From 3df7b64d8093b7f46d04940a3562363fbb3cce4a Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 6 Dec 2022 16:26:34 -0700 Subject: [PATCH] Fix failure in check targets when there is no UTF-8 C locale. --- lib/eventlog/Makefile.in | 2 +- lib/iolog/Makefile.in | 10 +++++----- lib/util/Makefile.in | 6 +++--- logsrvd/Makefile.in | 6 +++--- plugins/python/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 10 +++++----- src/Makefile.in | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/eventlog/Makefile.in b/lib/eventlog/Makefile.in index 0796154ad..190470a82 100644 --- a/lib/eventlog/Makefile.in +++ b/lib/eventlog/Makefile.in @@ -152,7 +152,7 @@ check-fuzzer: check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in index 6f35db0e4..d8ca3f072 100644 --- a/lib/iolog/Makefile.in +++ b/lib/iolog/Makefile.in @@ -200,7 +200,7 @@ fuzz_iolog_json_seed_corpus.zip: rm -rf $$tdir run-fuzz_iolog_json: fuzz_iolog_json - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -225,7 +225,7 @@ fuzz_iolog_legacy_seed_corpus.zip: rm -rf $$tdir run-fuzz_iolog_legacy: fuzz_iolog_legacy - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -250,7 +250,7 @@ fuzz_iolog_timing_seed_corpus.zip: rm -rf $$tdir run-fuzz_iolog_timing: fuzz_iolog_timing - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -302,7 +302,7 @@ fuzz: run-fuzz_iolog_json run-fuzz_iolog_legacy run-fuzz_iolog_timing check-fuzzer: $(FUZZ_PROGS) @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -319,7 +319,7 @@ check-fuzzer: $(FUZZ_PROGS) check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 8d52252c8..10209da3a 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -342,7 +342,7 @@ fuzz_sudo_conf_seed_corpus.zip: rm -rf $$tdir run-fuzz_sudo_conf: fuzz_sudo_conf - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -406,7 +406,7 @@ fuzz: run-fuzz_sudo_conf check-fuzzer: $(FUZZ_PROGS) @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -420,7 +420,7 @@ check-fuzzer: $(FUZZ_PROGS) # Note: some regress checks are run from srcdir for consistent error messages check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index c7f2e2d88..edd35bc37 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -195,7 +195,7 @@ fuzz_logsrvd_conf_seed_corpus.zip: rm -rf $$tdir run-fuzz_logsrvd_conf: fuzz_logsrvd_conf - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -256,7 +256,7 @@ fuzz: run-fuzz_logsrvd_conf check-fuzzer: $(FUZZ_PROGS) @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -269,7 +269,7 @@ check-fuzzer: $(FUZZ_PROGS) check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index ad83e1ab3..1ea1e9a52 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -228,7 +228,7 @@ check-fuzzer: check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index a729587f2..d7c5d8181 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -431,7 +431,7 @@ fuzz_policy_seed_corpus.zip: rm -rf $$tdir run-fuzz_policy: fuzz_policy - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -456,7 +456,7 @@ fuzz_sudoers_seed_corpus.zip: rm -rf $$tdir run-fuzz_sudoers: fuzz_sudoers - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -481,7 +481,7 @@ fuzz_sudoers_ldif_seed_corpus.zip: rm -rf $$tdir run-fuzz_sudoers_ldif: fuzz_sudoers_ldif - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -629,7 +629,7 @@ fuzz: run-fuzz_policy run-fuzz_sudoers run-fuzz_sudoers_ldif check-fuzzer: $(FUZZ_PROGS) @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ @@ -646,7 +646,7 @@ check-fuzzer: $(FUZZ_PROGS) check: $(TEST_PROGS) visudo testsudoers cvtsudoers check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \ diff --git a/src/Makefile.in b/src/Makefile.in index 850b73212..6a947da68 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -332,7 +332,7 @@ check-fuzzer: check: $(TEST_PROGS) check-fuzzer @if test X"$(cross_compiling)" != X"yes"; then \ - l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'`; \ + l=`locale -a 2>&1 | $(EGREP) -i '^C.UTF-?8$$'` || true; \ test -n "$$l" || l="C"; \ LC_ALL="$$l"; export LC_ALL; \ unset LANG || LANG=; \