From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E386F158086 for ; Thu, 21 Oct 2021 18:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DA66E0830; Thu, 21 Oct 2021 18:08:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCE05E0815 for ; Thu, 21 Oct 2021 18:08:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE81234368B for ; Thu, 21 Oct 2021 18:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52A94165 for ; Thu, 21 Oct 2021 18:08:31 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1634839696.1fb5670d27a2b131f998c55dec0d3c53b41ba86e.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch app-admin/rsyslog/rsyslog-8.2110.0.ebuild X-VCS-Directories: app-admin/rsyslog/files/ app-admin/rsyslog/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 1fb5670d27a2b131f998c55dec0d3c53b41ba86e X-VCS-Branch: master Date: Thu, 21 Oct 2021 18:08:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92c03a67-6ea2-4918-b016-a93dd020295e X-Archives-Hash: b173cd241a6363fff930287cfdd050de commit: 1fb5670d27a2b131f998c55dec0d3c53b41ba86e Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 21 15:18:49 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 21 18:08:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb5670d 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 gentoo.org> ...og-8.2110.0-skip-omfwd_fast_imuxsock-test.patch | 29 ++++++++++++++++++++++ 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 00000000000..88b4a6f6c6c --- /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 +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 3646a0ea17e..9dab13ad4b6 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!"