Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Vojtech Polasek
fbde29ebec scap-security-guide 0.1.56 2021-05-26 17:43:17 +02:00
Vojtech Polasek
b7d14127ed scap-security-guide 0.1.55 2021-03-19 14:54:35 +01:00
Vojtech Polasek
392aa1e719 rebuild to apply changes around build dir 2021-02-12 10:55:03 +01:00
Matus Marhefka
aa907f10ed Define _vpath_builddir macro as build
SSG build system and tests count with build directory name `build`.
For more details see:
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
2021-02-12 09:39:17 +01:00
Vojtech Polasek
9802b03823 scap-security-guide 0.1.54 2021-02-05 09:28:42 +01:00
Vojtech Polasek
212b4636f2 scap-security-guide 0.1.53 2020-11-18 10:50:28 +01:00
Milan Lysonek
5e01b7395c Enable automated execution of tests using Standard Test Roles 2020-11-05 15:42:37 +01:00
Vojtech Polasek
204989d3bc scap-security-guide 0.1.52 2020-09-21 11:12:46 +02:00
5 changed files with 45 additions and 34 deletions

5
.gitignore vendored
View file

@ -35,3 +35,8 @@
/scap-security-guide-0.1.48.tar.bz2
/scap-security-guide-0.1.49.tar.bz2
/scap-security-guide-0.1.51.tar.bz2
/scap-security-guide-0.1.52.tar.bz2
/scap-security-guide-0.1.53.tar.bz2
/scap-security-guide-0.1.54.tar.bz2
/scap-security-guide-0.1.55.tar.bz2
/scap-security-guide-0.1.56.tar.bz2

View file

@ -1,31 +0,0 @@
From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
Date: Thu, 5 Dec 2019 15:02:05 +0100
Subject: [PATCH] Fix XML "parsing" of the remediation functions file.
A proper fix is not worth the effort, as we aim to kill shared Bash remediation
with Jinja2 macros.
---
ssg/build_remediations.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py
index 7da807bd68..13e90f7327 100644
--- a/ssg/build_remediations.py
+++ b/ssg/build_remediations.py
@@ -56,11 +56,11 @@ def get_available_functions(build_dir):
remediation_functions = []
with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile:
filestring = xmlfile.read()
- # This regex looks implementation dependent but we can rely on
- # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed
- # to be the first attr and ID is guaranteed to be second.
+ # This regex looks implementation dependent but we can rely on the element attributes
+ # being present on one line.
+ # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7.
remediation_functions = re.findall(
- r'<Value hidden=\"true\" id=\"function_(\S+)\"',
+ r'<Value[^>]*id=\"function_(\S+)\"',
filestring, re.DOTALL
)

View file

@ -1,6 +1,11 @@
# SSG build system and tests count with build directory name `build`.
# For more details see:
# https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
%global _vpath_builddir build
Name: scap-security-guide
Version: 0.1.51
Release: 4%{?dist}
Version: 0.1.56
Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
@ -64,6 +69,29 @@ present in %{name} package.
%doc %{_docdir}/%{name}/tables/*.html
%changelog
* Wed May 26 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.56-1
- Update to latest upstream SCAP-Security-Guide-0.1.56 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.56
* Fri Mar 19 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.55-1
- Update to latest upstream SCAP-Security-Guide-0.1.55 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.55
* Fri Feb 12 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.54-2
- rebuilt
* Fri Feb 05 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.54-1
- Update to latest upstream SCAP-Security-Guide-0.1.54 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.54
* Wed Nov 18 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.53-1
- Update to latest upstream SCAP-Security-Guide-0.1.53 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.53
* Mon Sep 21 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.52-1
- Update to latest upstream SCAP-Security-Guide-0.1.52 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.52
* Tue Aug 04 2020 Jan Černý <jcerny@redhat.com> - 0.1.51-4
- Update for new CMake out of source builds
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds

View file

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.51.tar.bz2) = 81173110520d51f9ef111d6f129932e1b5a5899286175a2a26171007520101976409af5969adba60d6165e8d858e2842bd50ecd2afc9e8747e4cc5192898db71
SHA512 (scap-security-guide-0.1.56.tar.bz2) = 1c876f1a8e03f3f68de8fd5a8fd020567f0eecb1fb8b9c9f754453c2f22278944f50d06c0f4e771020e2e25facf6cecb1044d3ddb12e531428ca5aacfec3c86c

9
tests/tests.yml Normal file
View file

@ -0,0 +1,9 @@
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/tests/scap-security-guide.git"
dest: "scap-security-guide"
fmf_filter: "tier: 1, 2"