diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-10-21 17:18:49 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-10-21 20:08:16 +0200 |
| commit | 1fb5670d27a2b131f998c55dec0d3c53b41ba86e (patch) | |
| tree | c3b173fc044594bcec86ec914455db7b1e1a6224 /app-admin/rsyslog | |
| parent | mail-client/thunderbird-bin: bump to v78.14.0 (diff) | |
| download | gentoo-1fb5670d27a2b131f998c55dec0d3c53b41ba86e.tar.gz gentoo-1fb5670d27a2b131f998c55dec0d3c53b41ba86e.tar.bz2 gentoo-1fb5670d27a2b131f998c55dec0d3c53b41ba86e.zip | |
app-admin/rsyslog: skip omfwd_fast_imuxsock when running without dev-libs/liblogging[stdlog]
Bug: https://bugs.gentoo.org/819087
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'app-admin/rsyslog')
| -rw-r--r-- | app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch | 29 | ||||
| -rw-r--r-- | app-admin/rsyslog/rsyslog-8.2110.0.ebuild | 8 |
2 files changed, 33 insertions, 4 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 new file mode 100644 index 000000000000..88b4a6f6c6c0 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch @@ -0,0 +1,29 @@ +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/rsyslog-8.2110.0.ebuild b/app-admin/rsyslog/rsyslog-8.2110.0.ebuild index 3646a0ea17eb..9dab13ad4b60 100644 --- a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2110.0.ebuild @@ -97,10 +97,8 @@ RDEPEND=" zeromq? ( >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" + +DEPEND="${RDEPEND}" if [[ ${PV} == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" @@ -109,6 +107,8 @@ if [[ ${PV} == "9999" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi +PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch ) + CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |