From 7dff78fa2c78f02b3f582bfb0275f93ee8e7f906 Mon Sep 17 00:00:00 2001
From: Evgeny Kolesnikov <ekolesni@redhat.com>
Date: Mon, 29 Jul 2024 13:50:16 +0200
Subject: [PATCH] Update and fix CI

Add c10s to Packit jobs.
Remove c8s (we are not going to release 1.4 there).
Fix OS_APPLE ifdef guard.
Switch to NSS.
---
 .packit.yaml      |  4 ++--
 openscap.spec     | 14 ++++----------
 src/common/util.c |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.packit.yaml b/.packit.yaml
index e16f647f94..2cb21caa35 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -16,16 +16,16 @@ jobs:
   metadata:
     targets:
     - fedora-all-x86_64
-    - centos-stream-8-x86_64
     - centos-stream-9-x86_64
+    - centos-stream-10-x86_64
 
 - job: tests
   trigger: pull_request
   metadata:
     targets:
     - fedora-all-x86_64
-    - centos-stream-8-x86_64
     - centos-stream-9-x86_64
+    - centos-stream-10-x86_64
 
 - <<: *build
   trigger: commit
diff --git a/openscap.spec b/openscap.spec
index 50a92839e7..edccd6100b 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -14,12 +14,8 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
 BuildRequires:  rpm-devel
-BuildRequires:  libgcrypt-devel
-%if 0%{?fedora}
+BuildRequires:  nss-devel
 BuildRequires:  pcre2-devel
-%else
-BuildRequires:  pcre-devel
-%endif
 BuildRequires:  libacl-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libcap-devel
@@ -131,12 +127,10 @@ Tool for scanning Atomic containers.
 
 %build
 %undefine __cmake_in_source_build
-# gconf is a legacy system not used any more, and it blocks testing of oscap-anaconda-addon
-# as gconf is no longer part of the installation medium
 %cmake \
     -DENABLE_PERL=OFF \
-    -DENABLE_DOCS=ON \
-    -DGCONF_LIBRARY=
+    -DWITH_CRYPTO=nss \
+    -DENABLE_DOCS=ON
 %cmake_build
 make docs
 
@@ -151,7 +145,7 @@ ctest -V %{?_smp_mflags}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # fix python shebangs
-%if 0%{?fedora}
+%if 0%{?rhel} >= 10 || 0%{?fedora}
 %{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 %else
 pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
diff --git a/src/common/util.c b/src/common/util.c
index a8b4a34dda..fb376a834a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -325,7 +325,7 @@ char *oscap_strerror_r(int errnum, char *buf, size_t buflen)
 #ifdef OS_WINDOWS
 	strerror_s(buf, buflen, errnum);
 	return buf;
-#elif defined(OS_FREEBSD)
+#elif defined(OS_APPLE) || defined(OS_FREEBSD)
 	strerror_r(errnum, buf, buflen);
 	return buf;
 #else