Skip to content

Commit

Permalink
Update and fix CI
Browse files Browse the repository at this point in the history
Add c10s to Packit jobs.
Remove c8s (we are not going to release 1.4 there).
Fix OS_APPLE ifdef guard.
Switch to NSS.
  • Loading branch information
evgenyz committed Jul 30, 2024
1 parent 8f06d23 commit 7dff78f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 4 additions & 10 deletions openscap.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/common/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7dff78f

Please sign in to comment.