diff options
Diffstat (limited to 'app-admin/rsyslog/files')
| -rw-r--r-- | app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch | 29 | ||||
| -rw-r--r-- | app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch | 44 |
2 files changed, 44 insertions, 29 deletions
diff --git a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch deleted file mode 100644 index 88b4a6f6c6c0..000000000000 --- a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001 -From: Michael Biebl <biebl@debian.org> -Date: Tue, 19 Oct 2021 23:00:50 +0200 -Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog - is not available - -Fixes #4712 ---- - tests/omfwd_fast_imuxsock.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh -index bb35b58d18..10f9f19c18 100755 ---- a/tests/omfwd_fast_imuxsock.sh -+++ b/tests/omfwd_fast_imuxsock.sh -@@ -4,6 +4,13 @@ - . ${srcdir:=.}/diag.sh init - skip_platform "SunOS" "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS" - -+./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1 -+no_liblogging_stdlog=$? -+if [ $no_liblogging_stdlog -ne 0 ];then -+ echo "liblogging-stdlog not available - skipping test" -+ exit 77 -+fi -+ - # export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" - export NUMMESSAGES=100000 - diff --git a/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch new file mode 100644 index 000000000000..eae9fbc4d024 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch @@ -0,0 +1,44 @@ +From e3c750b98564bc66b50ae35e91f5222c441f8b75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> +Date: Wed, 16 Nov 2022 15:17:31 +0100 +Subject: [PATCH] configure.ac: remove bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +replace [[ ]] with test and == with = + +Signed-off-by: Maciej Barć <xgqt@gentoo.org> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a43681d72..6e66ec904b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1138,13 +1138,13 @@ AC_ARG_ENABLE(gnutls-tests, + no) enable_gnutls_tests="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gnutls-tests) ;; + esac], +- [if [[ "$enable_gnutls" == "yes" ]]; then ++ [if test "x$enable_gnutls" = "xyes"; then + enable_gnutls_tests=yes + else + enable_gnutls_tests=no + fi] + ) +-if [[ "$enable_gnutls_tests" == "yes" ]] && [[ "$enable_gnutls" != "yes" ]]; then ++if test "x$enable_gnutls_tests" = "xyes" && test "x$enable_gnutls" != "xyes"; then + AC_MSG_WARN([gnutls-tests can not be enabled without gnutls support. Disabling gnutls tests...]) + enable_gnutls_tests="no" + fi +@@ -1852,7 +1852,7 @@ AC_ARG_ENABLE(imfile-tests, + esac], + [enable_imfile_tests=yes] + ) +-if [[ "$enable_imfile_tests" == "yes" ]] && [[ "$enable_imfile" != "yes" ]]; then ++if test "x$enable_imfile_tests" = "xyes" && test "x$enable_imfile" != "xyes"; then + AC_MSG_WARN([imfile-tests can not be enabled without imfile support. Disabling imfile tests...]) + enable_imfile_tests="no" + fi |