diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-12-09 18:20:09 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-12-09 18:20:15 -0500 |
| commit | 168fd5c048be682fd985b197bc80370d57de1d57 (patch) | |
| tree | 5bb91947d9007e94d887ba725683edeccff17cf7 /sys-apps | |
| parent | games-engines/scummvm: Removed old. (diff) | |
| download | gentoo-168fd5c048be682fd985b197bc80370d57de1d57.tar.gz gentoo-168fd5c048be682fd985b197bc80370d57de1d57.tar.bz2 gentoo-168fd5c048be682fd985b197bc80370d57de1d57.zip | |
sys-apps/busybox: fix build with USE=selinux #600106
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/busybox-1.25.1.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.25.1-setfiles.patch | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild index 0e5681911970..7774872e366c 100644 --- a/sys-apps/busybox/busybox-1.25.1.ebuild +++ b/sys-apps/busybox/busybox-1.25.1.ebuild @@ -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 diff --git a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch new file mode 100644 index 000000000000..3a5f5ed9d3a6 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch @@ -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 + |