From 189315c8f2d5240a368b5d70ba0af78bc3eaac9a Mon Sep 17 00:00:00 2001 From: Jim Perrin Date: Nov 16 2016 15:07:05 +0000 Subject: debrand patching --- diff --git a/SOURCES/oscap-anaconda-centos-paths.patch b/SOURCES/oscap-anaconda-centos-paths.patch new file mode 100644 index 0000000..3cd2e70 --- /dev/null +++ b/SOURCES/oscap-anaconda-centos-paths.patch @@ -0,0 +1,27 @@ +From 1bbde30a8220e545011e9df3b96bd3b9220c9cfe Mon Sep 17 00:00:00 2001 +From: Vratislav Podzimek +Date: Tue, 28 Apr 2015 16:29:51 +0200 +Subject: [PATCH] Change paths to use RHEL 7's SSG instead of the Fedora's one + +--- + org_fedora_oscap/common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py +index f1aba4c..7873b50 100644 +--- org_fedora_oscap/common.py ++++ org_fedora_oscap/common.py +@@ -48,8 +48,8 @@ __all__ = ["run_oscap_remediate", "get_fix_rules_pre", "wait_and_fetch_net_data" + INSTALLATION_CONTENT_DIR = "/tmp/openscap_data/" + TARGET_CONTENT_DIR = "/root/openscap_data/" + +-SSG_DIR = "/usr/share/xml/scap/ssg/fedora/" +-SSG_XCCDF = "ssg-fedora-xccdf.xml" ++SSG_DIR = "/usr/share/xml/scap/ssg/content/" ++SSG_XCCDF = "ssg-centos7-xccdf.xml" + + RESULTS_PATH = utils.join_paths(TARGET_CONTENT_DIR, "eval_remediate_results.xml") + +-- +2.3.6 + diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 5cf6d1a..1048db1 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -14,7 +14,7 @@ URL: https://git.fedorahosted.org/cgit/oscap-anaconda-addon.git # git clone https://github.com/OpenSCAP/oscap-anaconda-addon.git Source0: %{name}-%{version}.tar.gz -Patch0: change_ssg_paths.patch +Patch0: oscap-anaconda-centos-paths.patch Patch1: word_wrap_profile_desc_1236644.patch Patch2: newline_after_addon_section_1238267.patch Patch3: no_profile_handling_1235750.patch @@ -143,6 +143,9 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README %changelog +* Wed Nov 16 2016 Jim Perrin - 0.7-12 +- debranding and path patch modification + * Tue Sep 13 2016 Vratislav Podzimek - 0.7-12 - Properly handle tailoring files for datastreams Resolves: rhbz#1364929