Merge pull request #2200 from jan-cerny/mergeafter1311

Merge maint-1.3 to main

.packit.yaml

@@ -10,8 +10,7 @@ srpm_build_deps:
   - bash
 
 jobs:
-- &build
-  job: copr_build
+- job: copr_build
   trigger: pull_request
   metadata:
     targets:
@@ -27,5 +26,12 @@ jobs:
     - centos-stream-9-x86_64
     - centos-stream-10-x86_64
 
-- <<: *build
+- job: copr_build
   trigger: commit
+  metadata:
+    branch: main
+    targets:
+    - fedora-all-x86_64
+    - centos-stream-9-x86_64
+    - centos-stream-10-x86_64
+    preserve_project: True

NEWS

@@ -32,6 +32,18 @@ openscap-1.4.0                                                  2024-08-13
   - Fix compiler warnings
   - Update User Manual
 
+openscap-1.3.11                                                 2025-02-10
+- New features
+  - Introduce "oscap-im" - script that can be used in Containerfiles to build
+    hardened bootable container images to run as Image Mode Operating System
+- Maintenance, bug fix
+  - Fix Python 3.13 compatibility
+  - Fix collecting signature in rpm_info probe
+  - Fix RPM database path in RPM probes (RHEL-55251, #2151)
+  - Ensure xlink namespace exists (RHEL-34104)
+  - Stop printing useless component reference information in "oscap info"
+  - Minor fixes in test suite and CI
+
 openscap-1.3.10                                                 18-03-2024
 - New features
   - Dump all env. variables that affects the behaviour on INFO log level

src/OVAL/probes/unix/linux/rpminfo_probe.c

@@ -137,7 +137,10 @@ static void pkgh2rep(Header h, struct rpminfo_rep *r, regex_t *keyid_regex)
 
         r->evr = str;
 
-        str = headerFormat (h, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &rpmerr);
+        str = headerFormat (
+            h,
+            "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
+            &rpmerr);
 
 	if (regexec(keyid_regex, str, 1, keyid_match, 0) != 0) {
 		sid = NULL;