From eac458ffc4b6a9e4eb26506da668a41f635b1dde Mon Sep 17 00:00:00 2001
From: Jan Jansky <jjansky@redhat.com>
Date: Thu, 26 Feb 2026 13:51:36 +0100
Subject: [PATCH] Update to 4.10.2-2

Resolves: RHEL-152468

Signed-off-by: Jan Jansky <jjansky@redhat.com>
---
 0004-revert-PR4092.patch | 49 ++++++++++++++++++++++++++++++++++++++++
 sos.spec                 |  8 ++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 0004-revert-PR4092.patch

diff --git a/0004-revert-PR4092.patch b/0004-revert-PR4092.patch
new file mode 100644
index 0000000..04539d0
--- /dev/null
+++ b/0004-revert-PR4092.patch
@@ -0,0 +1,49 @@
+--- a/sos/upload/targets/__init__.py	2025-09-16 19:57:27.294642506 +0200
++++ b/sos/upload/targets/__init__.py	2025-09-16 19:59:44.498573843 +0200
+@@ -465,7 +465,7 @@
+                 self.upload_password or
+                 self._upload_password)
+ 
+-    def upload_sftp(self, user=None, password=None, user_dir=None):
++    def upload_sftp(self, user=None, password=None):
+         """Attempts to upload the archive to an SFTP location.
+ 
+         Due to the lack of well maintained, secure, and generally widespread
+@@ -540,13 +540,10 @@
+             raise Exception("Unable to connect via SFTP to "
+                             f"{self.get_upload_url_string()}")
+ 
+-        # certain implementations require file to be put in the user dir
+-        put_cmd = (
+-            f"put {self.upload_archive_name} "
+-            f"{f'{user_dir}/' if user_dir else ''}"
+-            f"{self._get_sftp_upload_name()}"
+-        )
++        put_cmd = (f'put {self.upload_archive_name} '
++                   f'{self._get_sftp_upload_name()}')
+         ret.sendline(put_cmd)
++
+         put_expects = [
+             '100%',
+             pexpect.TIMEOUT,
+--- a/sos/upload/targets/redhat.py	2025-09-16 19:57:36.804628207 +0200
++++ b/sos/upload/targets/redhat.py	2025-09-16 20:00:52.578728154 +0200
+@@ -145,7 +145,7 @@
+         return fname
+ 
+     # pylint: disable=too-many-branches
+-    def upload_sftp(self, user=None, password=None, user_dir=None):
++    def upload_sftp(self, user=None, password=None):    
+         """Override the base upload_sftp to allow for setting an on-demand
+         generated anonymous login for the RH SFTP server if a username and
+         password are not given
+@@ -217,8 +217,7 @@
+                     f"{anon.status_code}): {anon.json()}"
+                 )
+         if _user and _token:
+-            return super().upload_sftp(user=_user, password=_token,
+-                                       user_dir=_user)
++            return super().upload_sftp(user=_user, password=_token)
+         raise Exception("Could not retrieve valid or anonymous credentials")
+ 
+     def check_file_too_big(self, archive):
diff --git a/sos.spec b/sos.spec
index 35f679d..0c5213c 100644
--- a/sos.spec
+++ b/sos.spec
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -25,6 +25,7 @@ Obsoletes: sos-collector <= 1.9
 Patch1: 0001-gcp-Catch-exceptions-when-PRODUCT_PATH-doesnt-exist.patch
 Patch2: 0002-aap_containerized-Carry-forward-postproc-from-other.patch
 Patch3: 0003-cleaner-Update-filename-after-converting-pem-to-text.patch
+Patch4: 0004-revert-PR4092.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -38,6 +39,7 @@ support technicians and developers.
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
+%patch -P 4 -p1
 
 %build
 %py3_build
@@ -109,6 +111,10 @@ of the system.  Currently storage and filesystem commands are audited.
 
 
 %changelog
+* Thu Feb 26 2026 Jan Jansky <jjansky@redhat.com> = 4.10.2-2
+- Update to 4.10.2-2
+  Resolves: RHEL-152468
+
 * Thu Jan 22 2026 Jan Jansky <jjansky@redhat.com> = 4.10.2-1
 - Update to 4.10.2-1 
   Resolves: RHEL-142629