Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Enable SELinux
[find] Enable -context. Contributes to JB#46939

Tar has also some support for including SELinux context in archives.
This also enables SELinux on many other commands found in busybox-static
binary.

Signed-off-by: Tomi Leppänen <tomi.leppanen@jolla.com>
  • Loading branch information
Tomin1 committed Aug 23, 2019
1 parent 23b0122 commit f80535d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion rpm/busybox-sailfish.config
Expand Up @@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_SELINUX is not set
CONFIG_SELINUX=y
# CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SYSLOG_INFO is not set
# CONFIG_FEATURE_SYSLOG is not set
Expand Down
6 changes: 3 additions & 3 deletions rpm/busybox-static.config
Expand Up @@ -32,7 +32,7 @@ CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
# CONFIG_SELINUX is not set
CONFIG_SELINUX=y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SYSLOG_INFO=y
CONFIG_FEATURE_SYSLOG=y
Expand Down Expand Up @@ -185,7 +185,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_TO_COMMAND=y
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
# CONFIG_FEATURE_TAR_SELINUX is not set
CONFIG_FEATURE_TAR_SELINUX=y
CONFIG_UNZIP=y
CONFIG_FEATURE_UNZIP_CDF=y
# CONFIG_FEATURE_UNZIP_BZIP2 is not set
Expand Down Expand Up @@ -462,7 +462,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_DELETE=y
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
CONFIG_FEATURE_FIND_CONTEXT=y
CONFIG_FEATURE_FIND_LINKS=y
CONFIG_FEATURE_FIND_EXECUTABLE=y
CONFIG_FEATURE_FIND_QUIT=y
Expand Down
5 changes: 3 additions & 2 deletions rpm/busybox.spec
Expand Up @@ -10,6 +10,9 @@ Source3: busybox-sailfish.config
Patch0: 0001-Copy-extended-attributes-if-p-flag-is-provided-to-cp.patch
Patch1: 0002-applets-Busybox-in-usr-bin-instead-of-bin.patch
URL: https://git.sailfishos.org/mer-core/busybox
BuildRequires: glibc-static
BuildRequires: libselinux-static libsepol-static
BuildRequires: pcre-static

Obsoletes: time <= 1.7
Provides: time > 1.7
Expand All @@ -18,8 +21,6 @@ Provides: time > 1.7
Obsoletes: iputils <= 20101006
Provides: iputils > 20101006

BuildRequires: glibc-static

%define debug_package %{nil}

%description
Expand Down

0 comments on commit f80535d

Please sign in to comment.