public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2] package/openscap: bump to version 1.4.3
@ 2026-04-03 12:38 Alexis Lothoré via buildroot
  2026-04-03 17:56 ` Julien Olivain via buildroot
  0 siblings, 1 reply; 4+ messages in thread
From: Alexis Lothoré via buildroot @ 2026-04-03 12:38 UTC (permalink / raw)
  To: buildroot; +Cc: Thomas Petazzoni, Alexis Lothoré

The custom patch to enforce project as C project has 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/compare/1.3.12...1.4.3

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
Changes in v2:
- fix typo in commit message
- remove dependency on PCRE_UTF config option
- Link to v1: https://patch.msgid.link/20260403-openscap_bump-v1-1-20f99c3c9429@bootlin.com
---
 ...=> 0001-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(-)

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 c794fbaf44dc..2ccbfd138d2b 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?= <alexis.lothore@bootlin.com>
 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é <alexis.lothore@bootlin.com>
 ---
  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 317055c75327..942d2b7c46df 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 e98631372d51..7a25789b5bcc 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 20427524d79a..42f644db55e9 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 \

---
base-commit: 011bc4b7472bf7782af4eb8187f5c9992a9f9cef
change-id: 20260403-openscap_bump-e8b496546503

Best regards,
--  
Alexis Lothoré <alexis.lothore@bootlin.com>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-04-03 18:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-03 12:38 [Buildroot] [PATCH v2] package/openscap: bump to version 1.4.3 Alexis Lothoré via buildroot
2026-04-03 17:56 ` Julien Olivain via buildroot
2026-04-03 18:03   ` Julien Olivain via buildroot
2026-04-03 18:11     ` Alexis Lothoré via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox