diff --git a/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch b/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch new file mode 100644 index 0000000..b2f1aeb --- /dev/null +++ b/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch @@ -0,0 +1,30 @@ +From 4271b72e879ca25ba244036c0c2b6b9dbf7b2edf Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Thu, 14 Apr 2016 10:36:14 +0200 +Subject: [PATCH 2/2] framework: Drop unwanted debug message in sedispatch + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1326985 +--- + framework/src/sedispatch.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/framework/src/sedispatch.c b/framework/src/sedispatch.c +index 6417a10..bec3aa9 100644 +--- a/framework/src/sedispatch.c ++++ b/framework/src/sedispatch.c +@@ -147,10 +147,9 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) + FD_SET(0, &rfds); + tv.tv_sec = 3; + tv.tv_usec = 0; +- if (select(1, &rfds, NULL, NULL, &tv) == 0) { +- syslog(LOG_ERR, "timeout flush"); ++ if (select(1, &rfds, NULL, NULL, &tv) == 0) ++ /* The timeout occurred, the event is probably complete */ + auparse_flush_feed(au); +- } + } + if (feof(stdin)) + break; +-- +2.7.3 + diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 397b564..46f67da 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,7 +1,7 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -9,6 +9,8 @@ Source0: https://fedorahosted.org/releases/s/e/setroubleshoot/%{name}-%{version} Source1: %{name}.tmpfiles # https://github.com/fedora-selinux/setroubleshoot/pull/27 Patch1: 0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1326985 +Patch2: 0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch BuildRequires: perl-XML-Parser BuildRequires: libcap-ng-devel BuildRequires: intltool gettext python3 python3-devel @@ -76,8 +78,7 @@ fi %prep -%setup -q -%patch1 -p 2 +%autosetup -p 2 -S git %build %configure PYTHON=%{__python3} @@ -204,6 +205,9 @@ rm -rf %{buildroot} %changelog +* Thu Apr 14 2016 Petr Lautrbach - 3.3.5-3 +- Drop unwanted debug message in sedispatch (#1326985) + * Thu Apr 07 2016 Petr Lautrbach - 3.3.5-2 - setroubleshoot: Ensure that dbus string param isn't null