Compare commits
1 Commits
changed/a8
...
c8
| Author | SHA1 | Date |
|---|---|---|
 eabdullin
|
8e4ba32c9a |
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/sos-4.7.0.tar.gz
|
||||
SOURCES/sos-4.7.1.tar.gz
|
||||
SOURCES/sos-audit-0.3.tgz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
7d1629848263be2d613983fb15cd418dccdf1c76 SOURCES/sos-4.7.0.tar.gz
|
||||
9ced981872d308e13c5dc47fee21071592ceefc2 SOURCES/sos-4.7.1.tar.gz
|
||||
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):
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff -aruN sos-4.7.0/sos/policies/distros/redhat.py sos-4.7.0.alma/sos/policies/distros/redhat.py
|
||||
--- sos-4.7.0/sos/policies/distros/redhat.py 2024-02-20 03:39:46
|
||||
+++ sos-4.7.0.alma/sos/policies/distros/redhat.py 2024-04-10 08:58:53
|
||||
@@ -495,6 +495,15 @@
|
||||
vendor_urls = [('Community Website', 'https://www.centos.org/')]
|
||||
|
||||
|
||||
+class AlmaLinuxPolicy(RHELPolicy):
|
||||
+ distro = "AlmaLinux"
|
||||
+ vendor = "AlmaLinux OS Foundation"
|
||||
+ vendor_urls = [
|
||||
+ ('Distribution Website', 'https://www.almalinux.org/'),
|
||||
+ ('Commercial Support', 'https://tuxcare.com/linux-support-services/')
|
||||
+ ]
|
||||
+
|
||||
+
|
||||
class RedHatCoreOSPolicy(RHELPolicy):
|
||||
"""
|
||||
Red Hat CoreOS is a containerized host built upon Red Hat Enterprise Linux
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Summary: A set of tools to gather troubleshooting information from a system
|
||||
Name: sos
|
||||
Version: 4.7.0
|
||||
Release: 1%{?dist}.alma.1
|
||||
Version: 4.7.1
|
||||
Release: 2%{?dist}
|
||||
Group: Applications/System
|
||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||
Source1: sos-audit-%{auditversion}.tgz
|
||||
|
|
@ -22,9 +22,7 @@ Recommends: python3-pexpect
|
|||
Recommends: python3-pyyaml
|
||||
Conflicts: vdsm < 4.40
|
||||
Obsoletes: sos-collector
|
||||
|
||||
# AlmaLinux patches
|
||||
Patch1000: sos-almalinux-branding.patch
|
||||
Patch1: sos-RHEL-35945-sos-clean-on-archive.patch
|
||||
|
||||
%description
|
||||
Sos is a set of tools that gathers information about system
|
||||
|
|
@ -35,12 +33,11 @@ support technicians and developers.
|
|||
%prep
|
||||
%setup -qn %{name}-%{version}
|
||||
%setup -T -D -a1 -q
|
||||
%patch1 -p1
|
||||
|
||||
# AlmaLinux patches
|
||||
%patch1000 -p1
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
%py3_install '--install-scripts=%{_sbindir}'
|
||||
|
|
@ -110,8 +107,13 @@ of the system. Currently storage and filesystem commands are audited.
|
|||
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
||||
|
||||
%changelog
|
||||
* Wed Apr 10 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-1.alma.1
|
||||
- Debrand for AlmaLinux
|
||||
* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-2
|
||||
- [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
|
||||
|
|
@ -142,11 +144,13 @@ of the system. Currently storage and filesystem commands are audited.
|
|||
* 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
|
||||
|
|
@ -172,6 +176,7 @@ of the system. Currently storage and filesystem commands are audited.
|
|||
Resolves: bz2177282
|
||||
- [virsh] Scrub passwords in virt-manager logs
|
||||
Resolves: bz2184062
|
||||
|
||||
* Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
|
||||
- Rebase on upstream 4.5.1
|
||||
Resolves: bz2175806
|
||||
|
|
@ -183,6 +188,7 @@ of the system. Currently storage and filesystem commands are audited.
|
|||
Resolves: bz2176086
|
||||
- [cleaner] dont clean sys_tmp from final_path
|
||||
Resolves: bz2176218
|
||||
|
||||
* Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
|
||||
- Rebase on upstream 4.5.0
|
||||
Resolves: bz2082614
|
||||
|
|
|
|||
Loading…
Reference in New Issue