From 907e373e4059870231360aabf9d9651d318968d9 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 14 Sep 2017 16:10:58 -0500 Subject: policycoreutils: Update fixfile The functional call may not always work as specified, be sure to include the () to make sure the shell knows this is a function. Also add both findutils and grep as necessary for fixfiles to run properly in a minimal environment. Busybox is not adequate at this time. Signed-off-by: Mark Hatle --- recipes-security/selinux/policycoreutils.inc | 2 ++ .../selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc index fc181f7..442b086 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils.inc @@ -25,6 +25,8 @@ DEPENDS += "${@target_selinux(d, 'libpam audit')}" RDEPENDS_${BPN}-fixfiles += "\ ${BPN}-setfiles \ + grep \ + findutils \ " RDEPENDS_${BPN}-genhomedircon += "\ ${BPN}-genhomedircon \ diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch index 0144de7..70cdd4f 100644 --- a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch +++ b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch @@ -33,7 +33,7 @@ index 1aa330f..a10837d 100755 # number if the current is less than 2.6.30 and 0 if they are the same. # -function useseclabel { -+useseclabel { ++useseclabel () { VER=`uname -r` SUP=2.6.30 expr '(' "$VER" : '\([^.]*\)' ')' '-' '(' "$SUP" : '\([^.]*\)' ')' '|' \ -- cgit v1.2.3-54-g00ecf