public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/scap-security-guide] f45: Update to upstream version 0.1.82
@ 2026-09-04 8:40 Matthew Burket
0 siblings, 0 replies; only message in thread
From: Matthew Burket @ 2026-09-04 8:40 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/scap-security-guide
Branch : f45
Commit : 88b7e12d544a4a053d85bfbb2550c3346b947687
Author : Matthew Burket <mburket@redhat.com>
Date : 2026-09-03T10:57:14-05:00
Stats : +54/-7 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/scap-security-guide/c/88b7e12d544a4a053d85bfbb2550c3346b947687?branch=f45
Log:
Update to upstream version 0.1.82
---
diff --git a/.gitignore b/.gitignore
index d89dfc0..5259219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/scap-security-guide-0.1.78.tar.bz2
-/scap-security-guide-0.1.79.tar.bz2
-/scap-security-guide-0.1.80.tar.bz2
-/scap-security-guide-0.1.81.tar.bz2
+/scap-security-guide-0.1.82.tar.bz2
diff --git a/15083.patch b/15083.patch
new file mode 100644
index 0000000..3803b67
--- /dev/null
+++ b/15083.patch
@@ -0,0 +1,46 @@
+From 9a418a006e324803c2bb5ec70dd134e107d634e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
+Date: Thu, 3 Sep 2026 11:52:02 +0200
+Subject: [PATCH] Fix building Ubuntu 26.04 HTML guides
+
+The Ubuntu 26.04 product doesn't have any profile except the virtual
+default profile, therefore, no HTML guide is built, and the builder
+fails when building the index.html index. It manifests only if the
+`lxml` library isn't present and the build system falls back to the
+legacy script `build_all_guides.py`. This problem currently causes
+that the scap-security-guide package doesn't build on Fedora, eg.:
+https://src.fedoraproject.org/rpms/scap-security-guide/pull-request/81
+
+Addressing:
+```
+$ python3 build-scripts/build_all_guides.py --input build/ssg-ubuntu2604-ds.xml --output build/guides build
+Traceback (most recent call last):
+ File "/home/jcerny/work/git/scap-security-guide/build-scripts/build_all_guides.py", line 109, in <module>
+ main()
+ ~~~~^^
+ File "/home/jcerny/work/git/scap-security-guide/build-scripts/build_all_guides.py", line 100, in main
+ index_source = ssg.build_guides.build_index(benchmarks, input_basename,
+ index_links, index_options,
+ index_initial_src)
+ File "/home/jcerny/work/git/scap-security-guide/ssg/build_guides.py", line 224, in build_index
+ index_select_options += "\n".join(list(index_options.values())[0])
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^
+IndexError: list index out of range
+```
+---
+ ssg/build_guides.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssg/build_guides.py b/ssg/build_guides.py
+index c54580df484a..617fb99ab046 100644
+--- a/ssg/build_guides.py
++++ b/ssg/build_guides.py
+@@ -220,7 +220,7 @@ def build_index(benchmarks, input_basename, index_links, index_options,
+ % (benchmark_id)
+ index_select_options += "\n".join(index_options[benchmark_id])
+ index_select_options += "</optgroup>\n"
+- else:
++ elif len(index_options.keys()) == 1:
+ index_select_options += "\n".join(list(index_options.values())[0])
+
+ return "".join([
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 3c5c024..958a745 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -4,12 +4,13 @@
%global _vpath_builddir build
Name: scap-security-guide
-Version: 0.1.81
-Release: 2%{?dist}
+Version: 0.1.82
+Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
+Patch0: 15083.patch
BuildArch: noarch
BuildRequires: libxslt
@@ -96,6 +97,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%endif
%changelog
+* Wed Sep 02 2026 Matthew Burket <mburket@redhat.com> - 0.1.82-1
+- Update to the latest upstream release 0.1.82
+
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.81-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 2ea857c..b20b34c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.81.tar.bz2) = 11e26cfa96a6f1bd98b3a131837e2f86c9a9851239337d86d624b01627faf10f7a03c395a5839ddab018e0fa47719ade05a9946f90d5ca96b1261776a9164379
+SHA512 (scap-security-guide-0.1.82.tar.bz2) = 486dd60e0949588127406c3499c39904b7098e5c94c0a50eab8c9a18957cb90525dbe42ea1c2bbab40747eec23ea7cf7c03ac17266e237da67f5ccc68ac690de
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-04 8:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-04 8:40 [rpms/scap-security-guide] f45: Update to upstream version 0.1.82 Matthew Burket
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox