Rebase to new upstream version 1.3.10

Resolves: RHEL-31221
Resolves: RHEL-11925
Resolves: RHEL-1479

.gitignore

@@ -1,2 +1,3 @@
 SOURCES/openscap-1.3.7.tar.gz
 /openscap-1.3.7.tar.gz
+/openscap-1.3.10.tar.gz

openscap-1.3.9-PR-1996-fix-sysctl-offline.patch

@@ -1,45 +0,0 @@
-From 299e344b245e8d1b3a31a58275e0e8d0aa01ed77 Mon Sep 17 00:00:00 2001
-From: Evgeny Kolesnikov <ekolesni@redhat.com>
-Date: Sat, 8 Jul 2023 07:05:31 +0200
-Subject: [PATCH] OVAL/sysctl: Fix offline mode
-
-The initial implementation was buggy: after correctly traversing
-prefixed PREFIX/proc/sys directory tree it would incorrectly read
-the data from the non-prefixed directory tree.
----
- src/OVAL/probes/unix/sysctl_probe.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/OVAL/probes/unix/sysctl_probe.c b/src/OVAL/probes/unix/sysctl_probe.c
-index 65d4bd0609..b7c68a0378 100644
---- a/src/OVAL/probes/unix/sysctl_probe.c
-+++ b/src/OVAL/probes/unix/sysctl_probe.c
-@@ -150,10 +150,14 @@ int sysctl_probe_main(probe_ctx *ctx, void *probe_arg)
-         while ((ofts_ent = oval_fts_read(ofts)) != NULL) {
-                 SEXP_t *se_mib;
-                 char    mibpath[PATH_MAX], *mib;
--                size_t  miblen;
-+                size_t  miblen, mibstart;
-                 struct stat file_stat;
- 
--                snprintf(mibpath, sizeof mibpath, "%s/%s", ofts_ent->path, ofts_ent->file);
-+                if (prefix != NULL) {
-+                        snprintf(mibpath, sizeof mibpath, "%s/%s/%s", prefix, ofts_ent->path, ofts_ent->file);
-+                } else {
-+                        snprintf(mibpath, sizeof mibpath, "%s/%s", ofts_ent->path, ofts_ent->file);
-+                }
- 
-                 /* Skip write-only files, eg. /proc/sys/net/ipv4/route/flush */
-                 if (stat(mibpath, &file_stat) == -1) {
-@@ -168,7 +172,10 @@ int sysctl_probe_main(probe_ctx *ctx, void *probe_arg)
-                         continue;
-                 }
- 
--                mib    = strdup(mibpath + strlen(PROC_SYS_DIR) + 1);
-+                mibstart = 0;
-+                mibstart += prefix != NULL ? strlen(prefix)+1 : 0;
-+                mibstart += strlen(PROC_SYS_DIR)+1;
-+                mib    = strdup(mibpath + mibstart);
-                 miblen = strlen(mib);
- 
-                 while (miblen > 0) {

openscap.spec

@@ -1,12 +1,11 @@
 Name:           openscap
-Version:        1.3.8
+Version:        1.3.10
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.open-scap.org/
 Source0:        https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
-Patch0:         openscap-1.3.9-PR-1996-fix-sysctl-offline.patch
 BuildRequires:  cmake >= 2.6
 BuildRequires:  swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
 BuildRequires:  rpm-devel
@@ -216,6 +215,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/oscap-run-sce-script
 
 %changelog
+* Tue Apr 02 2024 Jan Černý <jcerny@redhat.com> - 1.3.10-1
+- Rebase to the latest upstream version (RHEL-31221)
+- Add ability to define a limit of collected items (RHEL-11925)
+- Add option --references that can select rules based on their reference (RHEL-1479)
+
 * Fri Jul 14 2023 Evgenii Kolesnikov <ekolesni@redhat.com> - 1.3.8-1
 - Upgrade to the latest upstream release (rhbz#2217441)
 - Add offline support for sysctl probe (rhbz#2185791)

sources

@@ -1 +1 @@
-SHA512 (openscap-1.3.8.tar.gz) = 4a05f6467ea88f92cc74d7470ed97de10be4ae3de9b16ab065adcedc403adfae667b1b787b65ba6d9c85d38bf7ef47dbd10c90b2dd2b2a48056655a451103ae9
+SHA512 (openscap-1.3.10.tar.gz) = 007556b8f020636f6613c2b1192a8b96dfb21b62994a3e257619d48021ad962f95b724c3ac9709a60dbbf7dba8f2499ff8b9b56a7f2d293ca3a8d6ec8107f595