diff --git a/openscap-1.3.6-rpath-pr-1765.patch b/openscap-1.3.6-rpath-pr-1765.patch deleted file mode 100644 index bbd07aa..0000000 --- a/openscap-1.3.6-rpath-pr-1765.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5f8879927fa34827f1b367eac311845e6ebec9a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= -Date: Thu, 10 Jun 2021 13:41:25 +0200 -Subject: [PATCH] Do not set Rpath - -See: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_beware_of_rpath - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1967200 ---- - CMakeLists.txt | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c70ba29bf..cc7b5e005 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -482,25 +482,7 @@ else() - endif() - set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)") - --# ---------- RPATHS for linking - --# see https://cmake.org/Wiki/CMake_RPATH_handling -- --# use, i.e. don't skip the full RPATH for the build tree --set(CMAKE_SKIP_BUILD_RPATH FALSE) -- --# when building, don't use the install RPATH already --# (but later on when installing) --set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- --set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) -- --# add the automatically determined parts of the RPATH --# which point to directories outside the build tree to the install RPATH --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -- --# Turn on RPATH for OSX for policy warning --set(CMAKE_MACOSX_RPATH ON) - # ---------- CONFIGURATION - - configure_file("config.h.in" "config.h") diff --git a/openscap-1.3.6-waive-hugetables-pr-1745.patch b/openscap-1.3.6-waive-hugetables-pr-1745.patch deleted file mode 100644 index 4272a78..0000000 --- a/openscap-1.3.6-waive-hugetables-pr-1745.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 192f908562779fe4c9b7e5cc7605840976a06c85 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= -Date: Mon, 26 Apr 2021 13:13:26 +0200 -Subject: [PATCH] Waive the known issue with hugepages on ppc64/ppc64le - -The known issue has been reported in -https://bugzilla.redhat.com/show_bug.cgi?id=1642995 - -This modification is currently applied as a patch applied during setup -phase of Sanity/smoke-test in Fedora CI gating. -https://src.fedoraproject.org/tests/openscap/blob/main/f/Sanity/smoke-test -The patched file got changed recetly so the patch doesn't apply anymore -which causes the Rawhide gating to fail. -We have decided to propose the change to upstream to avoid the need -for modifying the patch in the tests and to prevent similar problems -in the future. ---- - tests/probes/sysctl/test_sysctl_probe_all.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/probes/sysctl/test_sysctl_probe_all.sh b/tests/probes/sysctl/test_sysctl_probe_all.sh -index 2280ff7ae..c79d7ed18 100755 ---- a/tests/probes/sysctl/test_sysctl_probe_all.sh -+++ b/tests/probes/sysctl/test_sysctl_probe_all.sh -@@ -73,6 +73,10 @@ if [ "$procps_ver" != "$lowest_ver" ]; then - sed -i '/.*vm.stat_refresh/d' "$sysctlNames" - fi - -+if ! grep -q "hugepages" "$ourNames"; then -+ sed -i "/^.*hugepages.*$/d" "$sysctlNames" -+fi -+ - echo "Diff (sysctlNames / ourNames): ------" - diff "$sysctlNames" "$ourNames" - echo "-------------------------------------" -@@ -84,6 +88,7 @@ sed -i -E "/^E: oscap: +Can't read sysctl value from /d" "$stderr" - # that can't fit into 8K buffer and result in errno 14 - # (for example /proc/sys/kernel/spl/hostid could be the case) - sed -i -E "/^E: oscap: +An error.*14, Bad address/d" "$stderr" -+sed -i "/^.*hugepages.*$/d" "$stderr" - - echo "Errors (without messages related to permissions):" - cat "$stderr" diff --git a/openscap.spec b/openscap.spec index ed21d6d..f5a6ad3 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,14 +1,12 @@ Name: openscap -Version: 1.3.5 -Release: 7%{?dist} +Version: 1.3.6 +Release: 1%{?dist} Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ URL: http://www.open-scap.org/ Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch1: openscap-1.3.6-waive-hugetables-pr-1745.patch -Patch2: openscap-1.3.6-rpath-pr-1765.patch -BuildRequires: make +BuildRequires: make BuildRequires: cmake >= 2.6 BuildRequires: gcc BuildRequires: gcc-c++ @@ -150,6 +148,12 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %ldconfig_scriptlets +# enable oscap-remediate.service here for now +# https://github.com/hughsie/PackageKit/issues/401 +# https://bugzilla.redhat.com/show_bug.cgi?id=1833176 +mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/ +ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.wants/oscap-remediate.service + %files %doc AUTHORS NEWS README.md %license COPYING @@ -182,6 +186,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_bindir}/oscap %{_bindir}/oscap-chroot %{_sysconfdir}/bash_completion.d +%{_libexecdir}/oscap-remediate +%{_unitdir}/oscap-remediate.service +%{_unitdir}/system-update.target.wants/ %files utils %doc docs/oscap-scan.cron @@ -204,6 +211,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_mandir}/man8/oscap-podman.8* %changelog +* Thu Jan 20 2022 Evgenii Kolesnikov - 1:1.3.6-1 +- Update to the latest upstream release + * Thu Jan 20 2022 Fedora Release Engineering - 1:1.3.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 66eb0b0..00dc4d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openscap-1.3.5.tar.gz) = 896d7b1e4552cba936dba70f186c3e3c5696d9ccb020ab5f18d8ac08de403f236b1651682da9711ed4721c365db9de7dacd3fce5d0fa467c15c16addef1055db +SHA512 (openscap-1.3.6.tar.gz) = 5e4d6c4addc15b2a0245b5caef80fda3020f1cac83ed4aa436ef3f1703d1d761060c931c2536fa68de7ad5bab002b79c8b2d1e5f7695d46249f4562f5a1569a0