mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-apps/busybox: fix build with USE=selinux #600106
This commit is contained in:
@@ -68,7 +68,7 @@ src_prepare() {
|
||||
|
||||
# patches go here!
|
||||
epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
|
||||
# epatch "${FILESDIR}"/${P}-*.patch
|
||||
epatch "${FILESDIR}"/${P}-*.patch
|
||||
cp "${FILESDIR}"/ginit.c init/ || die
|
||||
|
||||
# flag cleanup
|
||||
|
||||
34
sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
Normal file
34
sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
From c1704a34745f8e49373eb2cbe1c83199ab2d0091 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Fri, 9 Dec 2016 18:14:12 -0500
|
||||
Subject: [PATCH] setfiles: fix build failure after common_bufsiz change
|
||||
|
||||
Commit 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 ("*: add most of the
|
||||
required setup_common_bufsiz() calls") switched this tool over to use
|
||||
the common_bufsiz logic but missed including the header leading to a
|
||||
build failure when enabled:
|
||||
selinux/setfiles.c:80:30: error: 'bb_common_bufsiz1' undeclared (first use in this function)
|
||||
|
||||
URL: https://bugs.gentoo.org/600106
|
||||
Reported-by: Jonas Jelten <jj@stusta.net>
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
(cherry picked from commit 1cda8790803a6fb072375c8fa53273333d2d4607)
|
||||
---
|
||||
selinux/setfiles.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
|
||||
index 51a7e63bd741..d8083d4fd580 100644
|
||||
--- a/selinux/setfiles.c
|
||||
+++ b/selinux/setfiles.c
|
||||
@@ -46,6 +46,7 @@
|
||||
//usage: "\n if it has changed"
|
||||
|
||||
#include "libbb.h"
|
||||
+#include "common_bufsiz.h"
|
||||
#if ENABLE_FEATURE_SETFILES_CHECK_OPTION
|
||||
#include <sepol/sepol.h>
|
||||
#endif
|
||||
--
|
||||
2.11.0.rc2
|
||||
|
||||
Reference in New Issue
Block a user