From 890abe5f4e4689d182c5892840406c4b1935b47e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 11:35:33 +0200 Subject: [PATCH 1/9] Rebuilt for Python 3.13 --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index d0caddb..9da8c30 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 0.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -64,6 +64,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Sat Jun 08 2024 Python Maint - 0.2.9-2 +- Rebuilt for Python 3.13 + * Tue Apr 23 2024 Packit - 0.2.9-1 - Update to version 0.2.9 From 76fa7a23e5514ca62fee4c6fc98e2fa9ba681ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:58:56 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 9da8c30..b7a2051 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 0.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -64,6 +64,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.2.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 0.2.9-2 - Rebuilt for Python 3.13 From 8c5320ed1ae335ab9d1c760dcab405a4d50c43b7 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 4 Oct 2024 10:06:13 +0000 Subject: [PATCH 3/9] Update to 1.0.0 upstream release Upstream tag: v1.0.0 Upstream commit: 4fed3a2e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- generate_arf.sh | 22 +++++++++++----------- openscap-report.spec | 9 +++++++-- sources | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index e56bcf9..1227c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /openscap-report-0.2.6.tar.gz /openscap-report-0.2.7.tar.gz /openscap_report-0.2.9.tar.gz +/openscap_report-1.0.0.tar.gz diff --git a/README.packit b/README.packit index bee8d88..766e300 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.95.0. +The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. diff --git a/generate_arf.sh b/generate_arf.sh index 0f35169..9aed4e0 100755 --- a/generate_arf.sh +++ b/generate_arf.sh @@ -49,7 +49,7 @@ run_oscap_scan() { oscap xccdf eval ${fetch} --profile "(all)" --results-arf ${file} ${ds} || EXIT_CODE=$? echo $EXIT_CODE if [ ! -f "$file" ]; then - echo "$file does not exist." + echo "$file does not exist." >&2 exit 2 fi } @@ -58,35 +58,35 @@ get_product() { cpe_name=$(grep "CPE_NAME=" < /etc/os-release | sed 's/CPE_NAME=//g' | sed 's/["]//g') if [[ "${cpe_name}" =~ fedora ]]; then echo "fedora" - elif [[ "${cpe_name}" =~ redhat.*8 ]]; then - echo "rhel8" - elif [[ "${cpe_name}" =~ redhat.*9 ]]; then - echo "rhel9" + elif [[ "${cpe_name}" =~ redhat ]]; then + version=$(grep VERSION_ID /etc/os-release | grep -o "[0-9]\+" | head -n1) + echo "rhel${version}" elif [[ "${cpe_name}" =~ centos.*8 ]]; then echo "centos8" - elif [[ "${cpe_name}" =~ centos.*9 ]]; then - echo "cs9" + elif [[ "${cpe_name}" =~ centos ]]; then + version=$(grep VERSION_ID /etc/os-release | grep -o "[0-9]\+") + echo "cs${version}" else echo $cpe_name - echo "ERROR: Not supported OS!" + echo "ERROR: Not supported OS!" >&2 exit 1 fi } if [ "$1" = "" ]; then - echo "ERROR: Missing MODE parameter!" + echo "ERROR: Missing MODE parameter!" >&2 exit 1 fi if [ "$2" = "" ]; then - echo "ERROR: Missing FETCH parameter!" + echo "ERROR: Missing FETCH parameter!" >&2 exit 1 fi if [ "$3" = "" ]; then - echo "ERROR: Missing ARF_FILE parameter!" + echo "ERROR: Missing ARF_FILE parameter!" >&2 exit 1 fi file=$3 diff --git a/openscap-report.spec b/openscap-report.spec index b7a2051..0f0ec91 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -1,8 +1,8 @@ %global pymodule_name openscap_report Name: openscap-report -Version: 0.2.9 -Release: 3%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -23,6 +23,8 @@ Requires: python3-lxml Recommends: redhat-display-fonts Recommends: redhat-text-fonts +Obsoletes: oval-graph + %global _description %{expand: This package provides a command-line tool for generating human-readable reports from SCAP XCCDF and ARF results.} @@ -64,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Fri Oct 04 2024 Packit - 1.0.0-1 +- Update to version 1.0.0 + * Thu Jul 18 2024 Fedora Release Engineering - 0.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index ac926e5..8d874ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openscap_report-0.2.9.tar.gz) = d8bca302a8209a57fc63b802dbffa40bd9499221dc6d0a038a168ac3266441cece78548fab44db5aa2f14cd3aa083f059c05ac5ec01150a3ce542dda7937bb25 +SHA512 (openscap_report-1.0.0.tar.gz) = 6ca5a24798961cfc50112e9da9157f582732574fef4592a7fe5c8a98b4ed4b9aa3f7221427bd5e95a799a82468a22a2eddfb2262c6fc22cd2e4262540913db03 From 49ba3819bf103efbd3a939195f1912a622006d89 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 4 Oct 2024 10:06:13 +0000 Subject: [PATCH 4/9] Update to 1.0.0 upstream release Upstream tag: v1.0.0 Upstream commit: 4fed3a2e Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- generate_arf.sh | 22 +++++++++++----------- openscap-report.spec | 7 ++++++- sources | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e56bcf9..1227c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /openscap-report-0.2.6.tar.gz /openscap-report-0.2.7.tar.gz /openscap_report-0.2.9.tar.gz +/openscap_report-1.0.0.tar.gz diff --git a/README.packit b/README.packit index bee8d88..766e300 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.95.0. +The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. diff --git a/generate_arf.sh b/generate_arf.sh index 0f35169..9aed4e0 100755 --- a/generate_arf.sh +++ b/generate_arf.sh @@ -49,7 +49,7 @@ run_oscap_scan() { oscap xccdf eval ${fetch} --profile "(all)" --results-arf ${file} ${ds} || EXIT_CODE=$? echo $EXIT_CODE if [ ! -f "$file" ]; then - echo "$file does not exist." + echo "$file does not exist." >&2 exit 2 fi } @@ -58,35 +58,35 @@ get_product() { cpe_name=$(grep "CPE_NAME=" < /etc/os-release | sed 's/CPE_NAME=//g' | sed 's/["]//g') if [[ "${cpe_name}" =~ fedora ]]; then echo "fedora" - elif [[ "${cpe_name}" =~ redhat.*8 ]]; then - echo "rhel8" - elif [[ "${cpe_name}" =~ redhat.*9 ]]; then - echo "rhel9" + elif [[ "${cpe_name}" =~ redhat ]]; then + version=$(grep VERSION_ID /etc/os-release | grep -o "[0-9]\+" | head -n1) + echo "rhel${version}" elif [[ "${cpe_name}" =~ centos.*8 ]]; then echo "centos8" - elif [[ "${cpe_name}" =~ centos.*9 ]]; then - echo "cs9" + elif [[ "${cpe_name}" =~ centos ]]; then + version=$(grep VERSION_ID /etc/os-release | grep -o "[0-9]\+") + echo "cs${version}" else echo $cpe_name - echo "ERROR: Not supported OS!" + echo "ERROR: Not supported OS!" >&2 exit 1 fi } if [ "$1" = "" ]; then - echo "ERROR: Missing MODE parameter!" + echo "ERROR: Missing MODE parameter!" >&2 exit 1 fi if [ "$2" = "" ]; then - echo "ERROR: Missing FETCH parameter!" + echo "ERROR: Missing FETCH parameter!" >&2 exit 1 fi if [ "$3" = "" ]; then - echo "ERROR: Missing ARF_FILE parameter!" + echo "ERROR: Missing ARF_FILE parameter!" >&2 exit 1 fi file=$3 diff --git a/openscap-report.spec b/openscap-report.spec index d0caddb..5f6017a 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -1,7 +1,7 @@ %global pymodule_name openscap_report Name: openscap-report -Version: 0.2.9 +Version: 1.0.0 Release: 1%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results @@ -23,6 +23,8 @@ Requires: python3-lxml Recommends: redhat-display-fonts Recommends: redhat-text-fonts +Obsoletes: oval-graph + %global _description %{expand: This package provides a command-line tool for generating human-readable reports from SCAP XCCDF and ARF results.} @@ -64,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Fri Oct 04 2024 Packit - 1.0.0-1 +- Update to version 1.0.0 + * Tue Apr 23 2024 Packit - 0.2.9-1 - Update to version 0.2.9 diff --git a/sources b/sources index ac926e5..8d874ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openscap_report-0.2.9.tar.gz) = d8bca302a8209a57fc63b802dbffa40bd9499221dc6d0a038a168ac3266441cece78548fab44db5aa2f14cd3aa083f059c05ac5ec01150a3ce542dda7937bb25 +SHA512 (openscap_report-1.0.0.tar.gz) = 6ca5a24798961cfc50112e9da9157f582732574fef4592a7fe5c8a98b4ed4b9aa3f7221427bd5e95a799a82468a22a2eddfb2262c6fc22cd2e4262540913db03 From de5a49c95abc6d28b68be6a4a43778abaf3c54bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:49:00 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 0f0ec91..1848357 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -66,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 04 2024 Packit - 1.0.0-1 - Update to version 1.0.0 From 22f5bcd1872de1d3dd72b85773eae98aaed660f6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 21:29:43 +0200 Subject: [PATCH 6/9] Rebuilt for Python 3.14 --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 1848357..95276d9 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -66,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Wed Jun 04 2025 Python Maint - 1.0.0-3 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b69db9527263350b6a431411baca5e47e97a2d6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:39:37 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 95276d9..35f6dee 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -66,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 04 2025 Python Maint - 1.0.0-3 - Rebuilt for Python 3.14 From b22058781db9c3e51a12e6929445610a8b997aca Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:04:07 +0200 Subject: [PATCH 8/9] Rebuilt for Python 3.14.0rc2 bytecode --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 35f6dee..66017ed 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -66,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Fri Aug 15 2025 Python Maint - 1.0.0-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 24 2025 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 622553b61190f205c764bbc495b149ea10a97a92 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:34:48 +0200 Subject: [PATCH 9/9] Rebuilt for Python 3.14.0rc3 bytecode --- openscap-report.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openscap-report.spec b/openscap-report.spec index 66017ed..bf867d2 100644 --- a/openscap-report.spec +++ b/openscap-report.spec @@ -2,7 +2,7 @@ Name: openscap-report Version: 1.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for generating human-readable reports from (SCAP) XCCDF and ARF results # The entire source code is LGPL-2.1+ and GPL-2.0+ and MIT except schemas/ and assets/, which are Public Domain @@ -66,6 +66,9 @@ install -m 0644 -Dt %{buildroot}%{_mandir}/man1 _build_docs/oscap-report.1 %changelog +* Fri Sep 19 2025 Python Maint - 1.0.0-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.0.0-5 - Rebuilt for Python 3.14.0rc2 bytecode