diff --git a/scap-security-guide-0.1.61-update-ospp-description-PR_8232.patch b/scap-security-guide-0.1.61-update-ospp-description-PR_8232.patch new file mode 100644 index 0000000..466149d --- /dev/null +++ b/scap-security-guide-0.1.61-update-ospp-description-PR_8232.patch @@ -0,0 +1,57 @@ +From ca715d7c17056b6f4cfc2ed3ee2ca68b4388a729 Mon Sep 17 00:00:00 2001 +From: Vojtech Polasek +Date: Wed, 16 Feb 2022 09:53:53 +0100 +Subject: [PATCH 1/2] update description of rhel9 ospp profile + +--- + products/rhel9/profiles/ospp.profile | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/products/rhel9/profiles/ospp.profile b/products/rhel9/profiles/ospp.profile +index c3f4e2d26eb..cb19227a3bd 100644 +--- a/products/rhel9/profiles/ospp.profile ++++ b/products/rhel9/profiles/ospp.profile +@@ -11,14 +11,12 @@ reference: https://www.niap-ccevs.org/Profile/PP.cfm + title: '[DRAFT] Protection Profile for General Purpose Operating Systems' + + description: |- +- This profile reflects mandatory configuration controls identified in the +- NIAP Configuration Annex to the Protection Profile for General Purpose +- Operating Systems (Protection Profile Version 4.2.1). +- +- This configuration profile is consistent with CNSSI-1253, which requires +- U.S. National Security Systems to adhere to certain configuration +- parameters. Accordingly, this configuration profile is suitable for +- use in U.S. National Security Systems. ++ This profile is part of Red Hat Enterprise Linux 9 Common Criteria Guidance ++ documentation for Target of Evaluation based on Protection Profile for ++ General Purpose Operating Systems (OSPP) version 4.2.1 and Functional ++ Package for SSH version 1.0. ++ Where appropriate, CNSSI 1253 or DoD-specific values are used for ++ configuration, based on Configuration Annex to the OSPP. + + selections: + + +From 11061228944b3a33a482289dfef5e6a034c39ae4 Mon Sep 17 00:00:00 2001 +From: Gabriel Becker +Date: Wed, 16 Feb 2022 11:32:09 +0100 +Subject: [PATCH 2/2] Add newline in the RHEL9 OSPP description + +To be nicely rendered in the guide and OAA. +--- + products/rhel9/profiles/ospp.profile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/products/rhel9/profiles/ospp.profile b/products/rhel9/profiles/ospp.profile +index cb19227a3bd..f25abd7e4c4 100644 +--- a/products/rhel9/profiles/ospp.profile ++++ b/products/rhel9/profiles/ospp.profile +@@ -15,6 +15,7 @@ description: |- + documentation for Target of Evaluation based on Protection Profile for + General Purpose Operating Systems (OSPP) version 4.2.1 and Functional + Package for SSH version 1.0. ++ + Where appropriate, CNSSI 1253 or DoD-specific values are used for + configuration, based on Configuration Annex to the OSPP. + diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 1b31c50..0a17a08 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -58,6 +58,7 @@ Patch40: scap-security-guide-0.1.61-grub2_template_fix-PR_8180.patch Patch41: scap-security-guide-0.1.61-rear_not_applicable_aarch64-PR_8221.patch Patch42: scap-security-guide-0.1.61-add_RHEL_08_0103789_include_sudoers-PR_8196.patch Patch43: scap-security-guide-0.1.61-fix-ansible-service-disabled-task-PR_8226.patch +Patch44: scap-security-guide-0.1.61-update-ospp-description-PR_8232.patch BuildRequires: libxslt BuildRequires: expat @@ -146,6 +147,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %changelog * Tue Feb 15 2022 Watson Sato - 0.1.60-4 - Fix Ansible service disabled tasks (RHBZ#2014561) +- Update description of OSPP profile (RHBZ#2045386) * Mon Feb 14 2022 Gabriel Becker - 0.1.60-3 - Update sudoers rules in RHEL8 STIG V1R5 (RHBZ#2045403)