setroubleshoot-3.3.32-7

- Always reset pending alarms when alarm(0) (rhbz#2112573)

0002-Always-reset-pending-alarms-when-alarm-0.patch

@@ -0,0 +1,29 @@
+From 659f10a0ab422251f4d6857fb34ddf1c25b21b37 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <lautrbach@redhat.com>
+Date: Wed, 3 May 2023 09:35:28 +0200
+Subject: [PATCH] Always reset pending alarms when alarm(0)
+Content-type: text/plain
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2112573
+
+Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
+---
+ src/setroubleshoot/server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setroubleshoot/server.py b/src/setroubleshoot/server.py
+index fd89a5448912..2b1b0b1c30d0 100755
+--- a/src/setroubleshoot/server.py
++++ b/src/setroubleshoot/server.py
+@@ -703,7 +703,7 @@ Deletes an alert from the database.
+         return ""
+ 
+     def alarm(self, timeout=10):
+-        if self.conn_ctr == 0:
++        if self.conn_ctr == 0 or timeout == 0:
+             signal.alarm(timeout)
+ 
+ 
+-- 
+2.41.0
+

0003-gitlab-ci-use-apt-get-to-install-python3-dbus-packag.patch

@@ -0,0 +1,52 @@
+From 502d06c8fa86b53198a2f4aeb59efdf1203531d6 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <lautrbach@redhat.com>
+Date: Wed, 3 May 2023 10:17:06 +0200
+Subject: [PATCH] gitlab-ci: use apt-get to install python3-dbus package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Content-type: text/plain
+
+Fixes:
+$ pip3 install dasbus
+error: externally-managed-environment
+× This environment is externally managed
+╰─> To install Python packages system-wide, try apt install
+    python3-xyz, where xyz is the package you are trying to
+    install.
+
+    If you wish to install a non-Debian-packaged Python package,
+    create a virtual environment using python3 -m venv path/to/venv.
+    Then use path/to/venv/bin/python and path/to/venv/bin/pip. Make
+    sure you have python3-full installed.
+
+    If you wish to install a non-Debian packaged Python application,
+    it may be easiest to use pipx install xyz, which will manage a
+    virtual environment for you. Make sure you have pipx installed.
+
+    See /usr/share/doc/python3.11/README.venv for more information.
+note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
+hint: See PEP 668 for the detailed specification.
+
+Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
+---
+ .gitlab-ci.yml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index e82e12f66737..bea5081bb0b9 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -30,8 +30,7 @@ build:debian:
+     - >
+       apt-get -y install autoconf automake libglib2.0-dev libdbus-glib-1-dev libnotify-dev
+       libgtk-3-dev gcc python3-selinux python3-gi python3-dbus python3-six python3-sepolicy
+-      xdg-utils make intltool libaudit-dev libauparse-dev python3-pip
+-    - pip3 install dasbus
++      xdg-utils make intltool libaudit-dev libauparse-dev python3-pip python3-dasbus
+     - ./autogen.sh
+     - make
+     - make install
+-- 
+2.41.0
+

setroubleshoot.spec

@@ -4,7 +4,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 3.3.32
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL-2.0-or-later
 URL: https://gitlab.com/setroubleshoot/setroubleshoot
 Source0: https://gitlab.com/setroubleshoot/setroubleshoot/-/archive/%{version}/setroubleshoot-%{version}.tar.gz
@@ -13,6 +13,8 @@ Source2: %{name}.sysusers
 # git format-patch -N 3.3.32
 # i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
 Patch0001: 0001-imp-module-is-deprecated-in-favor-of-importlib.patch
+Patch0002: 0002-Always-reset-pending-alarms-when-alarm-0.patch
+Patch0003: 0003-gitlab-ci-use-apt-get-to-install-python3-dbus-packag.patch
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: libcap-ng-devel
@@ -192,6 +194,9 @@ to user preference. The same tools can be run on existing log files.
 %doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO
 
 %changelog
+* Tue Jul 25 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.3.32-7
+- Always reset pending alarms when alarm(0) (rhbz#2112573)
+
 * Tue Jul 25 2023 Petr Lautrbach <lautrbach@redhat.com> - 3.3.32-6
 - 'imp' module is deprecated in favor of 'importlib' (rhbz#2224393)