From 43edca03839e7c29e1e15e5bcd6ad6a075e80695 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 19 Oct 2022 11:00:31 +0200 Subject: [PATCH] eclass/fcaps: Sync with Gentoo It's from Gentoo commit 619f45e405c8525af36c8b860df263838a26ab6e. --- .../src/third_party/portage-stable/eclass/fcaps.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass index a5f88e9284..d1860f5ac9 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass @@ -46,7 +46,7 @@ case ${EAPI} in *) IDEPEND="filecaps? ( sys-libs/libcap )" ;; esac -# @ECLASS-VARIABLE: FILECAPS +# @ECLASS_VARIABLE: FILECAPS # @DEFAULT_UNSET # @DESCRIPTION: # An array of fcap arguments to use to automatically execute fcaps. See that @@ -83,18 +83,18 @@ esac # # If the system is unable to set capabilities, it will use the specified user, # group, and mode (presumably to make the binary set*id). The defaults there -# are root:0 and 4711. Otherwise, the ownership and permissions will be +# are 0:0 and 4711. Otherwise, the ownership and permissions will be # unchanged. fcaps() { debug-print-function ${FUNCNAME} "$@" - if [[ ${EUID} != 0 ]] ; then + if [[ ${EUID} -ne 0 ]] ; then einfo "Insufficient privileges to execute ${FUNCNAME}, skipping." return 0 fi # Process the user options first. - local owner='root' + local owner='0' local group='0' local mode='4711' local caps_mode='711'