diff --git a/openscap-1.3.6-rpath-pr-1765.patch b/openscap-1.3.6-rpath-pr-1765.patch new file mode 100644 index 0000000..bbd07aa --- /dev/null +++ b/openscap-1.3.6-rpath-pr-1765.patch @@ -0,0 +1,42 @@ +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-rpminspect-xml-pr-1773.patch b/openscap-1.3.6-rpminspect-xml-pr-1773.patch new file mode 100644 index 0000000..c78fa7c --- /dev/null +++ b/openscap-1.3.6-rpminspect-xml-pr-1773.patch @@ -0,0 +1,81 @@ +From e515fc9694efb8703f6c55782094e0273c0dec9d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= +Date: Fri, 25 Jun 2021 13:59:59 +0200 +Subject: [PATCH] Workaround rpminspect problem + +rpminspect produces this problem: + +xml-files: +---------- +1) File /usr/share/openscap/xsl/oval-results-report.xsl is a malformed XML file on x86_64 +Result: VERIFY +Waiver Authorization: Anyone + +Details: +No declaration for element stylesheet + +Suggested Remedy: Correct the reported errors in the XML document + +I assume that it's caused by mixing the DTD and schema - it probably +expects that the DTD will contain a declaration of the root element +as well. The workaround simply expands both entities by substituting +them by their contents. +--- + xsl/oval-results-report.xsl | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/xsl/oval-results-report.xsl b/xsl/oval-results-report.xsl +index fe50717795..744540c8f8 100644 +--- a/xsl/oval-results-report.xsl ++++ b/xsl/oval-results-report.xsl +@@ -1,10 +1,4 @@ + +- +- +- +- +-]> +