Update to 4.10.0-4

Resolves: RHEL-112413

Signed-off-by: Jan Jansky <jjansky@redhat.com>

0005-cleaner-rhel8.patch

@@ -0,0 +1,36 @@
+--- a/sos/cleaner/archives/__init__.py	2025-09-22 19:44:51.272619200 +0200
++++ b/sos/cleaner/archives/__init__.py	2025-09-22 23:28:15.116001268 +0200
+@@ -118,6 +118,8 @@ class SoSObfuscationArchive():
+         self.parsers = parsers  # TODO: include this in __init__?
+ 
+     def load_parser_entries(self):
++        self.soslog = logging.getLogger('sos')
++        self.ui_log = logging.getLogger('sos_ui')
+         for parser in self.parsers:
+             parser.load_map_entries()
+ 
+@@ -150,6 +152,7 @@ class SoSObfuscationArchive():
+         return line, count
+ 
+     def obfuscate_arc_files(self, flist):
++        self.load_parser_entries()
+         for filename in flist:
+             self.log_debug(f"    pid={os.getpid()}: obfuscating {filename}")
+             try:
+--- a/sos/cleaner/__init__.py	2025-09-22 19:44:51.272619200 +0200
++++ b/sos/cleaner/__init__.py	2025-09-22 23:32:17.606745778 +0200
+@@ -720,10 +720,11 @@ third party.
+             # based on files' sizes.
+ 
+             files_obfuscated_count = total_sub_count = removed_file_count = 0
++            # two nullification required before processes cloning
++            archive.soslog = None
++            archive.ui_log = None
+             archive_list = [archive for i in range(self.opts.jobs)]
+-            with ProcessPoolExecutor(
+-                    max_workers=self.opts.jobs,
+-                    initializer=archive.load_parser_entries) as executor:
++            with ProcessPoolExecutor(max_workers=self.opts.jobs) as executor:
+                 futures = executor.map(obfuscate_arc_files, archive_list,
+                                        [file_list[i::self.opts.jobs] for i in
+                                         range(self.opts.jobs)])

sos.spec

@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.10.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -28,6 +28,7 @@ Patch3: 0001-cleaner-Make-cleaner-s-obfuscate_file-properly-worki.patch
 Patch4: 0002-openstack_nova-Improve-scrubbing.patch
 Patch5: 0003-component-Fix-regression-57bbc89-in-toolbox-containe.patch
 Patch6: 0004-revert-PR4092.patch
+Patch7: 0005-cleaner-rhel8.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -44,6 +45,7 @@ support technicians and developers.
 %patch -P 4 -p1
 %patch -P 5 -p1
 %patch -P 6 -p1
+%patch -P 7 -p1
 
 %build
 %py3_build
@@ -116,6 +118,10 @@ of the system. Currently storage and filesystem commands are audited.
 %license LICENSE
 
 %changelog
+* Tue Sep 23 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-4
+- Update to 4.10.0-4
+  Resolves: RHEL-112413
+
 * Wed Sep 17 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-2
 - Update to 4.10.0-2
   Resolves: RHEL-112413