From ce8f905bac2184bdfc466b072d2e5cc5bbd1e149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Fri, 3 Apr 2026 11:51:52 +0200 Subject: [PATCH] package/openscap: bump to version 1.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The custom patch to enforce project as C project as been merged upstream since then, but it is not released yet. This commit updates the patch to apply it on top of 1.4.3, and use the opportunity to fix the patch file name to match the commit title. Since version 1.4.0, openscap depends on PCRE2 rather than PCRE. https://github.com/OpenSCAP/openscap/releases https://github.com/OpenSCAP/openscap/compare/1.3.12...1.4.3 Signed-off-by: Alexis Lothoré [Julien: remove "select BR2_PACKAGE_PCRE_UTF"] Signed-off-by: Julien Olivain --- ...Set-project-as-C-project-in-CMakeLists.txt.patch} | 12 ++++++------ package/openscap/Config.in | 3 +-- package/openscap/openscap.hash | 2 +- package/openscap/openscap.mk | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) rename package/openscap/{0001-set-project-as-c-project.patch => 0001-Set-project-as-C-project-in-CMakeLists.txt.patch} (91%) diff --git a/package/openscap/0001-set-project-as-c-project.patch b/package/openscap/0001-Set-project-as-C-project-in-CMakeLists.txt.patch similarity index 91% rename from package/openscap/0001-set-project-as-c-project.patch rename to package/openscap/0001-Set-project-as-C-project-in-CMakeLists.txt.patch index c794fbaf44..2ccbfd138d 100644 --- a/package/openscap/0001-set-project-as-c-project.patch +++ b/package/openscap/0001-Set-project-as-C-project-in-CMakeLists.txt.patch @@ -1,4 +1,4 @@ -From a742647efd215b682e4cd26b15ac3e580c10ef9f Mon Sep 17 00:00:00 2001 +From d2fa8df126b533317b4b863758cf579fff3a2b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Mon, 16 Feb 2026 13:50:48 +0100 Subject: [PATCH] Set project as C project in CMakeLists.txt @@ -53,15 +53,15 @@ test C++ features on the used toolchain. [1] https://buildroot.org/ [2] https://autobuild.buildroot.org/results/1fe550ffa79f0a083a450ae03fe067a8ab7336be/build-end.log -Upstream: https://github.com/OpenSCAP/openscap/pull/2312 -[patch slightly adapted to be applicable on v1.3.12] +Upstream: https://github.com/OpenSCAP/openscap/commit/bbfb2d7b00cbb8e08d999546734d3ba6ae150736 +[patch slightly adapted to be applicable on v1.4.3] Signed-off-by: Alexis Lothoré --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb13debb47cf..05b054327951 100644 +index c561116d826c..570812667036 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -71,8 +71,8 @@ index cb13debb47cf..05b054327951 100644 -project("openscap") +project("openscap" C) set(OPENSCAP_VERSION_MAJOR "1") - set(OPENSCAP_VERSION_MINOR "3") - set(OPENSCAP_VERSION_PATCH "12") + set(OPENSCAP_VERSION_MINOR "4") + set(OPENSCAP_VERSION_PATCH "3") -- 2.53.0 diff --git a/package/openscap/Config.in b/package/openscap/Config.in index 317055c753..942d2b7c46 100644 --- a/package/openscap/Config.in +++ b/package/openscap/Config.in @@ -10,8 +10,7 @@ config BR2_PACKAGE_OPENSCAP select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_LIBXMLSEC1 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UTF + select BR2_PACKAGE_PCRE2 help The purpose of this project is to create security policy content for various platforms diff --git a/package/openscap/openscap.hash b/package/openscap/openscap.hash index e98631372d..7a25789b5b 100644 --- a/package/openscap/openscap.hash +++ b/package/openscap/openscap.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e61913fca3a74d310d7cf9354973eeaefa42be909ae649af1df48c3c08bc6ff openscap-1.3.12.tar.gz +sha256 96ebe697aafc83eb297a8f29596d57319278112467c46e6aaf3649b311cf8fba openscap-1.4.3.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/openscap/openscap.mk b/package/openscap/openscap.mk index 20427524d7..42f644db55 100644 --- a/package/openscap/openscap.mk +++ b/package/openscap/openscap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSCAP_VERSION = 1.3.12 +OPENSCAP_VERSION = 1.4.3 OPENSCAP_SITE = https://github.com/OpenSCAP/openscap/releases/download/$(OPENSCAP_VERSION) OPENSCAP_LICENSE = LGPL-2.1+ OPENSCAP_LICENSE_FILES = COPYING @@ -17,7 +17,7 @@ OPENSCAP_DEPENDENCIES = \ libxml2 \ libxmlsec1 \ libxslt \ - pcre + pcre2 HOST_OPENSCAP_DEPENDENCIES = \ host-pkgconf \ @@ -26,7 +26,7 @@ HOST_OPENSCAP_DEPENDENCIES = \ host-libxml2 \ host-libxmlsec1 \ host-libxslt \ - host-pcre + host-pcre2 OPENSCAP_CONF_OPTS = \ -DENABLE_OSCAP_UTIL=ON \