import oscap-anaconda-addon-1.1.1-7.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
1a641713ae
commit
88544c93b2
2622
SOURCES/lang.patch
2622
SOURCES/lang.patch
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,25 @@
|
|||
From 316d1fdd46e962c2eca32dde8b6d391286bd3d28 Mon Sep 17 00:00:00 2001
|
||||
From: Masahiro Matsuya <mmatsuya@redhat.com>
|
||||
Date: Fri, 7 Aug 2020 15:50:05 +0900
|
||||
Subject: [PATCH] avoiding UnicodeDecodeError in decode(). Output more errors
|
||||
which starts with E: oscap
|
||||
|
||||
---
|
||||
org_fedora_oscap/common.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py
|
||||
index 9b4b7bf..45ce727 100644
|
||||
--- a/org_fedora_oscap/common.py
|
||||
+++ b/org_fedora_oscap/common.py
|
||||
@@ -136,8 +136,9 @@ def execute(self, ** kwargs):
|
||||
|
||||
(stdout, stderr) = proc.communicate()
|
||||
self.stdout = stdout.decode()
|
||||
- self.stderr = stderr.decode()
|
||||
+ self.stderr = stderr.decode(errors="replace")
|
||||
self.messages = re.findall(r'OpenSCAP Error:.*', self.stderr)
|
||||
+ self.messages = self.messages + re.findall(r'E: oscap:.*', self.stderr)
|
||||
|
||||
self.returncode = proc.returncode
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From 943b2570c3196aec12a46d5b0e261f026ace0e86 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
||||
Date: Thu, 9 Jul 2020 17:15:11 +0200
|
||||
Subject: [PATCH] Changed the spoke label back to uppercase.
|
||||
|
||||
The spoke title which is defined in the Python code and visible in the hub
|
||||
should have capitalization that respects the local language convention.
|
||||
However, the much less visible spoke label that is defined in the glade file
|
||||
should be uppercase, and so should be translations.
|
||||
---
|
||||
org_fedora_oscap/gui/spokes/oscap.glade | 2 +-
|
||||
org_fedora_oscap/gui/spokes/oscap.py | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade
|
||||
index 1adcfcf..1fd2664 100644
|
||||
--- a/org_fedora_oscap/gui/spokes/oscap.glade
|
||||
+++ b/org_fedora_oscap/gui/spokes/oscap.glade
|
||||
@@ -37,7 +37,7 @@
|
||||
<property name="can_focus">False</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="vexpand">True</property>
|
||||
- <property name="window_name" translatable="yes">Security Policy</property>
|
||||
+ <property name="window_name" translatable="yes">SECURITY POLICY</property>
|
||||
<signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
|
||||
<child internal-child="main_box">
|
||||
<object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
|
||||
diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
index f21f7d3..b9fcd31 100644
|
||||
--- a/org_fedora_oscap/gui/spokes/oscap.py
|
||||
+++ b/org_fedora_oscap/gui/spokes/oscap.py
|
||||
@@ -196,6 +196,9 @@ class OSCAPSpoke(NormalSpoke):
|
||||
|
||||
# title of the spoke (will be displayed on the hub)
|
||||
title = N_("_Security Policy")
|
||||
+ # The string "SECURITY POLICY" in oscap.glade is meant to be uppercase,
|
||||
+ # as it is displayed inside the spoke as the spoke label,
|
||||
+ # and spoke labels are all uppercase by a convention.
|
||||
|
||||
# methods defined by API and helper methods #
|
||||
def __init__(self, data, storage, payload):
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 1de759e8bcf1caddddfdda59496473ed9b525365 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
||||
Date: Wed, 4 Nov 2020 17:48:35 +0100
|
||||
Subject: [PATCH] Expanded group data to detect more package collisions.
|
||||
|
||||
This should cover RHEL8 OSPP and CIS profiles.
|
||||
---
|
||||
org_fedora_oscap/rule_handling.py | 16 +++++++++++++++-
|
||||
1 file changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/org_fedora_oscap/rule_handling.py b/org_fedora_oscap/rule_handling.py
|
||||
index 6a3a04e..80d86c7 100644
|
||||
--- a/org_fedora_oscap/rule_handling.py
|
||||
+++ b/org_fedora_oscap/rule_handling.py
|
||||
@@ -40,12 +40,26 @@
|
||||
__all__ = ["RuleData"]
|
||||
|
||||
|
||||
+# Mapping of packages to package environments and/or groups that depends on them
|
||||
+# See also https://access.redhat.com/solutions/1201413 how to get group IDs.
|
||||
+# on RHEL8, use e.g. grep -R "<id>" /var/cache/dnf/*
|
||||
ESSENTIAL_PACKAGES = {
|
||||
"xorg-x11-server-common": {
|
||||
"env": ["graphical-server-environment", "workstation-product-environment"],
|
||||
+ "groups": ["workstation-product-environment"],
|
||||
},
|
||||
"nfs-utils": {
|
||||
"env": ["graphical-server-environment", "workstation-product-environment"],
|
||||
+ "groups": ["workstation-product-environment"],
|
||||
+ },
|
||||
+ "tftp": {
|
||||
+ "groups": ["network-server"],
|
||||
+ },
|
||||
+ "abrt": {
|
||||
+ "groups": ["debugging"],
|
||||
+ },
|
||||
+ "gssproxy": {
|
||||
+ "groups": ["file-server"],
|
||||
},
|
||||
}
|
||||
|
||||
@@ -642,7 +656,7 @@ def _package_is_essential(self, package_name, ksdata_packages):
|
||||
if package_name in ksdata_packages.packageList:
|
||||
return True
|
||||
selected_install_env = ksdata_packages.environment
|
||||
- if selected_install_env in ESSENTIAL_PACKAGES[package_name].get("env"):
|
||||
+ if selected_install_env in ESSENTIAL_PACKAGES[package_name].get("env", []):
|
||||
return True
|
||||
selected_install_groups_names = {g.name for g in ksdata_packages.groupList}
|
||||
for g in ESSENTIAL_PACKAGES[package_name].get("groups", []):
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
Name: oscap-anaconda-addon
|
||||
Version: 1.1.1
|
||||
Release: 3%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: Anaconda addon integrating OpenSCAP to the installation process
|
||||
|
||||
License: GPLv2+
|
||||
|
|
@ -22,10 +22,14 @@ Patch1: lang.patch
|
|||
Patch2: oaa-1.2_warn-xorg.patch
|
||||
Patch3: oaa-1.2_warn-nfs-utils.patch
|
||||
Patch4: oaa-1.2_lang-streamline.patch
|
||||
Patch5: oaa-1.2_spoke-window_PR122.patch
|
||||
Patch6: oaa-1.2-unicode_issues_PR124.patch
|
||||
Patch7: oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: make
|
||||
BuildRequires: gettext
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pycurl
|
||||
BuildRequires: openscap openscap-utils openscap-python3
|
||||
BuildRequires: anaconda-core >= 33
|
||||
|
|
@ -47,6 +51,9 @@ content.
|
|||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
# As patches may translates the strings that are updated by later patches,
|
||||
# Patch1 needs to be aplied last.
|
||||
|
|
@ -72,6 +79,18 @@ make install DESTDIR=%{buildroot}
|
|||
%doc COPYING ChangeLog README.md
|
||||
|
||||
%changelog
|
||||
* Mon Feb 15 2021 Matej Tyc <matyc@redhat.com> - 1.1.1-7
|
||||
- Updated translations.
|
||||
|
||||
* Wed Nov 11 11:46:56 CET 2020 Matej Tyc <matyc@redhat.com> - 1.1.1-6
|
||||
- Improved handling of conflicts between packages removed vs software wanted to be installed - rhbz#1892310
|
||||
|
||||
* Tue Aug 18 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-5
|
||||
- Fixed issues with encountering filenames with weird encoding during scans - rhbz#1867960
|
||||
|
||||
* Thu Jul 09 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-4
|
||||
- Fixed spoke window text: RHBZ#1855041
|
||||
|
||||
* Fri Jun 26 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-3
|
||||
- Updated translations: RHBZ#1820557
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue