mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-22 08:52:29 -09:00
package/openscap: bump to version 1.4.5
Changelog available at https://github.com/OpenSCAP/openscap/releases/tag/1.4.5 The two patches present in the package directory are now integrated in the new version, so drop them. Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Alexis Lothoré
committed by
Thomas Petazzoni
Thomas Petazzoni
parent
89d584b8e2
commit
34dc16e77e
@@ -1,57 +0,0 @@
|
||||
From d12d820a9493b0a0ee1ad4b0aeaa87da28aa0080 Mon Sep 17 00:00:00 2001
|
||||
From: Eljees <yurytumanov.r@yandex.ru>
|
||||
Date: Mon, 27 Jul 2026 06:57:38 +0300
|
||||
Subject: [PATCH] Fix build without crypto support
|
||||
|
||||
Upstream: https://github.com/OpenSCAP/openscap/commit/d12d820a9493b0a0ee1ad4b0aeaa87da28aa0080
|
||||
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
src/OVAL/probes/CMakeLists.txt | 2 +-
|
||||
src/OVAL/probes/crapi/CMakeLists.txt | 7 ++++++-
|
||||
3 files changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 5d59bf3f036f..f31ce8040e0a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -59,7 +59,7 @@ if (ENABLE_PROBES)
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
-if (HAVE_MMAN_H AND (GCRYPT_FOUND OR NSS_FOUND))
|
||||
+if (HAVE_MMAN_H)
|
||||
list(APPEND OBJECTS_TO_LINK_AGAINST
|
||||
$<TARGET_OBJECTS:crapi_object>
|
||||
)
|
||||
diff --git a/src/OVAL/probes/CMakeLists.txt b/src/OVAL/probes/CMakeLists.txt
|
||||
index e505908f5842..25e3ca56a0c3 100644
|
||||
--- a/src/OVAL/probes/CMakeLists.txt
|
||||
+++ b/src/OVAL/probes/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
add_subdirectory("SEAP")
|
||||
add_subdirectory("probe")
|
||||
|
||||
-if (HAVE_MMAN_H AND CRYPTO_FOUND)
|
||||
+if (HAVE_MMAN_H)
|
||||
add_subdirectory("crapi")
|
||||
endif()
|
||||
|
||||
diff --git a/src/OVAL/probes/crapi/CMakeLists.txt b/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
index 1f3e5a963bbf..3fb6f123c8d6 100644
|
||||
--- a/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
+++ b/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
@@ -1,4 +1,9 @@
|
||||
-file(GLOB_RECURSE CRAPI_SOURCES "*.c")
|
||||
+if (CRYPTO_FOUND)
|
||||
+ file(GLOB_RECURSE CRAPI_SOURCES "*.c")
|
||||
+else()
|
||||
+ # crapi_init has a no-op implementation for builds without a digest backend.
|
||||
+ set(CRAPI_SOURCES "crapi.c")
|
||||
+endif()
|
||||
file(GLOB_RECURSE CRAPI_HEADERS "*.h")
|
||||
|
||||
add_library(crapi_object OBJECT ${CRAPI_SOURCES} ${CRAPI_HEADERS})
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From 5b858d1786c025cbd50dfc284b252c3ee6dd99dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= <alexis.lothore@bootlin.com>
|
||||
Date: Tue, 18 Aug 2026 09:38:05 +0200
|
||||
Subject: [PATCH] Do not use gcrypt cmake variables if gcrypt is not found
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit d12d820a9493 ("Fix build without crypto support") enabled
|
||||
building the crapi library without a crypto backend, but left the
|
||||
target_include_directories and target_compile_definitions calls
|
||||
unguarded. When no crypto library is available, the GCrypt find module
|
||||
leaves GCRYPT_INCLUDE_DIRS unset, so CMake fails at the generate step
|
||||
with:
|
||||
|
||||
CMake Error: The following variables are used in this project, but
|
||||
they are set to NOTFOUND: GCRYPT_INCLUDE_DIR
|
||||
|
||||
The test command provided at this time made the build successful because
|
||||
it provided -DCMAKE_DISABLE_FIND_PACKAGE_GCrypt=TRUE, but if no crypto
|
||||
backend is provided, it does not make sense to provide those cmake
|
||||
configuration options preventing dependency search manually.
|
||||
|
||||
Guard both calls with a CRYPTO_FOUND check so they are only applied when
|
||||
an actual digest backend is present, even without providing
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_foo
|
||||
|
||||
Upstream: https://github.com/OpenSCAP/openscap/commit/5b858d1786c025cbd50dfc284b252c3ee6dd99dc
|
||||
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
|
||||
---
|
||||
src/OVAL/probes/crapi/CMakeLists.txt | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/OVAL/probes/crapi/CMakeLists.txt b/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
index 3fb6f123c8d6..88cb916b6d96 100644
|
||||
--- a/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
+++ b/src/OVAL/probes/crapi/CMakeLists.txt
|
||||
@@ -8,5 +8,7 @@ file(GLOB_RECURSE CRAPI_HEADERS "*.h")
|
||||
|
||||
add_library(crapi_object OBJECT ${CRAPI_SOURCES} ${CRAPI_HEADERS})
|
||||
set_oscap_generic_properties(crapi_object)
|
||||
-target_include_directories(crapi_object PUBLIC ${NSS_INCLUDE_DIRS} ${GCRYPT_INCLUDE_DIRS})
|
||||
-target_compile_definitions(crapi_object PUBLIC ${GCRYPT_DEFINITIONS})
|
||||
+if (CRYPTO_FOUND)
|
||||
+ target_include_directories(crapi_object PUBLIC ${NSS_INCLUDE_DIRS} ${GCRYPT_INCLUDE_DIRS})
|
||||
+ target_compile_definitions(crapi_object PUBLIC ${GCRYPT_DEFINITIONS})
|
||||
+endif()
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://github.com/OpenSCAP/openscap/releases/tag/1.4.4
|
||||
sha256 25b1b046822121204e6d53d877a532c88bf7fde14b94c9c72297cd5709b03478 openscap-1.4.4.tar.gz
|
||||
# From https://github.com/OpenSCAP/openscap/releases/download/1.4.4/openscap-1.4.4.tar.gz.sha512
|
||||
sha512 c69736bee997e50a04aff8e4f22da880f342190e1289c5df0fb73b7af34833d3bd9f4e5055b227a18d571167671f821701a09f8c9a3e4568c7da68cc4be51133 openscap-1.4.4.tar.gz
|
||||
# From https://github.com/OpenSCAP/openscap/releases/tag/1.4.5
|
||||
sha256 f4fc0a54b50441b3c6bb3527c292345cdb3bea16a9d23435292beb508eb96e47 openscap-1.4.5.tar.gz
|
||||
# From https://github.com/OpenSCAP/openscap/releases/download/1.4.5/openscap-1.4.5.tar.gz.sha512
|
||||
sha512 cb39e53a5cfe8e0bf69418f04ff2175e2579656620d59ae84bab4de482bcb35a58580d598f86dfdfc7613bb7c1c37dd99aa9c9bbb8ff015f4772ad62fecd6267 openscap-1.4.5.tar.gz
|
||||
# Locally computed
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENSCAP_VERSION = 1.4.4
|
||||
OPENSCAP_VERSION = 1.4.5
|
||||
OPENSCAP_SITE = https://github.com/OpenSCAP/openscap/releases/download/$(OPENSCAP_VERSION)
|
||||
OPENSCAP_LICENSE = LGPL-2.1+
|
||||
OPENSCAP_LICENSE_FILES = COPYING
|
||||
|
||||
Reference in New Issue
Block a user