Compare commits
9 Commits
changed/a8
...
c8
Author | SHA1 | Date |
---|---|---|
eabdullin | a38c3757d0 | |
eabdullin | 8e4ba32c9a | |
eabdullin | 2b6c5de85d | |
eabdullin | cce1af82c4 | |
eabdullin | 157c2d14d2 | |
eabdullin | 61cc2ee9bf | |
eabdullin | e3bb8bf563 | |
Andrew Lukoshko | fb09e4e130 | |
Andrew Lukoshko | d3882c8950 |
|
@ -1,2 +1,2 @@
|
||||||
SOURCES/sos-4.5.3.tar.gz
|
SOURCES/sos-4.7.1.tar.gz
|
||||||
SOURCES/sos-audit-0.3.tgz
|
SOURCES/sos-audit-0.3.tgz
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
eec8ce79aa42dd6561bce9638c8e803e9f81e476 SOURCES/sos-4.5.3.tar.gz
|
9ced981872d308e13c5dc47fee21071592ceefc2 SOURCES/sos-4.7.1.tar.gz
|
||||||
9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz
|
9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
From a0c2586e230c9600d3d3f70ab89c9f6eb52ed3ed Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
Date: Tue, 23 Apr 2024 11:00:11 +0200
|
||||||
|
Subject: [PATCH] [archive] Fix get_archive_root after files reordering
|
||||||
|
|
||||||
|
Commit d5d8c21 reordered files in the archive, such that the first
|
||||||
|
member is not the archive root directory further more. Let change the
|
||||||
|
get_archive_root method accordingly to prevent self.archive_root being
|
||||||
|
empty.
|
||||||
|
|
||||||
|
Resolves: #3616
|
||||||
|
|
||||||
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
---
|
||||||
|
sos/cleaner/archives/__init__.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sos/cleaner/archives/__init__.py b/sos/cleaner/archives/__init__.py
|
||||||
|
index f7c5eb587..0fa1ef43f 100644
|
||||||
|
--- a/sos/cleaner/archives/__init__.py
|
||||||
|
+++ b/sos/cleaner/archives/__init__.py
|
||||||
|
@@ -104,7 +104,7 @@ def get_archive_root(self):
|
||||||
|
if toplevel.isdir():
|
||||||
|
return toplevel.name
|
||||||
|
else:
|
||||||
|
- return os.sep
|
||||||
|
+ return os.path.dirname(toplevel.name) or os.sep
|
||||||
|
return os.path.abspath(self.archive_path)
|
||||||
|
|
||||||
|
def report_msg(self, msg):
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
Summary: A set of tools to gather troubleshooting information from a system
|
Summary: A set of tools to gather troubleshooting information from a system
|
||||||
Name: sos
|
Name: sos
|
||||||
Version: 4.5.3
|
Version: 4.7.1
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||||
Source1: sos-audit-%{auditversion}.tgz
|
Source1: sos-audit-%{auditversion}.tgz
|
||||||
|
@ -16,12 +16,13 @@ BuildRequires: python3-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
Requires: python3-requests
|
Requires: python3-requests
|
||||||
|
Requires: python3-setuptools
|
||||||
Recommends: python3-magic
|
Recommends: python3-magic
|
||||||
Recommends: python3-pexpect
|
Recommends: python3-pexpect
|
||||||
Recommends: python3-pyyaml
|
Recommends: python3-pyyaml
|
||||||
Conflicts: vdsm < 4.40
|
Conflicts: vdsm < 4.40
|
||||||
Obsoletes: sos-collector
|
Obsoletes: sos-collector
|
||||||
|
Patch1: sos-RHEL-35945-sos-clean-on-archive.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Sos is a set of tools that gathers information about system
|
Sos is a set of tools that gathers information about system
|
||||||
|
@ -32,10 +33,11 @@ support technicians and developers.
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}
|
%setup -qn %{name}-%{version}
|
||||||
%setup -T -D -a1 -q
|
%setup -T -D -a1 -q
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%py3_install '--install-scripts=%{_sbindir}'
|
%py3_install '--install-scripts=%{_sbindir}'
|
||||||
|
@ -105,6 +107,68 @@ of the system. Currently storage and filesystem commands are audited.
|
||||||
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
|
||||||
|
- [archive] Fix get_archive_root after files reordering
|
||||||
|
Resolves: RHEL-35945
|
||||||
|
|
||||||
|
* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
|
||||||
|
- rebase to upstream 4.7.1
|
||||||
|
Resolves: RHEL-32104
|
||||||
|
|
||||||
|
* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
|
||||||
|
- rebase to upstream 4.7.0
|
||||||
|
Resolves: RHEL-26111
|
||||||
|
|
||||||
|
* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
|
||||||
|
- rebase to upstream 4.6.1
|
||||||
|
Resolves: RHEL-21173
|
||||||
|
- [redhat] Change authentication method for RHEL
|
||||||
|
Resolves: RHEL-21177
|
||||||
|
|
||||||
|
* Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
|
||||||
|
[pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
|
||||||
|
Resolves: RHEL-13697
|
||||||
|
|
||||||
|
* Tue Oct 17 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-4
|
||||||
|
- [pulp] Fix dynaconf obfuscation and add AUTH_LDAP_BIND_PASSWORD
|
||||||
|
Resolves: RHEL-13697
|
||||||
|
|
||||||
|
* Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
|
||||||
|
- [openshift_ovn] Collect additional ovnkube node logs
|
||||||
|
Resolves: SUPDEV145
|
||||||
|
|
||||||
|
* Wed Aug 23 2023 Jan Jansky <jjansky@redhat.com> = 4.6.0-1
|
||||||
|
- [cleaner] Use data filter for extraction
|
||||||
|
Resolves: bz2218873
|
||||||
|
|
||||||
|
* Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
|
||||||
|
- Rebase sos to 4.5.6
|
||||||
|
Resolves: bz2226724
|
||||||
|
|
||||||
|
* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-2
|
||||||
|
- Adding patch for mac obfuscation
|
||||||
|
Resolves: bz2218279
|
||||||
|
Resolves: bz2216608
|
||||||
|
Resolves: bz2207562
|
||||||
|
|
||||||
|
* Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
|
||||||
|
- [clean] Respect permissions of sanitised files
|
||||||
|
Resolves: bz2218279
|
||||||
|
- [plugin] Fix exception when calling os.makedirs
|
||||||
|
Resolves: bz2216608
|
||||||
|
- [cleaner] Enhance trailing characters list after AMC address
|
||||||
|
Resolves: bz2207562
|
||||||
|
|
||||||
|
* Thu Jun 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
|
||||||
|
- [plugins] collect strings before commands
|
||||||
|
Resolves: bz2203141
|
||||||
|
- [collector] collect report from primary node if in node_list
|
||||||
|
Resolves: bz2186460
|
||||||
|
- [powerpc] collect invscout logs
|
||||||
|
Resolves: bz2210543
|
||||||
|
- [rhc] New plugin for RHC
|
||||||
|
Resolves: bz2196649
|
||||||
|
|
||||||
* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
|
* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
|
||||||
- [report] Ignore case when scrubbing via do_file_sub
|
- [report] Ignore case when scrubbing via do_file_sub
|
||||||
Resolves: bz2143272
|
Resolves: bz2143272
|
||||||
|
|
Loading…
Reference in New Issue