Skip to content

Commit 84cd7ef

Browse files
committedFeb 10, 2025·
Merge branch 'maint-1.3' into main
Merge after 1.3.11 release
2 parents 83709fc + 0e2f9f5 commit 84cd7ef

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed
 

‎.packit.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ srpm_build_deps:
1010
- bash
1111

1212
jobs:
13-
- &build
14-
job: copr_build
13+
- job: copr_build
1514
trigger: pull_request
1615
metadata:
1716
targets:
@@ -27,5 +26,12 @@ jobs:
2726
- centos-stream-9-x86_64
2827
- centos-stream-10-x86_64
2928

30-
- <<: *build
29+
- job: copr_build
3130
trigger: commit
31+
metadata:
32+
branch: main
33+
targets:
34+
- fedora-all-x86_64
35+
- centos-stream-9-x86_64
36+
- centos-stream-10-x86_64
37+
preserve_project: True

‎NEWS

+12
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@ openscap-1.4.0 2024-08-13
3232
- Fix compiler warnings
3333
- Update User Manual
3434

35+
openscap-1.3.11 2025-02-10
36+
- New features
37+
- Introduce "oscap-im" - script that can be used in Containerfiles to build
38+
hardened bootable container images to run as Image Mode Operating System
39+
- Maintenance, bug fix
40+
- Fix Python 3.13 compatibility
41+
- Fix collecting signature in rpm_info probe
42+
- Fix RPM database path in RPM probes (RHEL-55251, #2151)
43+
- Ensure xlink namespace exists (RHEL-34104)
44+
- Stop printing useless component reference information in "oscap info"
45+
- Minor fixes in test suite and CI
46+
3547
openscap-1.3.10 18-03-2024
3648
- New features
3749
- Dump all env. variables that affects the behaviour on INFO log level

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@ static void pkgh2rep(Header h, struct rpminfo_rep *r, regex_t *keyid_regex)
137137

138138
r->evr = str;
139139

140-
str = headerFormat (h, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &rpmerr);
140+
str = headerFormat (
141+
h,
142+
"%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
143+
&rpmerr);
141144

142145
if (regexec(keyid_regex, str, 1, keyid_match, 0) != 0) {
143146
sid = NULL;

0 commit comments

Comments
 (0)
Please sign in to comment.