From 672b5f9213841bd79f1596e755bbffa7e4f39d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 2 Sep 2026 10:11:49 +0200 Subject: [PATCH] package/openscap: drop duplicate patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit bd5b267b1de0 ("package/openscap: fix build failure with dbus and musl") brought an upstream patch to fix a build failure on the openscap package, detected by the autobuilder on buildroot 2026.02.x, which had openscap 1.3.12 at that time. bd5b267b1de0 has recently been merged on master; openscap has already been bumped to 1.4.4 on this branch, and so it already brings the needed fix for musl+dbus build configurations, hence making the patch step fail. This upstream patch is then not needed anymore on any maintained branch. Fixes: https://autobuild.buildroot.org/results/d11d0b82dcdb4bf10f6c37db8bdbc42a78bdf28b/ Fixes: https://autobuild.buildroot.org/results/4397a4ef94ccf482f1ab9d24b6334adb0222a580/ Signed-off-by: Alexis Lothoré Signed-off-by: Julien Olivain --- ...AL-probes-add-missing-header-include.patch | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 package/openscap/0002-OVAL-probes-add-missing-header-include.patch diff --git a/package/openscap/0002-OVAL-probes-add-missing-header-include.patch b/package/openscap/0002-OVAL-probes-add-missing-header-include.patch deleted file mode 100644 index 0c7598b2b5..0000000000 --- a/package/openscap/0002-OVAL-probes-add-missing-header-include.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ab69b76cb40d6f35d252246e965245804b17591f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= -Date: Thu, 13 Aug 2026 15:18:15 +0200 -Subject: [PATCH] OVAL/probes: add missing header include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Openscap build can fail with the following log when --Wimplicit-function-declaration is turned into an error: - -In file included from [...]/src/OVAL/probes/unix/linux/systemdunitproperty_probe.c:38: -[...]/src/OVAL/probes/unix/linux/systemdshared.h: In function ‘get_all_systemd_units’: -[...]/src/OVAL/probes/unix/linux/systemdshared.h:188:50: error: implicit declaration of function ‘basename’; did you mean ‘rename’? [-Wimplicit-function-declaration] - 188 | char *unit_name_s = oscap_strdup(basename(value.str)); - | ^~~~~~~~ - | rename -In file included from [...]/src/OVAL/probes/unix/linux/systemdunitdependency_probe.c:37: -[...]/src/OVAL/probes/unix/linux/systemdshared.h: In function ‘get_all_systemd_units’: -[...]/src/OVAL/probes/unix/linux/systemdshared.h:188:50: error: implicit declaration of function ‘basename’; did you mean ‘rename’? [-Wimplicit-function-declaration] - 188 | char *unit_name_s = oscap_strdup(basename(value.str)); - | ^~~~~~~~ - | rename - -Add the missing header include pointed by `man 3 basename` to fix the -error. - -Upstream: https://github.com/OpenSCAP/openscap/commit/ab69b76cb40d6f35d252246e965245804b17591f -Signed-off-by: Alexis Lothoré ---- - src/OVAL/probes/unix/linux/systemdshared.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/OVAL/probes/unix/linux/systemdshared.h b/src/OVAL/probes/unix/linux/systemdshared.h -index 879ae5be9d6c..57e94ca6f49e 100644 ---- a/src/OVAL/probes/unix/linux/systemdshared.h -+++ b/src/OVAL/probes/unix/linux/systemdshared.h -@@ -35,6 +35,7 @@ - #include - #endif - -+#include - #include - #include - #include "common/debug_priv.h" --- -2.55.0 -