Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package setroubleshoot for openSUSE:Factory checked in at 2026-01-28 15:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/setroubleshoot (Old) and /work/SRC/openSUSE:Factory/.setroubleshoot.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "setroubleshoot" Wed Jan 28 15:06:57 2026 rev:11 rq:1329280 version:3.3.36 Changes: -------- --- /work/SRC/openSUSE:Factory/setroubleshoot/setroubleshoot.changes 2025-12-01 11:11:42.174399159 +0100 +++ /work/SRC/openSUSE:Factory/.setroubleshoot.new.1928/setroubleshoot.changes 2026-01-28 15:07:39.867292521 +0100 @@ -1,0 +2,10 @@ +Mon Jan 19 17:02:00 UTC 2026 - Zdenek Kubala <[email protected]> + +- Add patch sealert_add_dependency_error_handling.patch to address + setroubleshoot-server gui dependency to setroubleshoot (bsc#1237302) +- Update to version 3.3.36 + * audit_data: include syslog when needed + * Rename appdata to metainfo + * Replace python-six with python 3 only code + +------------------------------------------------------------------- Old: ---- setroubleshoot-3.3.35.tar.bz2 New: ---- _service sealert_add_dependency_error_handling.patch setroubleshoot-3.3.36.tar.bz2 ----------(New B)---------- New: - Add patch sealert_add_dependency_error_handling.patch to address setroubleshoot-server gui dependency to setroubleshoot (bsc#1237302) ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setroubleshoot.spec ++++++ --- /var/tmp/diff_new_pack.UjKJUV/_old 2026-01-28 15:07:40.759329574 +0100 +++ /var/tmp/diff_new_pack.UjKJUV/_new 2026-01-28 15:07:40.771330072 +0100 @@ -1,7 +1,7 @@ # # spec file for package setroubleshoot # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2006-2024 Red Hat, Inc. # # All modifications and additions to the file contributed by third parties @@ -24,7 +24,7 @@ License: GPL-2.0-or-later Group: Productivity/Security Name: setroubleshoot -Version: 3.3.35 +Version: 3.3.36 Release: 0 URL: https://gitlab.com/setroubleshoot/setroubleshoot Source0: https://gitlab.com/setroubleshoot/setroubleshoot/-/archive/%{version}/setroubleshoot-%{version}.tar.bz2 @@ -34,6 +34,7 @@ Patch0: setroubleshoot-desktop.patch Patch1: remove-pip-from-makefile.patch Patch2: disable-send-bug-report-button.patch +Patch3: sealert_add_dependency_error_handling.patch # git format-patch -N 3.3.30 # i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done BuildRequires: autoconf @@ -102,9 +103,9 @@ %config(noreplace) %{_sysconfdir}/xdg/autostart/* %{_datadir}/applications/*.desktop %if 0%{?suse_version} -%{_datadir}/metainfo/org.fedoraproject.setroubleshoot.appdata.xml +%{_datadir}/metainfo/org.fedoraproject.setroubleshoot.metainfo.xml %else -%{_metainfodir}/*.appdata.xml +%{_metainfodir}/*.metainfo.xml %endif %{_datadir}/dbus-1/services/org.fedoraproject.sealert.service %{_datadir}/icons/hicolor/*/*/* @@ -183,7 +184,6 @@ Requires: python3-libxml2 Requires: python3-rpm Requires: python3-selinux >= 2.1.5-1 -Requires: python3-six Requires: python3-systemd >= 206-1 BuildRequires: gettext BuildRequires: intltool @@ -206,7 +206,7 @@ %post server %if 0%{?suse_version} %tmpfiles_create %{_tmpfilesdir}/setroubleshoot.conf -/usr/bin/systemctl try-reload-or-restart auditd.service >/dev/null 2>&1 || : #bsc1237388 +/usr/bin/systemctl try-reload-or-restart auditd.service >/dev/null 2>&1 || : bsc#1237388 %else /sbin/service auditd reload >/dev/null 2>&1 || : %endif @@ -214,7 +214,7 @@ %postun server %if 0%{?suse_version} -/usr/bin/systemctl try-reload-or-restart auditd.service >/dev/null 2>&1 || : #bsc1237388 +/usr/bin/systemctl try-reload-or-restart auditd.service >/dev/null 2>&1 || : bsc#1237388 %else /sbin/service auditd reload >/dev/null 2>&1 || : %endif ++++++ _service ++++++ <services> <service name="download_files" mode="localonly"/> </services> ++++++ sealert_add_dependency_error_handling.patch ++++++ Index: setroubleshoot-3.3.35/src/sealert =================================================================== --- sealert 2024-11-26 14:18:39.000000000 +0100 +++ sealert_new 2025-10-29 14:57:44.916138138 +0100 @@ -382,6 +382,15 @@ syslog.syslog(syslog.LOG_ERR, e.strerror) sys.exit(1) + except ImportError as e: + # Handle ImportError of setroubleshoot.browser when not available + # (e.g. no gui) + syslog.syslog(syslog.LOG_ERR, "exception %s: %s" % (e.__class__.__name__, str(e))) + print ("This feature requires setroubleshoot package installed on the system.", file=sys.stderr) + sys.exit(1) + + + def finish(self): if self.setroubleshootd_dbus is not None: self.setroubleshootd_dbus.finish() ~ ++++++ setroubleshoot-3.3.35.tar.bz2 -> setroubleshoot-3.3.36.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/.gitlab-ci.yml new/setroubleshoot-3.3.36/.gitlab-ci.yml --- old/setroubleshoot-3.3.35/.gitlab-ci.yml 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/.gitlab-ci.yml 2025-12-10 08:59:16.000000000 +0100 @@ -29,7 +29,7 @@ - apt-get update - > 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 + libgtk-3-dev gcc python3-selinux python3-gi python3-dbus python3-sepolicy xdg-utils make intltool libaudit-dev libauparse-dev python3-pip python3-dasbus python3-setuptools - ./autogen.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/Makefile.am new/setroubleshoot-3.3.36/Makefile.am --- old/setroubleshoot-3.3.35/Makefile.am 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/Makefile.am 2025-12-10 08:59:16.000000000 +0100 @@ -5,8 +5,8 @@ desktop_in_files = setroubleshoot.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -appdatadir = $(datadir)/metainfo -appdata_DATA = org.fedoraproject.setroubleshoot.appdata.xml +metainfodir = $(datadir)/metainfo +metainfo_DATA = org.fedoraproject.setroubleshoot.metainfo.xml dbus_sessiondir = $(datadir)/dbus-1/services dbus_session_DATA = org.fedoraproject.sealert.service @@ -45,7 +45,7 @@ $(dbus_system_DATA) \ $(polkit_system_DATA) \ $(systemd_systemunit_DATA) \ - $(appdata_DATA) \ + $(metainfo_DATA) \ DBUS.md \ $(NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/NEWS new/setroubleshoot-3.3.36/NEWS --- old/setroubleshoot-3.3.35/NEWS 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/NEWS 2025-12-10 08:59:16.000000000 +0100 @@ -1,3 +1,8 @@ +setroubleshoot 3.3.36 2025-12-10 + - audit_data: include syslog when needed + - Rename appdata to metainfo + - Replace python-six with python 3 only code + setroubleshoot 3.3.35 2024-11-26 - Adjust seapplet notification to desktop file - Fix icon file name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/configure.ac new/setroubleshoot-3.3.36/configure.ac --- old/setroubleshoot-3.3.35/configure.ac 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/configure.ac 2025-12-10 08:59:16.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([setroubleshoot], [3.3.35], +AC_INIT([setroubleshoot], [3.3.36], [http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=setroubleshoot]) AC_CONFIG_SRCDIR(src/setroubleshoot/__init__.py) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/org.fedoraproject.setroubleshoot.appdata.xml new/setroubleshoot-3.3.36/org.fedoraproject.setroubleshoot.appdata.xml --- old/setroubleshoot-3.3.35/org.fedoraproject.setroubleshoot.appdata.xml 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/org.fedoraproject.setroubleshoot.appdata.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2014 Ryan Lerch <[email protected]> --> -<!-- -BugReportURL: https://fedorahosted.org/setroubleshoot/ticket/14 -SentUpstream: 2014-07-02 ---> -<component type="desktop-application"> - <id>org.fedoraproject.setroubleshoot</id> - <name>SELinux Troubleshooter</name> - <developer_name>Red Hat, Inc.</developer_name> - <project_license>GPL-2.0</project_license> - <metadata_license>CC0-1.0</metadata_license> - <launchable type="desktop-id">setroubleshoot.desktop</launchable> - <summary>Troubleshoot SELinux policy and access denials</summary> - <description> - <p> - The SELinux Troubleshooter provides a graphical user interface to help - diagnose SELinux policy issues. - When Access Vector Cache (AVC) denial messages are logged by SELinux, - the SELinux Troubleshooter generates a desktop notification containing - information about the problem and allows the user to launch the - troubleshooting interface to help track down the cause of the denial. - </p> - </description> - <url type="homepage">https://pagure.io/setroubleshoot/</url> - <screenshots> - <screenshot type="default"> - <caption>Example alert window</caption> - <image>https://docs.pagure.org/setroubleshoot/setroubleshoot.png</image> - </screenshot> - </screenshots> - <update_contact>[email protected]</update_contact> - <content_rating type="oars-1.1"/> -</component> - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/org.fedoraproject.setroubleshoot.metainfo.xml new/setroubleshoot-3.3.36/org.fedoraproject.setroubleshoot.metainfo.xml --- old/setroubleshoot-3.3.35/org.fedoraproject.setroubleshoot.metainfo.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/setroubleshoot-3.3.36/org.fedoraproject.setroubleshoot.metainfo.xml 2025-12-10 08:59:16.000000000 +0100 @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2014 Ryan Lerch <[email protected]> --> +<!-- +BugReportURL: https://fedorahosted.org/setroubleshoot/ticket/14 +SentUpstream: 2014-07-02 +--> +<component type="desktop-application"> + <id>org.fedoraproject.setroubleshoot</id> + <name>SELinux Troubleshooter</name> + <developer_name>Red Hat, Inc.</developer_name> + <project_license>GPL-2.0</project_license> + <metadata_license>CC0-1.0</metadata_license> + <launchable type="desktop-id">setroubleshoot.desktop</launchable> + <summary>Troubleshoot SELinux policy and access denials</summary> + <description> + <p> + The SELinux Troubleshooter provides a graphical user interface to help + diagnose SELinux policy issues. + When Access Vector Cache (AVC) denial messages are logged by SELinux, + the SELinux Troubleshooter generates a desktop notification containing + information about the problem and allows the user to launch the + troubleshooting interface to help track down the cause of the denial. + </p> + </description> + <url type="homepage">https://pagure.io/setroubleshoot/</url> + <screenshots> + <screenshot type="default"> + <caption>Example alert window</caption> + <image>https://docs.pagure.org/setroubleshoot/setroubleshoot.png</image> + </screenshot> + </screenshots> + <update_contact>[email protected]</update_contact> + <content_rating type="oars-1.1"/> +</component> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/audit_data.py new/setroubleshoot-3.3.36/src/setroubleshoot/audit_data.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/audit_data.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/audit_data.py 2025-12-10 08:59:16.000000000 +0100 @@ -1,6 +1,4 @@ from __future__ import absolute_import -import six -from six.moves import range import sys # Authors: John Dennis <[email protected]> # Thomas Liu <[email protected] @@ -34,7 +32,6 @@ 'compute_avcs', ] -import six import audit import struct import os @@ -163,7 +160,7 @@ def __init__(self, data): super(AvcContext, self).__init__() - if isinstance(data, six.string_types): + if isinstance(data, str): fields = data.split(':') if len(fields) >= 3: self.user = fields[0] @@ -1105,6 +1102,7 @@ try: avcs.append(AVC(audit_event, record)) except AVCError as e: + import syslog syslog.syslog(syslog.LOG_ERR, "%s" % e) except Exception as e: import syslog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/avc_audit.py new/setroubleshoot-3.3.36/src/setroubleshoot/avc_audit.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/avc_audit.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/avc_audit.py 2025-12-10 08:59:16.000000000 +0100 @@ -32,7 +32,7 @@ import selinux import socket as Socket import fcntl -from six.moves import _thread +import _thread import threading import time from functools import cmp_to_key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/browser.py new/setroubleshoot-3.3.36/src/setroubleshoot/browser.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/browser.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/browser.py 2025-12-10 08:59:16.000000000 +0100 @@ -25,7 +25,6 @@ from subprocess import * from gettext import ngettext as P_ from setroubleshoot.config import parse_config_setting, get_config -import six import sys domain = get_config('general', 'i18n_text_domain') localedir = get_config('general', 'i18n_locale_dir') @@ -51,7 +50,7 @@ import sys import os from xml.dom import minidom -from six.moves.xmlrpc_client import ProtocolError +from xmlrpc.client import ProtocolError import gi gi.require_version('Gdk', '3.0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/rpc.py new/setroubleshoot-3.3.36/src/setroubleshoot/rpc.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/rpc.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/rpc.py 2025-12-10 08:59:16.000000000 +0100 @@ -19,7 +19,6 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import six import libxml2 import re import syslog @@ -576,7 +575,7 @@ @staticmethod def map_family(family): - if isinstance(family, six.string_types): + if isinstance(family, str): family = family.lower() family = {'unix': Socket.AF_UNIX, 'inet': Socket.AF_INET}.get(family) return family diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/server.py new/setroubleshoot-3.3.36/src/setroubleshoot/server.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/server.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/server.py 2025-12-10 08:59:16.000000000 +0100 @@ -828,8 +828,8 @@ alert_receiver = TestPluginReportReceiver(host_database) # Create a synchronized queue for analysis requests - import six.moves.queue - analysis_queue = six.moves.queue.Queue(0) + import queue + analysis_queue = queue.Queue(0) # Create a thread to perform analysis, it takes AVC objects off # the analysis queue and runs the plugins against the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/serverconnection.py new/setroubleshoot-3.3.36/src/setroubleshoot/serverconnection.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/serverconnection.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/serverconnection.py 2025-12-10 08:59:16.000000000 +0100 @@ -9,7 +9,6 @@ import errno as Errno import gettext import os -import six.moves.queue import re import signal import selinux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/signature.py new/setroubleshoot-3.3.36/src/setroubleshoot/signature.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/signature.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/signature.py 2025-12-10 08:59:16.000000000 +0100 @@ -21,10 +21,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import six import syslog from subprocess import * -from six.moves import range from functools import cmp_to_key import gettext from setroubleshoot.config import parse_config_setting, get_config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/util.py new/setroubleshoot-3.3.36/src/setroubleshoot/util.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/util.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/util.py 2025-12-10 08:59:16.000000000 +0100 @@ -1,5 +1,4 @@ from __future__ import absolute_import -from six.moves import range # Authors: John Dennis <[email protected]> # # Copyright (C) 2006,2007,2008 Red Hat, Inc. @@ -69,7 +68,6 @@ ] import bz2 -import six import datetime from dasbus.connection import SystemMessageBus import glob @@ -256,7 +254,7 @@ def fmt_obj(obj): - if isinstance(obj, six.string_types): + if isinstance(obj, str): return obj elif isinstance(obj, (list, tuple)): return "[" + " ".join(["%s" % fmt_obj(x) for x in obj]) + "]" @@ -978,7 +976,7 @@ def __init__(self, t=None): if t is None: self._dt = self.now(local=False) - elif isinstance(t, six.string_types): + elif isinstance(t, str): self.parse(t) elif isinstance(t, float): self._dt = datetime.datetime.fromtimestamp(t, self.utc_tz) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setroubleshoot/xml_serialize.py new/setroubleshoot-3.3.36/src/setroubleshoot/xml_serialize.py --- old/setroubleshoot-3.3.35/src/setroubleshoot/xml_serialize.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setroubleshoot/xml_serialize.py 2025-12-10 08:59:16.000000000 +0100 @@ -50,7 +50,6 @@ from setroubleshoot.errcode import * from setroubleshoot.util import * -from six import add_metaclass, string_types #------------------------------------------------------------------------ @@ -79,7 +78,7 @@ 'convert value to bool' if isinstance(value, bool): return value - elif isinstance(value, string_types): + elif isinstance(value, str): value = value.lower() if value in ('t', 'true', '1'): return True @@ -228,8 +227,7 @@ cls._names.sort() -@add_metaclass(XmlSerializeMetaData) -class XmlSerialize(object): +class XmlSerialize(object, metaclass=XmlSerializeMetaData): def __init__(self): self._init_defaults() @@ -316,7 +314,7 @@ need_to_close = False if f is None: f = sys.stdout - elif isinstance(f, string_types): + elif isinstance(f, str): f = open(f, "w") need_to_close = True elif isinstance(f, FileType): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setroubleshoot-3.3.35/src/setup.py new/setroubleshoot-3.3.36/src/setup.py --- old/setroubleshoot-3.3.35/src/setup.py 2024-11-26 14:18:39.000000000 +0100 +++ new/setroubleshoot-3.3.36/src/setup.py 2025-12-10 08:59:16.000000000 +0100 @@ -5,7 +5,7 @@ setup(name="setroubleshoot", - version="3.3.33", + version="3.3.36", description="Python SELinux Troubleshooter", author="Dan Walsh", author_email="[email protected]", url='https://gitlab.com/setroubleshoot/setroubleshoot/',
