From d61232f981a5df6edbab4f92115a6554007ba079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Mon, 13 Jan 2025 09:59:37 +0100 Subject: [PATCH 1/7] Avoid deleting COPR repository By default the COPR projects are deleted 60 days after creation. The preserve_project option should prevent the deletion. https://packit.dev/docs/configuration/upstream/copr_build#optional-parameters --- .packit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.packit.yaml b/.packit.yaml index 96981b11ab..689930b6b5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -31,3 +31,4 @@ jobs: targets: - centos-stream-8-x86_64 - centos-stream-9-x86_64 + preserve_project: True From b3e7e54f7c469a10188d3d506bce6fd29ef5e6d0 Mon Sep 17 00:00:00 2001 From: Edgar Aguilar Date: Wed, 22 Jan 2025 17:20:30 -0600 Subject: [PATCH 2/7] Fix signature obtaining in rpm_info probe Signed-off-by: Edgar Aguilar --- src/OVAL/probes/unix/linux/rpminfo_probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/OVAL/probes/unix/linux/rpminfo_probe.c b/src/OVAL/probes/unix/linux/rpminfo_probe.c index 53f97bd4b4..0730ddc707 100644 --- a/src/OVAL/probes/unix/linux/rpminfo_probe.c +++ b/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; From 08c7fb6afceac49ef2d553e96081ce18a3184b89 Mon Sep 17 00:00:00 2001 From: Michal Ambroz <723625+xambroz@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:20:21 +0200 Subject: [PATCH 3/7] Python 3.13 compatibility Use PyObject instead of PyEval for python 3.13 compatibility --- swig/openscap.i | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/swig/openscap.i b/swig/openscap.i index 6f29fc23c8..3dd814da60 100644 --- a/swig/openscap.i +++ b/swig/openscap.i @@ -332,7 +332,7 @@ int rule_result_output_callback_wrapper(struct xccdf_rule_result* rule_result, v PyGILState_Release(state); return 1; } - result = PyEval_CallObject(func,arglist); + result = PyObject_CallObject(func,arglist); if (result == NULL) { if (PyErr_Occurred() != NULL) PyErr_PrintEx(0); @@ -369,7 +369,7 @@ int rule_start_callback_wrapper(struct xccdf_rule* rule, void *arg) PyGILState_Release(state); return 1; } - result = PyEval_CallObject(func,arglist); + result = PyObject_CallObject(func,arglist); if (result == NULL) { if (PyErr_Occurred() != NULL) PyErr_PrintEx(0); @@ -406,7 +406,7 @@ int agent_reporter_callback_wrapper(const struct oval_result_definition* res_def PyGILState_Release(state); return 1; } - result = PyEval_CallObject(func,arglist); + result = PyObject_CallObject(func,arglist); if (result == NULL) { if (PyErr_Occurred() != NULL) PyErr_PrintEx(0); @@ -441,7 +441,7 @@ int validate_callback_wrapper(const char* file, int line, const char* msg, void PyGILState_Release(state); return 1; } - result = PyEval_CallObject(func,arglist); + result = PyObject_CallObject(func,arglist); if (result == NULL) { if (PyErr_Occurred() != NULL) PyErr_PrintEx(0); @@ -477,7 +477,7 @@ char * sub_callback_wrapper(xccdf_subst_type_t type, const char *id, void *arg) PyGILState_Release(state); return NULL; } - result = PyEval_CallObject(func, arglist); + result = PyObject_CallObject(func, arglist); if (result == NULL) { if (PyErr_Occurred() != NULL) PyErr_PrintEx(0); From 7cedc4e95f5bcbdbfcbe9bec9988309adcd69dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Mon, 10 Feb 2025 13:37:03 +0100 Subject: [PATCH 4/7] Bump to the next version before release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 631af04661..d85cb6e8d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ endif() project("openscap") set(OPENSCAP_VERSION_MAJOR "1") set(OPENSCAP_VERSION_MINOR "3") -set(OPENSCAP_VERSION_PATCH "10") +set(OPENSCAP_VERSION_PATCH "11") if(OPENSCAP_VERSION_SUFFIX) set(OPENSCAP_VERSION "${OPENSCAP_VERSION_MAJOR}.${OPENSCAP_VERSION_MINOR}.${OPENSCAP_VERSION_PATCH}_${OPENSCAP_VERSION_SUFFIX}") From 446500791840cd4ad53d24a1a73c15cad495d2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Mon, 10 Feb 2025 13:47:38 +0100 Subject: [PATCH 5/7] Bump soname from 25.7.0 to 25.7.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d85cb6e8d2..411c817de5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ endif() set(LT_CURRENT 32) ## increment any time the source changes; set 0 to if you increment CURRENT -set(LT_REVISION 0) +set(LT_REVISION 1) ## increment if any interfaces have been added; set to 0 ## if any interfaces have been changed or removed. removal has From 7403b293eeba0be73dcd096db2f648b8505ba7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Mon, 10 Feb 2025 14:04:47 +0100 Subject: [PATCH 6/7] openscap-1.3.11 --- NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS b/NEWS index 84683d61b4..8073d6d175 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +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 From 0e2f9f50267d936ab09dc34b37034f276a3f76de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Mon, 10 Feb 2025 14:41:49 +0100 Subject: [PATCH 7/7] Version bump after release Next release from the maint-1.3 branch will be 1.3.12 --- CMakeLists.txt | 2 +- release_tools/versions.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 411c817de5..d568d2cf0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ endif() project("openscap") set(OPENSCAP_VERSION_MAJOR "1") set(OPENSCAP_VERSION_MINOR "3") -set(OPENSCAP_VERSION_PATCH "11") +set(OPENSCAP_VERSION_PATCH "12") if(OPENSCAP_VERSION_SUFFIX) set(OPENSCAP_VERSION "${OPENSCAP_VERSION_MAJOR}.${OPENSCAP_VERSION_MINOR}.${OPENSCAP_VERSION_PATCH}_${OPENSCAP_VERSION_SUFFIX}") diff --git a/release_tools/versions.sh b/release_tools/versions.sh index 430a46df85..17775d843e 100644 --- a/release_tools/versions.sh +++ b/release_tools/versions.sh @@ -1,4 +1,4 @@ -version=1.3.11 -previous_version=1.3.10 +version=1.3.12 +previous_version=1.3.11 version_major_minor="${version%.*}"