diff mbox series

package/openscap: drop duplicate patch

Message ID 20260902-revert-openscap-patch-v1-1-f56161b6c7bd@bootlin.com
State New
Headers show
Series package/openscap: drop duplicate patch | expand

Commit Message

Alexis Lothoré Sept. 2, 2026, 8:11 a.m. UTC 
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é <alexis.lothore@bootlin.com>
---
Up to my knowledge the faulty patch has been merged only on master, so
the revert is only needed on master.
---
 ...02-OVAL-probes-add-missing-header-include.patch | 48 ----------------------
 1 file changed, 48 deletions(-)


---
base-commit: 79fd6241e4347f67d659cc02669448397b458d52
change-id: 20260902-revert-openscap-patch-672e3864658f

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

Comments

Julien Olivain Sept. 2, 2026, 7:26 p.m. UTC | #1 
On 02/09/2026 10:11, Alexis Lothoré via buildroot wrote:
> 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é <alexis.lothore@bootlin.com>

Applied to master, thanks.
diff mbox series

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 0c7598b2b5e1..000000000000
--- 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?= <alexis.lothore@bootlin.com>
-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é <alexis.lothore@bootlin.com>
----
- 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 <config.h>
- #endif
- 
-+#include <libgen.h>
- #include <limits.h>
- #include <stdio.h>
- #include "common/debug_priv.h"
--- 
-2.55.0
-