dbus: selinux file context support
PATCH v10 1/11 dbus: selinux file context support
From: Matt Weber <[email protected]>
---
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- No changes
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5
- No changes
Changes v1 -> v4:
- Did not exist
--- package/dbus/S30dbus | 4 ++++ 1 file changed, 4 insertions(+)
package/dbus/S30dbus +4 -0
@@ -17,6 +17,10 @@ [ -d /var/run/dbus ] || mkdir -p /var/run/dbus [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys [ -d /tmp/dbus ] || mkdir -p /tmp/dbus +[ -d /var/lib/dbus ] || mkdir -p /var/lib/dbus +if [ -e /sbin/restorecon ]; then + restorecon -R /var/run/dbus /var/lock/subsys /tmp/dbus /var/lib/dbus +fi RETVAL=0
Signature · 1 line
2.5.0
PATCH v10 2/11 linux-pam: selinux audit dependencies
From: Niranjan <[email protected]>
---
Changes v9 -> v10:
- New patch created for selinux audit dependencies.
- Added comment to justify that host-linux-pam is needed for creating pam conf files.
- Updated Indentation and modified as per comments (suggested by Thomas)
Changes v1 -> v9:
- Did not exist
--- package/linux-pam/linux-pam.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
package/linux-pam/linux-pam.mk +18 -1
@@ -8,15 +8,18 @@ LINUX_PAM_VERSION = 1.1.8 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 LINUX_PAM_SITE = http://linux-pam.org/library LINUX_PAM_INSTALL_STAGING = YES +# cracklib and libdb are not currently present in buildroot LINUX_PAM_CONF_OPTS = \ --disable-prelude \ --disable-isadir \ --disable-nis \ --disable-db \ + --disable-cracklib \ --disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf +# host-linux-pam is needed for creating pam conf files +LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf host-linux-pam LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3c LINUX_PAM_LICENSE_FILES = Copyright
@@ -26,6 +29,20 @@ LINUX_PAM_DEPENDENCIES += gettext LINUX_PAM_MAKE_OPTS += LIBS=-lintl endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LINUX_PAM_CONF_OPTS += --enable-selinux +LINUX_PAM_DEPENDENCIES += libselinux +else +LINUX_PAM_CONF_OPTS += --disable-selinux +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +LINUX_PAM_CONF_OPTS += --enable-audit +LINUX_PAM_DEPENDENCIES += audit +else +LINUX_PAM_CONF_OPTS += --disable-audit +endif + # Install default pam config (deny everything) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/other.pam \
Signature · 1 line
2.5.0
PATCH v10 2/11 linux-pam: selinux audit dependencies
Dear Niranjan Reddy,
There is no commit log, and the commit title is really unclear. Maybe it should be:
linux-pam: add optional libselinux and audit dependencies
package/linux-pam/linux-pam.mk LINUX_PAM_VERSION = 1.1.8 · line 11
Quoted 9 lines · Niranjan Reddy
package/linux-pam/linux-pam.mk +1
-0@@ -8,15 +8,18 @@ LINUX_PAM_VERSION = 1.1.8 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 LINUX_PAM_SITE = http://linux-pam.org/library LINUX_PAM_INSTALL_STAGING = YES +# cracklib and libdb are not currently present in buildroot
Why are you specifically talking about cracklib and libdb, and not about --disable-prelude, --disable-nis, and so on? While I'm generally all for adding comments, I believe in this case it is not very useful.
package/linux-pam/linux-pam.mk LINUX_PAM_VERSION = 1.1.8 · line 17
Quoted 6 lines
package/linux-pam/linux-pam.mk +1
-0LINUX_PAM_CONF_OPTS = \ --disable-prelude \ --disable-isadir \ --disable-nis \ --disable-db \ + --disable-cracklib \
This change seemingly has nothing to do with the commit title, so it should be part of a separate patch (unless there is a justification for this change to be related).
package/linux-pam/linux-pam.mk LINUX_PAM_VERSION = 1.1.8 · line 22
Quoted 6 lines
package/linux-pam/linux-pam.mk +2
-1--disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf +# host-linux-pam is needed for creating pam conf files +LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf host-linux-pam
But how is the current linux-pam package working? What change makes this host-linux-pam dependency now necessary? How is this related to adding the selinux and audit dependencies?
Also, this patch is PATCH 2 in your series, but the host variant of linux-pam only gets introduced in PATCH 4. So if I apply the patches in order from your series, and stop after PATCH 2 or PATCH 3, things will be broken.
Quoted 10 lines
package/linux-pam/linux-pam.mk +3
-0LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3c LINUX_PAM_LICENSE_FILES = Copyright@@ -26,6 +29,20 @@ LINUX_PAM_DEPENDENCIES += gettext LINUX_PAM_MAKE_OPTS += LIBS=-lintl endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LINUX_PAM_CONF_OPTS += --enable-selinux +LINUX_PAM_DEPENDENCIES += libselinux
package/linux-pam/linux-pam.mk LINUX_PAM_DEPENDENCIES += gettext · line 44
Quoted 10 lines
package/linux-pam/linux-pam.mk +10
-0+else +LINUX_PAM_CONF_OPTS += --disable-selinux +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +LINUX_PAM_CONF_OPTS += --enable-audit +LINUX_PAM_DEPENDENCIES += audit +else +LINUX_PAM_CONF_OPTS += --disable-audit +endif
This part looks good, and seems to be the only part related to the commit title.
package/linux-pam/linux-pam.mk LINUX_PAM_DEPENDENCIES += gettext · line 48
Quoted 4 lines
package/linux-pam/linux-pam.mk +1
-0+ # Install default pam config (deny everything) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/other.pam \
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 3/11 linux-pam: selinux system auth
In reply to Niranjan ReddyFrom: Niranjan <[email protected]>
---
Changes v9 -> v10:
- Dropped host linux-pam variant,optional selinux and audit dependencies and created seperate Patches (Suggedted by Thomas).
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- Removed sub-shell around the config file install block and refactored the block to use absolute paths for the copying (Suggested by Samuel)
- Changed the enable-db=no configure option to disable-db to be consistent with the rest of the configure options (Suggested by Samuel)
Changes v6 -> v7:
- Added missing host-pkgconf dependency and removed unneeded host-autoconf dependency(Clayton S.)
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Dropping unneeded patch (Clayton S.)
Changes v1 -> v4:
- Did not exist
--- package/linux-pam/system-auth.pamd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 package/linux-pam/system-auth.pamd
package/linux-pam/system-auth.pamd new file +15 -0
@@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_unix.so +auth required pam_deny.so + +account required pam_unix.so + +#password required pam_cracklib.so try_first_pass retry=3 +password sufficient pam_unix.so md5 shadow try_first_pass +password required pam_deny.so + +session optional pam_keyinit.so revoke +session required pam_limits.so +session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid +session required pam_unix.so
Signature · 1 line
2.5.0
PATCH v10 3/11 linux-pam: selinux system auth
Hello,
Quoted 11 lines · Niranjan Reddy
package/linux-pam/system-auth.pamd new file +5
-0@@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_unix.so +auth required pam_deny.so +
package/linux-pam/system-auth.pamd line 15
Quoted 10 lines
package/linux-pam/system-auth.pamd new file +10
-0+account required pam_unix.so + +#password required pam_cracklib.so try_first_pass retry=3 +password sufficient pam_unix.so md5 shadow try_first_pass +password required pam_deny.so + +session optional pam_keyinit.so revoke +session required pam_limits.so +session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid +session required pam_unix.so
This patch is just adding one file, which doesn't get used anywhere. Yes, I know, it will be used in PATCH 4, but either it should be squashed in PATCH 4 itself (which is reasonable since PATCH 4 isn't that large), or if you want to keep it separate, indicate how it will be used in the commit log, and explains what it is doing.
Remember: the people reviewing your code need to *understand* what's going on, and are not necessarily selinux/pam experts. So you have to give a sufficient amount of details.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 4/11 linux-pam: selinux host dependencies
In reply to Niranjan ReddyFrom: Niranjan <[email protected]>
---
Changes v9 -> v10:
- New Patch created for selinux host dependencies.
Changes v1 -> v9:
- Did not exist
--- package/linux-pam/linux-pam.mk | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
package/linux-pam/linux-pam.mk +35 -0
@@ -49,6 +49,41 @@ define LINUX_PAM_INSTALL_CONFIG $(TARGET_DIR)/etc/pam.d/other endef +# Use the host-pam pam_conv1 app to create the pam.d files +define LINUX_PAM_CONFIG_FILE_TARGET_INSTALL + if [ -d $(TARGET_DIR)/etc/pam.d/ ]; then \ + mv $(TARGET_DIR)/etc/pam.d/ $(TARGET_DIR)/etc/pam.d.orig/; \ + fi; \ + cd $(TARGET_DIR)/etc/ && cat $(@D)/conf/pam.conf | $(HOST_DIR)/usr/bin/pam_conv1; \ + if [ -d $(TARGET_DIR)/etc/pam.d.orig ]; then \ + cp -a $(TARGET_DIR)/etc/pam.d/* $(TARGET_DIR)/etc/pam.d.orig/; \ + rm -rf $(TARGET_DIR)/etc/pam.d/; \ + mv $(TARGET_DIR)/etc/pam.d.orig/ $(TARGET_DIR)/etc/pam.d/; \ + fi; + $(INSTALL) -D -m 0644 package/linux-pam/system-auth.pamd $(TARGET_DIR)/etc/pam.d/system-auth +endef + +LINUX_PAM_POST_INSTALL_TARGET_HOOKS += LINUX_PAM_CONFIG_FILE_TARGET_INSTALL LINUX_PAM_POST_INSTALL_TARGET_HOOKS += LINUX_PAM_INSTALL_CONFIG +HOST_LINUX_PAM_DEPENDENCIES = host-flex host-pkgconf + +HOST_LINUX_PAM_CONF_OPTS = + --disable-rpath \ + --enable-read-both-confs \ + --disable-regenerate-docu \ + --disable-isadir \ + --disable-nis \ + --enable-securedir=/lib/security \ + --disable-prelude \ + --disable-cracklib \ + --disable-lckpwdf \ + --disable-db \ + --disable-selinux \ + --disable-audit \ + +define HOST_LINUX_PAM_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/conf/pam_conv1/pam_conv1 $(HOST_DIR)/usr/bin/ +endef $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
2.5.0
PATCH v10 4/11 linux-pam: selinux host dependencies
Dear Niranjan Reddy,
Again, missing commit log. The commit title is completely unclear, and does not even seem to be related to the change being done. How adding a host variant of the linux-pam package and using this host variant is related to "selinux host dependencies" ?
Quoted 1 line · Niranjan Reddy
+# Use the host-pam
pam_conv1app to create the pam.d files
So that's why linux-pam needs to depend on host-linux-pam. So the addition of this dependency in PATCH 2 should in fact go in this patch.
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 54
Quoted 2 lines
package/linux-pam/linux-pam.mk +2
-0+define LINUX_PAM_CONFIG_FILE_TARGET_INSTALL + if [ -d $(TARGET_DIR)/etc/pam.d/ ]; then \
Is this conditional really needed? Are there situations where linux-pam will not install things in /etc/pam.d/ ?
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 56
Quoted 2 lines
package/linux-pam/linux-pam.mk +2
-0+ mv $(TARGET_DIR)/etc/pam.d/ $(TARGET_DIR)/etc/pam.d.orig/; \ + fi; \
; \ not needed here
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 57
Quoted 1 line
package/linux-pam/linux-pam.mk +1
-0+ cd $(TARGET_DIR)/etc/ && cat $(@D)/conf/pam.conf | $(HOST_DIR)/usr/bin/pam_conv1; \
Ditto
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 62
Quoted 5 lines
package/linux-pam/linux-pam.mk +5
-0+ if [ -d $(TARGET_DIR)/etc/pam.d.orig ]; then \ + cp -a $(TARGET_DIR)/etc/pam.d/* $(TARGET_DIR)/etc/pam.d.orig/; \ + rm -rf $(TARGET_DIR)/etc/pam.d/; \ + mv $(TARGET_DIR)/etc/pam.d.orig/ $(TARGET_DIR)/etc/pam.d/; \ + fi;
; not needed
Review
Quoted 2 lines
(quoted diff) +2
-0+ $(INSTALL) -D -m 0644 package/linux-pam/system-auth.pamd $(TARGET_DIR)/etc/pam.d/system-auth +endef
linux-pam used to be packaged without this complicated dance. Can you add some justification about why we're doing this complicated dance, and what it brings?
Quoted 12 lines
package/linux-pam/linux-pam.mk +10
-0+ +LINUX_PAM_POST_INSTALL_TARGET_HOOKS += LINUX_PAM_CONFIG_FILE_TARGET_INSTALL LINUX_PAM_POST_INSTALL_TARGET_HOOKS += LINUX_PAM_INSTALL_CONFIG +HOST_LINUX_PAM_DEPENDENCIES = host-flex host-pkgconf + +HOST_LINUX_PAM_CONF_OPTS = + --disable-rpath \ + --enable-read-both-confs \ + --disable-regenerate-docu \ + --disable-isadir \ + --disable-nis \
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 86
Quoted 10 lines
package/linux-pam/linux-pam.mk +10
-0+ --enable-securedir=/lib/security \ + --disable-prelude \ + --disable-cracklib \ + --disable-lckpwdf \ + --disable-db \ + --disable-selinux \ + --disable-audit \ + +define HOST_LINUX_PAM_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/conf/pam_conv1/pam_conv1 $(HOST_DIR)/usr/bin/
We need a full destination path when $(INSTALL) -D is used, so $(HOST_DIR)/usr/bin/pam_conv1.
Quoted 1 line
+endef
One empty newline here please.
Quoted 2 lines
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 4/11 linux-pam: selinux host dependencies
Hello Thomas,
Quoted 7 lines · Thomas Petazzoni
Dear Niranjan Reddy,
Again, missing commit log. The commit title is completely unclear, and does not even seem to be related to the change being done. How adding a host variant of the linux-pam package and using this host variant is related to "selinux host dependencies" ?
Agree, I'll add commit log.
Quoted 26 lines · Niranjan Reddy
Quoted 2 lines
+# Use the host-pam
pam_conv1app to create the pam.d filesSo that's why linux-pam needs to depend on host-linux-pam. So the addition of this dependency in PATCH 2 should in fact go in this patch.
package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG · line 54
Quoted 2 lines
package/linux-pam/linux-pam.mk +2
-0+define LINUX_PAM_CONFIG_FILE_TARGET_INSTALL + if [ -d $(TARGET_DIR)/etc/pam.d/ ]; then \Is this conditional really needed? Are there situations where linux-pam will not install things in
/etc/pam.d/?Quoted 1 line
+ mv $(TARGET_DIR)/etc/pam.d/ $(TARGET_DIR)/etc/pam.d.orig/;
\
Quoted 1 line
+ fi; \
; \ not needed here
Quoted 1 line
+ cd $(TARGET_DIR)/etc/ && cat $(@D)/conf/pam.conf |
$(HOST_DIR)/usr/bin/pam_conv1; \
Ditto
Review
Quoted 2 lines
(quoted diff) +2
-0+ if [ -d $(TARGET_DIR)/etc/pam.d.orig ]; then \ + cp -a $(TARGET_DIR)/etc/pam.d/*
Quoted 8 lines
$(TARGET_DIR)/etc/pam.d.orig/; \
Review
Quoted 2 lines
(quoted diff) +2
-0+ rm -rf $(TARGET_DIR)/etc/pam.d/; \ + mv $(TARGET_DIR)/etc/pam.d.orig/ $(TARGET_DIR)/etc/pam.d/;\
Quoted 1 line
+ fi;
; not needed
Are you sure you want me to remove these ? If I remove " ; \" it gives
me compilation error. when I see
build-root manual in section 17.15.2 , if condition statements are ended
with semicolon. Please let me know.
Quoted 34 lines
Quoted 2 lines
+ $(INSTALL) -D -m 0644 package/linux-pam/system-auth.pamd
$(TARGET_DIR)/etc/pam.d/system-auth
Quoted 1 line
+endef
linux-pam used to be packaged without this complicated dance. Can you add some justification about why we're doing this complicated dance, and what it brings?
Review
Quoted 2 lines
(quoted diff) +2
-0+ +LINUX_PAM_POST_INSTALL_TARGET_HOOKS +=
LINUX_PAM_CONFIG_FILE_TARGET_INSTALLQuoted 10 lines
LINUX_PAM_POST_INSTALL_TARGET_HOOKS+=LINUX_PAM_INSTALL_CONFIGpackage/linux-pam/linux-pam.mk +8
-0+HOST_LINUX_PAM_DEPENDENCIES = host-flex host-pkgconf + +HOST_LINUX_PAM_CONF_OPTS = + --disable-rpath \ + --enable-read-both-confs \ + --disable-regenerate-docu \ + --disable-isadir \ + --disable-nis \package/linux-pam/linux-pam.mk define LINUX_PAM_INSTALL_CONFIG
Quoted 10 lines
package/linux-pam/linux-pam.mk +10
-0+ --enable-securedir=/lib/security \ + --disable-prelude \ + --disable-cracklib \ + --disable-lckpwdf \ + --disable-db \ + --disable-selinux \ + --disable-audit \ + +define HOST_LINUX_PAM_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/conf/pam_conv1/pam_conv1$(HOST_DIR)/usr/bin/
Quoted 3 lines
We need a full destination path when $(INSTALL) -D is used, so $(HOST_DIR)/usr/bin/pam_conv1.
Agree.
Quoted 5 lines
Quoted 2 lines
+endef
One empty newline here please.
Agree.
Quoted 11 lines
Quoted 3 lines
$(eval $(autotools-package))
+$(eval $(host-autotools-package))Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Thanks,
Niranjan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160226/c8213db3/attachment.html>
PATCH v10 4/11 linux-pam: selinux host dependencies
Niranjan,
Quoted 8 lines · Niranjan Reddy
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if [ -d $(TARGET_DIR)/etc/pam.d.orig ]; then \ + cp -a $(TARGET_DIR)/etc/pam.d/*$(TARGET_DIR)/etc/pam.d.orig/; \
Review
Quoted 2 lines
(quoted diff) +2
-0+ rm -rf $(TARGET_DIR)/etc/pam.d/; \ + mv $(TARGET_DIR)/etc/pam.d.orig/ $(TARGET_DIR)/etc/pam.d/;\
Quoted 1 line
+ fi;
Quoted 7 lines
Quoted 2 lines
; not needed
Are you sure you want me to remove these ? If I remove " ; \" it gives
me compilation error. when I see
build-root manual in section 17.15.2 , if condition statements are ended
with semicolon. Please let me know.
I'm not asking you to remove all ; \, but only to remove the ones that separate independent commands, since they are useless. I.e you are currently doing:
1 if [ ... ] ; then \
2 cp -a ..... ; \
3 fi ; \
4 cd $(TARGET_DIR) .... ; \
5 if [ ... ] ; then \
6 cp -a .... ; \
7 fi ; \
8 $(INSTALL) -D ...
The \ or ; \ is needed on lines 1, 2, 4 and 5. But not on lines 3 and 7.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 5/11 busybox: applets as individual binaries
In reply to Niranjan ReddyFrom: Clayton Shotwell <[email protected]>
The individual binaries option of busybox allows for the applets that would usually be symlinks to be built as individual applications that link against a shared library.
This feature is needed for SELinux to allow the applications to run under the correct SELinux context.
The patch being added allows the individual applications to be installed and will be upstreamed to the busybox developers.
The initial work for this change was done by Thomas Petazzoni <[email protected]>.
---
Changes v9 -> v10:
- Removed 0002-applets-Add-installation-of-individual-binaries.patch as it was upstreamed.
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- Changed individual binaries comment to be !BR2_bfin (Suggested by Samuel)
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Renamed to follow latest patch naming convention (Matt W.)
- Updated to use BR2_STATIC_LIBS instead of old PREFERRED (Matt W.)
- Added depends to make sure bfin can't build shared lib busybox lib for individual binary use. Looks like shared lib creation doesn't error out but the objects don't get placed into the elf. Then the trylink fails on linking the first individual applet. (Matt W.)
- Made suid permissions setting dynamic for applets actually being installed (Clayton S.)
Changes v1 -> v4:
- Did not exist
--- package/busybox/Config.in | 9 +++++++++ package/busybox/busybox.mk | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)
package/busybox/Config.in +9 -0
@@ -51,6 +51,15 @@ config BR2_PACKAGE_BUSYBOX_SELINUX crond, then individual binaries have to be enabled for the SELinux type transitions to occur properly. +config BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES + bool "Individual binaries" + depends on !BR2_STATIC_LIBS + depends on !BR2_bfin # libbusybox.so link issue + +comment "Busybox individual binaries depends on dynamic libraries" + depends on BR2_STATIC_LIBS + depends on !BR2_bfin + config BR2_PACKAGE_BUSYBOX_WATCHDOG bool "Install the watchdog daemon startup script" help
package/busybox/busybox.mk +41 -0
68 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v10 5/11 busybox: applets as individual binaries
Hello,
Quoted 17 lines · Niranjan Reddy
package/busybox/busybox.mk +17
-0+ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y) +define BUSYBOX_PERMISSIONS + /usr/share/udhcpc/default.script f 755 0 0 - - - - - +endef + +# Set permissions on all applets with BB_SUID_REQUIRE and BB_SUID_MAYBE. The +# permissions are pulled from the applets.h file that is generated during +# the build and used to determine all of the possible applets. The permissions +# file is generated and added to the list of device tables used by makedevs to +# set file permissions. +define BUSYBOX_MAKEDEV_PERMISSIONS + if [ -f $(@D)/.buildroot_permissions ]; then \ + rm $(@D)/.buildroot_permissions; \ + fi; \ + touch $(@D)/.buildroot_permissions; \ + for app in `grep -r -e "APPLET.*BB_SUID_REQUIRE\|APPLET.*BB_SUID_MAYBE" $(@D)/include/applets.h \ + | sed -e 's/,.*//' -e 's/.*(//'`; \
package/busybox/busybox.mk BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAG · line 79
Quoted 10 lines
package/busybox/busybox.mk +10
-0+ do \ + temp=`grep -w $${app} $(@D)/busybox.links`; \ + if [ -n "$${temp}" ]; then \ + echo "$${temp} f 4755 0 0 - - - - -" >> $(@D)/.buildroot_permissions; \ + fi; \ + done +endef +BUSYBOX_POST_INSTALL_TARGET_HOOKS += BUSYBOX_MAKEDEV_PERMISSIONS +BR2_ROOTFS_DEVICE_TABLE += $(BUSYBOX_DIR)/.buildroot_permissions +else
I already said it in previous reviews, but I really don't like this. I don't like that you're appending directly to BR2_ROOTFS_DEVICE_TABLE, and I don't like the complicated logic.
There are 6 applets with BB_SUID_REQUIRE, and 6 applets with BB_SUID_MAYBE. So I would prefer to have:
define BUSYBOX_PERMISSIONS
/bin/ping f f4755 0 0 - - - - - ...
endef
for all 12 applets. The issue you will probably encounter is that makedevs will fail if you specify a file that doesn't exist. My proposal to solve this (I'm Cc'ing Yann here to get his opinion) is to add a marker or flag to tell makedevs "don't fail if the file doesn't exist". Maybe:
-/bin/ping
or something like this.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 6/11 policycoreutils: new package
In reply to Niranjan ReddyFrom: Clayton Shotwell <[email protected]>
---
Changes v9 -> v10:
- Added LDFLAGS for HOST_POLICYCOREUTILS_MAKE_OPTS:LDFLAGS="-Wl,-rpath,$(HOST_DIR)/usr/lib"
Changes v8 -> v9:
- Cleaned up DESTDIR references in patches to use PREFIX instead (suggested by Samuel)
- Added the use of the ARCH to pass the host and target architectures to the build (Suggested by Samuel)
Changes v7 -> v8:
- Cleaned up indentations in policycoreutils.mk (Suggested by Thomas P.)
- Fixed sed separator (Suggested by Thomas P.)
- Cleaned up cross compile patches and make options (Suggested by Thomas P.)
- Changed dbus-glib dependency to a select and cleaned up the dependencies (Suggested by Thomas P.)
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Updated depends and removed glibc dependency (Matt W.)
- Updated site to github (Matt W.)
- Added host python 2/3 support (Matt W.)
- Removed sandbox and mctrans support (Matt W.)
- Removed restorcon init script (Matt W.)
- Agree as optional settings were removed so menu isn't needed (Suggested by Ryan B. and Thomas P.)
- added Config.in select for LIBCAP_NG (Suggested by Thomas P.)
- cleaned up pam/audit ifeq (Suggested by Thomas P.)
- fixed CFLAGS to include target_cflags instead of += (Suggested by Thomas P.)
- Refactored lists of build/install steps into loops (Suggested by Thomas P.)
- Removed += on first host depends assignment (Suggested by Thomas P.)
- Refactored host make opts assignments (Suggested by Thomas P.)
- Limited to glibc because of fts.h, some uclibc toolchains have it others don't. Eventually this would be good to fix with the updated method of file traversal. (Matt W.)
- Gettext fixups for uclibc support. Counter productive as we now limit to glibc only. (Matt W.)
- Added musl as possible lib type (Matt W.)
- Removed largefile dependency (Clayton S.)
- Changed dbus-glib select to a depends on in the Config.in (suggested by Ryan B.)
Changes v3 -> v4:
- Add a select for the libselinux Python bindings when debugging is enabled. This will cause Python to be built for the target (suggested by Thomas P.)
- Cleaned up the configure comments (suggested by Thomas).
- Added a dependency on BR2_USE_MMU for the debugging option because python requires it (suggested by Thomas P.)
- Removed the dependencies on audit and linux-pam. Both packages are now optional dependencies based on whether or not the package has been selected
- Moved the dependency on dbus-glib to only the restorecond option where it is used
- Added a INSTALL_INIT_SYSV for the restorecond daemon rather than just installing it directly
- Adding a dependency on glibc
- Removed the clean commands
Changes v2 -> v3:
- Added dependencies on BR2_TOOLCHAIN_HAS_THREADS and BR2_LARGEFILE (suggested by Thomas P.)
- Changes patch naming convention (suggested by Thomas P.)
- Added selects for linux-pam and audit
Changes v1 -> v2:
- General cleanup to the mk file to conform to the standard format
- Fixed the patch naming to avoid using the version number
- Cleaned up the patch to include a signed-off-by line
- Changed package dependencies into selects in the config
--- package/Config.in | 1 + ...IR-to-all-paths-that-use-an-absolute-path.patch | 275 +++++++++++++++++++++ .../0002-Allow-CFLAGS-to-be-overwritten.patch | 57 +++++ ...licy-python-install-arguments-to-be-a-var.patch | 42 ++++ package/policycoreutils/Config.in | 59 +++++ package/policycoreutils/policycoreutils.hash | 2 + package/policycoreutils/policycoreutils.mk | 110 +++++++++ 7 files changed, 546 insertions(+) create mode 100644 package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch create mode 100644 package/policycoreutils/0002-Allow-CFLAGS-to-be-overwritten.patch create mode 100644 package/policycoreutils/0003-Change-sepolicy-python-install-arguments-to-be-a-var.patch create mode 100644 package/policycoreutils/Config.in create mode 100644 package/policycoreutils/policycoreutils.hash create mode 100644 package/policycoreutils/policycoreutils.mk
package/Config.in +1 -0
@@ -1518,6 +1518,7 @@ menu "Real-Time" endmenu menu "Security" + source "package/policycoreutils/Config.in" source "package/setools/Config.in" endmenu
package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch new file +275 -0
275 lines not on this page · raw message
package/policycoreutils/0002-Allow-CFLAGS-to-be-overwritten.patch new file +57 -0
57 lines not on this page · raw message
package/policycoreutils/0003-Change-sepolicy-python-install-arguments-to-be-a-var.patch new file +42 -0
42 lines not on this page · raw message
package/policycoreutils/Config.in new file +59 -0
59 lines not on this page · raw message
package/policycoreutils/policycoreutils.hash new file +2 -0
@@ -0,0 +1,2 @@ +# https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 b6881741f9f9988346a73bfeccb0299941dc117349753f0ef3f23ee86f06c1b5 policycoreutils-2.1.14.tar.gz
package/policycoreutils/policycoreutils.mk new file +110 -0
110 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v10 6/11 policycoreutils: new package
Dear Niranjan Reddy,
package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch line 4
Quoted 10 lines · Niranjan Reddy
package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch new file +4
-0@@ -0,0 +1,275 @@ +From 92d7cc3539f8bfc68b2f2bf688375647abf73ee7 Mon Sep 17 00:00:00 2001 +From: Clayton Shotwell <[email protected]> +Date: Fri, 10 Jul 2015 11:44:08 -0500 +Subject: [PATCH 1/3] Add DESTDIR to all paths that use an absolute path
This patch is not only adding DESTDIR, but also PREFIX to a number of places. I'm fine with having both aspects in the same patch since it's really related, but it should be indicated in the patch description.
Also, we prefer to have patches formated without the 1/3, 2/3 and 3/3 sequence number, so please use "git format-patch -N" when you generate patches that apply to packages in Buildroot.
Quoted 14 lines
package/policycoreutils/policycoreutils.mk new file +8
-0@@ -0,0 +1,110 @@ +################################################################################ +# +# policycoreutils +# +################################################################################ + +POLICYCOREUTILS_VERSION = 2.1.14 +POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423
package/policycoreutils/policycoreutils.mk line 18
Quoted 10 lines
package/policycoreutils/policycoreutils.mk new file +10
-0+POLICYCOREUTILS_LICENSE = GPLv2 +POLICYCOREUTILS_LICENSE_FILES = COPYING + +# gettext for load_policy.c use of libintl_* functions +POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(if $(BR2_NEEDS_GETTEXT),gettext) + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +POLICYCOREUTILS_DEPENDENCIES += linux-pam +POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y +define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS
This variable is not used anywhere.
Quoted 12 lines
package/policycoreutils/policycoreutils.mk new file +12
-0+ $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole + $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init +endef +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +POLICYCOREUTILS_DEPENDENCIES += audit +POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y +endif + +# Enable LSPP_PRIV if both audit and linux pam are enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy)
package/policycoreutils/policycoreutils.mk line 40
Quoted 10 lines
package/policycoreutils/policycoreutils.mk new file +10
-0+POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y +endif + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information +POLICYCOREUTILS_MAKE_OPTS += \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + LDFLAGS="$(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)" \
So you're passing some LDFLAGS here...
package/policycoreutils/policycoreutils.mk line 42
Quoted 2 lines
package/policycoreutils/policycoreutils.mk new file +2
-0+ ARCH="$(BR2_ARCH)" \ + LDFLAGS="-Wl,-rpath,$(HOST_DIR)/usr/lib"
... and overriding them immediately afterwards. And with something completely bogus: it is completely broken to build *target* binaries with an rpath pointing to $(HOST_DIR)/usr/lib. It doesn't make any sense, so I'm not sure how this ended up here.
package/policycoreutils/policycoreutils.mk line 76
Quoted 12 lines
package/policycoreutils/policycoreutils.mk new file +12
-0+HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage host-dbus-glib host-sepolgen host-setools + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information +HOST_POLICYCOREUTILS_MAKE_OPTS = \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ + PYTHON="$(HOST_DIR)/usr/bin/python" \ + PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \ + ARCH="$(HOSTARCH)" \ + LDFLAGS="-Wl,-rpath,$(HOST_DIR)/usr/lib"
Please pass
LDFLAGS="$(HOST_LDFLAGS)"
which already contains the -Wl,rpath,... dance.
Thanks!
Other than that, this patch looks good. Can you fix the remaining issues, and send an updated version?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 7/11 qemu x86 selinux: base br defconfig
In reply to Niranjan ReddyFrom: Clayton Shotwell <[email protected]>
This will build a base SELinux system that boots with SELinux in permissive mode. Also adding documentation on how to use it.
---
Changes v9 -> v10:
- Changed version number of QEMU from 2.2.1 to 2.3.0
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- No changes
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Update the qemu_x86_defconfig to the 4.0 kernel series (Clayton S.)
Changes v1 -> v4:
- Did not exist
--- board/qemu/x86/linux-4.0-selinux.config | 77 +++++++++++++++++++++++++++++++++ board/qemu/x86/readme.txt | 17 ++++++++ configs/qemu_x86_selinux_defconfig | 67 ++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 board/qemu/x86/linux-4.0-selinux.config create mode 100644 configs/qemu_x86_selinux_defconfig
board/qemu/x86/linux-4.0-selinux.config new file +77 -0
@@ -0,0 +1,77 @@ +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_AUDIT=y +# CONFIG_COMPAT_BRK is not set +CONFIG_MODULES=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_SCHED_OMIT_FRAME_POINTER is not set +# CONFIG_MTRR_SANITIZER is not set +# CONFIG_SECCOMP is not set +# CONFIG_RELOCATABLE is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +# CONFIG_FIRMWARE_IN_KERNEL is not set +# CONFIG_BLK_DEV is not set +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_PIIX=y +CONFIG_NETDEVICES=y +CONFIG_NE2K_PCI=y +CONFIG_8139CP=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_HW_RANDOM is not set +# CONFIG_HWMON is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_HDA_INTEL=y +# CONFIG_USB_SUPPORT is not set +# CONFIG_X86_PLATFORM_DEVICES is not set +# CONFIG_DMIID is not set +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_FRAME_POINTER is not set +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_CRYPTO_ANSI_CPRNG=y +# CONFIG_VIRTUALIZATION is not set
board/qemu/x86/readme.txt +17 -0
@@ -7,3 +7,20 @@ Optionally add -smp N to emulate a SMP system with N CPUs. The login prompt will appear in the graphical window. Tested with QEMU 2.3.0 + +------------------------------------------------------------------- + +Run the SElinux target emulation with: + + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append "root=/dev/sda rw console=ttyS0 selinux=1" -net nic,model=rtl8139 -net user -display none -serial stdio + +The emulation should reboot once the first time for relabeling and +then provide a login prompt. The login is username root and password +root because PAM requires a password in this secure configuration. To +enable SELinux enforcing at boot, login and edit the +/etc/selinux/config and set SELINUX to enforcing. Save and make sure +to "sync" before restarting the emulation as the ext2 fs would +otherwise corrupt when the emulation exits. After enforcing is +default, the selinux= provided as part of the qemu "append" above can +be used to turn enforcing on/off. This configuration would be tailored +as part of a targets refpolicy customization.
configs/qemu_x86_selinux_defconfig new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v10 7/11 qemu x86 selinux: base br defconfig
Dear Niranjan Reddy,
Quoted 8 lines · Niranjan Reddy
From: Clayton Shotwell <[email protected]>
This will build a base SELinux system that boots with SELinux in permissive mode. Also adding documentation on how to use it.
Signed-off-by Clayton Shotwell <[email protected]>Signed-off-by Matthew Weber <[email protected]>Signed-off-by Niranjan <[email protected]>
I think this defconfig is a very good idea. However, there are some issues with the way things are implemented below.
Quoted 1 line
board/qemu/x86/linux-4.0-selinux.config | 77 +++++++++++++++++++++++++++++++++
Rather than a full defconfig, can you use a defconfig fragment, and combine the regular Qemu x86 defconfig with your SELinux defconfig fragment?
configs/qemu_x86_selinux_defconfig line 5
Quoted 11 lines
configs/qemu_x86_selinux_defconfig new file +5
-0@@ -0,0 +1,67 @@ +# Architecture +BR2_x86_pentiumpro=y + +# Default to the latest Code Sourcery +BR2_TOOLCHAIN_EXTERNAL=y
We normally default to the internal toolchain backend. If using glibc is required for proper SELinux operation, it is fine to use glibc.
configs/qemu_x86_selinux_defconfig line 15
Quoted 10 lines
configs/qemu_x86_selinux_defconfig new file +10
-0+ +# Select SYSV init to provide selinux enabled init +BR2_INIT_SYSV=y + +# Default password to allow PAM login +BR2_TARGET_GENERIC_ROOT_PASSWD="root" + +# Default the shell to bash, sh symlinks to busybox which +# is not compatible with refpolicy +BR2_SYSTEM_BIN_SH_BASH=y
Even with the one file per binary approach of Busybox? sh is going to be a symlink to ash, which is a real binary, very much like sh is going to be a symlink to bash when bash is enabled.
configs/qemu_x86_selinux_defconfig line 21
Quoted 6 lines
configs/qemu_x86_selinux_defconfig new file +6
-0+ +# Pull in SELinux specific file overlay to allow login +# in enforcing mode. +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt board/common_selinux/skeleton_permissions.txt" +BR2_ROOTFS_OVERLAY="board/common_selinux/skeleton" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/common_selinux/post_build.sh"
All those files are only added in PATCH 11/11. So basically this patch and PATCH 11/11 should be merged together.
configs/qemu_x86_selinux_defconfig line 32
Quoted 11 lines
configs/qemu_x86_selinux_defconfig new file +11
-0+ +# Lock to a kernel that's been tested against selinux libs +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.0" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.0-selinux.config" + +# Customized busybox config providing a tailored +# balance of applets vs full apps +BR2_PACKAGE_BUSYBOX_CONFIG="board/common_selinux/busybox-selinux.config"
Ditto, this file is only introduced in PATCH 11/11.
Quoted 25 lines
configs/qemu_x86_selinux_defconfig new file +25
-0+ +# Ensure busybox is built as individual binaries for the +# SELinux refpolicy to work correctly +BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y + +# Audit service +BR2_PACKAGE_AUDIT=y + +# Enhanced authentication with selinux hooks +BR2_PACKAGE_LINUX_PAM=y + +# Full version of login with SELinux support +BR2_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS=y + +# SSH daemon for secure login +BR2_PACKAGE_OPENSSH=y + +# Provides tools for fs security context relabeling +BR2_PACKAGE_POLICYCOREUTILS=y + +# SELinux policy config/definition +BR2_PACKAGE_REFPOLICY=y +
configs/qemu_x86_selinux_defconfig line 67
Quoted 10 lines
configs/qemu_x86_selinux_defconfig new file +10
-0+# Logging daemon +BR2_PACKAGE_RSYSLOG=y + +#rootfs with spare space for fs relabel activity +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 +# BR2_TARGET_ROOTFS_TAR is not set + +# Offline tools for policy analysis/building +BR2_PACKAGE_HOST_CHECKPOLICY=y
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 7/11 qemu x86 selinux: base br defconfig
Hello Thomas,
Quoted 15 lines · Thomas Petazzoni
Dear Niranjan Reddy,
Quoted 8 lines · Niranjan Reddy
From: Clayton Shotwell <[email protected]>
This will build a base SELinux system that boots with SELinux in permissive mode. Also adding documentation on how to use it.
Signed-off-by Clayton Shotwell <[email protected]>Signed-off-by Matthew Weber <[email protected]>Signed-off-by Niranjan <[email protected]>I think this defconfig is a very good idea. However, there are some issues with the way things are implemented below.
Quoted 7 lines
Quoted 1 line
board/qemu/x86/linux-4.0-selinux.config | 77+++++++++++++++++++++++++++++++++
Rather than a full defconfig, can you use a defconfig fragment, and combine the regular Qemu x86 defconfig with your SELinux defconfig fragment?
OK. So should i combine in this manner and make a single configuration file with selinux as optional ??
linux-4.3.config & linux-4.0-selinux.config ==> linux-selinux.config
qemu_x86_defconfig & qemu_x86_selinux_defconfig ==> qemu_x86_optionalselinux_defconfig
Quoted 18 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/configs/qemu_x86_selinux_defconfig
configs/qemu_x86_selinux_defconfig line 5
Quoted 10 lines
new file mode 100644
index 0000000..feb4534configs/qemu_x86_selinux_defconfig new file +5
-0@@ -0,0 +1,67 @@ +# Architecture +BR2_x86_pentiumpro=y + +# Default to the latest Code Sourcery +BR2_TOOLCHAIN_EXTERNAL=yWe normally default to the internal toolchain backend. If using glibc is required for proper SELinux operation, it is fine to use glibc.
Agree. will change to internal toolchain and use glibc.
Quoted 20 lines
configs/qemu_x86_selinux_defconfig line 15
Quoted 10 lines
configs/qemu_x86_selinux_defconfig new file +10
-0+ +# Select SYSV init to provide selinux enabled init +BR2_INIT_SYSV=y + +# Default password to allow PAM login +BR2_TARGET_GENERIC_ROOT_PASSWD="root" + +# Default the shell to bash, sh symlinks to busybox which +# is not compatible with refpolicy +BR2_SYSTEM_BIN_SH_BASH=yEven with the one file per binary approach of Busybox? sh is going to be a symlink to ash, which is a real binary, very much like sh is going to be a symlink to bash when bash is enabled.
configs/qemu_x86_selinux_defconfig
Quoted 4 lines
configs/qemu_x86_selinux_defconfig new file +4
-0+ +# Pull in SELinux specific file overlay to allow login +# in enforcing mode. +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt
board/common_selinux/skeleton_permissions.txt"
Quoted 6 lines
configs/qemu_x86_selinux_defconfig line 21
Quoted 2 lines
configs/qemu_x86_selinux_defconfig new file +2
-0+BR2_ROOTFS_OVERLAY="board/common_selinux/skeleton" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/common_selinux/post_build.sh"All those files are only added in PATCH 11/11. So basically this patch and PATCH 11/11 should be merged together.
Agree.
Quoted 9 lines
configs/qemu_x86_selinux_defconfig line 27
Quoted 8 lines
configs/qemu_x86_selinux_defconfig new file +6
-0+ +# Lock to a kernel that's been tested against selinux libs +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.0" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.0-selinux.config"
Quoted 7 lines
configs/qemu_x86_selinux_defconfig line 32
Quoted 4 lines
configs/qemu_x86_selinux_defconfig new file +4
-0+ +# Customized busybox config providing a tailored +# balance of applets vs full apps +BR2_PACKAGE_BUSYBOX_CONFIG="board/common_selinux/busybox-selinux.config"Ditto, this file is only introduced in PATCH 11/11.
Agree.
Quoted 39 lines
Quoted 26 lines
configs/qemu_x86_selinux_defconfig new file +25
-0+ +# Ensure busybox is built as individual binaries for the +# SELinux refpolicy to work correctly +BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y + +# Audit service +BR2_PACKAGE_AUDIT=y + +# Enhanced authentication with selinux hooks +BR2_PACKAGE_LINUX_PAM=y + +# Full version of login with SELinux support +BR2_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS=y + +# SSH daemon for secure login +BR2_PACKAGE_OPENSSH=y + +# Provides tools for fs security context relabeling +BR2_PACKAGE_POLICYCOREUTILS=y + +# SELinux policy config/definition +BR2_PACKAGE_REFPOLICY=y +configs/qemu_x86_selinux_defconfig line 67
Quoted 10 lines
configs/qemu_x86_selinux_defconfig new file +10
-0+# Logging daemon +BR2_PACKAGE_RSYSLOG=y + +#rootfs with spare space for fs relabel activity +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 +# BR2_TARGET_ROOTFS_TAR is not set + +# Offline tools for policy analysis/building +BR2_PACKAGE_HOST_CHECKPOLICY=yThanks!
Quoted 5 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Thanks,
Niranjan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160301/31caa990/attachment.html>
PATCH v10 8/11 refpolicy: new package
In reply to Niranjan ReddyFrom: Clayton Shotwell <[email protected]>
---
Changed v9 -> v10:
- Removed trailing slash at the end (REFPOLICY_SITE = http://oss.tresys.com/files/refpolicy)
- Adds new menu option to select the SELinux state to be written
to the /etc/selinux/config file for the target (D. Graziano)
Changes v8 -> v9:
- Minor nit picks on spacing (Suggested by Samuel)
Changes v7 -> v8:
- Changes REFPOLICY_MAKE_CMDS to REFPOLICY_MAKE_OPTS (Suggested by Samuel)
- Added a help section to the custom git repo to explain why the refpolicy-contrib option is needed (Suggested by Samuel)
- Added rsync exclusions to ensure no unneeded files are copied during the refpolicy-contrib sync (Suggested by Samuel)
Changes v6 -> v7:
- Moving the refpolicy patch into a version specific folder to prevent it from being applied to the custom git repos. (Clayton S.)
Changes v5 -> v6:
- Fixed references to GIT in config files (Suggested by Ryan B.)
- Removed execute permissions on files (Suggested by Ryan B.)
- Fixed spelling error and changed staging install to always install the documentation (Suggested by Samuel)
Changes v4 -> v5:
- Removed TODO and dependency on glibc (Matt W.)
- Added lib depends to meet policycoreutils limitation on std lib
(Matt W.)
- Added comment for when an option is not defined (Matt W.)
- Removed largefile, locale, and wchar dependencies (Clayton S.)
- Remove dependancy on host-python-pyxml (Ryan B.)
- Forced package to use $(HOST_DIR)/usr/bin/python2 for python executable (Ryan B.)
- Added host-python dependency (Clayton S.)
- Removed config menu (suggested by Thomas P.)
- Added patch to fix awk issue (Clayton S.)
Changes v3 -> v4:
- Added a dependency on host-gawk and correct the awk calls
in the makefile to use $(AWK)
- Changed the default policy name to br_policy to differentiate the policy generated from refpolicy
- Added a install step to create a /.autorelabel file to cause the file system to be relabeled by S12SELinux init script
- Adding a default modules.conf file with an option to specify a different one. This will decrease the build time for refpolicy by removing unused policies. (implemented by Thomas P.)
- Cleaned up the configure comments (implemented by Thomas).
- Added a check to only install the documentation if the Buildroot option is enabled
- Removed the build because the install step completes the same process. Also removed the clean step because it is being removed globally from buildroot (implemented by Thomas P.)
- Added more error handling to the startup script to print a warning if SELinux fails to install the policy if it exists. This can be caused by the kernel not being configured with SELinux enabled
Changes v2 -> v3:
- Changes patch naming convention (suggested by Thomas P.)
- Added dependencies on BR2_TOOLCHAIN_HAS_THREADS and BR2_LARGEFILE (suggested by Thomas P.)
- Removed configure option for a specific patch folder (suggested by Thomas P.)
- Removed distribution configuration option (suggested by Thomas)
- Changed the monolithic configuration option to a modular configuration option (suggested by Thomas P.)
- Removed the refpolicy name option (suggested by Thomas P.)
- Corrected gramatical and comment errors (suggested by Thomas P.)
- Multiple style corrections to the mk file (suggested by Thomas P.)
- Added a comment to clairfy the usage of the the host build options for a target build
Changes v1 -> v2:
- General cleanup to the mk file to conform to the standard format
- Fixed the patch naming to match the standard 4 digit numbering
- Changed package dependencies into selects in the config
--- package/Config.in | 2 + package/refpolicy-contrib/Config.in | 19 + package/refpolicy-contrib/refpolicy-contrib.mk | 18 + .../0001-Fix-awk-references-to-use-variable.patch | 42 +++ package/refpolicy/Config.in | 125 +++++++ package/refpolicy/S00selinux | 136 +++++++ package/refpolicy/config | 8 + package/refpolicy/modules.conf | 406 +++++++++++++++++++++ package/refpolicy/refpolicy.hash | 2 + package/refpolicy/refpolicy.mk | 123 +++++++ 10 files changed, 881 insertions(+) create mode 100644 package/refpolicy-contrib/Config.in create mode 100644 package/refpolicy-contrib/refpolicy-contrib.mk create mode 100644 package/refpolicy/2.20130424/0001-Fix-awk-references-to-use-variable.patch create mode 100644 package/refpolicy/Config.in create mode 100644 package/refpolicy/S00selinux create mode 100644 package/refpolicy/config create mode 100644 package/refpolicy/modules.conf create mode 100644 package/refpolicy/refpolicy.hash create mode 100644 package/refpolicy/refpolicy.mk
package/Config.in +2 -0
@@ -1519,6 +1519,8 @@ endmenu menu "Security" source "package/policycoreutils/Config.in" + source "package/refpolicy/Config.in" + source "package/refpolicy-contrib/Config.in" source "package/setools/Config.in" endmenu
package/refpolicy-contrib/Config.in new file +19 -0
@@ -0,0 +1,19 @@ +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + +comment "A refpolicy contrib repository is required if using a refpolicy repo. (Contrib is a Git submodule of refpolicy)" + +config BR2_PACKAGE_REFPOLICY_CONTRIB + bool "refpolicy-contrib" + help + A Git submodule of the refpolicy package. + +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL + string "URL of custom contrib submodule repository" + +config BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION + string "Custom contrib submodule repository version" + help + Revision to use in the typical format used by Git + e.g. a SHA id, a tag, branch, .. + +endif
package/refpolicy-contrib/refpolicy-contrib.mk new file +18 -0
@@ -0,0 +1,18 @@ +################################################################################ +# +# refpolicy-contrib +# +################################################################################ + +ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) +REFPOLICY_CONTRIB_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_URL)) +REFPOLICY_CONTRIB_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CONTRIB_CUSTOM_REPO_VERSION)) +REFPOLICY_CONTRIB_SITE_METHOD = git + +# Inherits license from refpolicy as normally this is a submodule +REFPOLICY_CONTRIB_LICENSE = GPLv2 +endif + +# If refpolicy is from release archive, this contrib content is part of it. + +$(eval $(generic-package))
package/refpolicy/2.20130424/0001-Fix-awk-references-to-use-variable.patch new file +42 -0
42 lines not on this page · raw message
package/refpolicy/Config.in new file +125 -0
125 lines not on this page · raw message
package/refpolicy/S00selinux new file +136 -0
136 lines not on this page · raw message
package/refpolicy/config new file +8 -0
@@ -0,0 +1,8 @@ +# This file controls the state of SELinux on the system. +# SELINUX= can take one of these three values: +# enforcing - SELinux security policy is enforced. +# permissive - SELinux prints warnings instead of enforcing. +# disabled - No SELinux policy is loaded. +SELINUX=permissive +# SELINUXTYPE= name of the selinux policy to use +SELINUXTYPE=refpolicy
package/refpolicy/modules.conf new file +406 -0
406 lines not on this page · raw message
package/refpolicy/refpolicy.hash new file +2 -0
@@ -0,0 +1,2 @@ +#From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease +sha256 6039ba854f244a39dc727cc7db25632f7b933bb271c803772d754d4354f5aef4 refpolicy-2.20130424.tar.bz2
package/refpolicy/refpolicy.mk new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v10 8/11 refpolicy: new package
Hello,
package/Config.in endmenu · line 1523
Quoted 10 lines · Niranjan Reddy
package/Config.in +2
-0@@ -1519,6 +1519,8 @@ endmenu menu "Security" source "package/policycoreutils/Config.in" + source "package/refpolicy/Config.in" + source "package/refpolicy-contrib/Config.in"
I've looked at this refpolicy-contrib thing, and it adds quite a bit of complexity to a patch that isn't already simple. If I understand correctly, if one uses the refpolicy from the official release tarball, then you don't need this refpolicy-contrib thing.
So may I suggest to split the problem into two patches:
1. A patch adding the refpolicy package itself, only supporting the release tarball.
2. A patch adding the refpolicy-contrib logic.
This way, we can hopefully make progress on (1), get it merged, and work later on (2).
package/Config.in endmenu
Quoted 4 lines
package/Config.in +4
-0+ The current refpolicy does not fully support Buildroot + and needs modifications to work with the default system + file layout. These changes should be added as patches to + the refpolicy that modify a single SELinux policy.
So practically speaking, how is your selinux demo defconfig working?
Quoted 8 lines
package/Config.in +8
-0+choice + prompt "SELinux policy type" + default BR2_PACKAGE_REFPOLICY_TYPE_STANDARD + + config BR2_PACKAGE_REFPOLICY_TYPE_STANDARD + bool "Standard" + help + Standard SELinux policy
package/Config.in
Quoted 10 lines
package/Config.in +10
-0+ + config BR2_PACKAGE_REFPOLICY_TYPE_MCS + bool "MCS" + help + SELinux policy with multi-catagory support + + config BR2_PACKAGE_REFPOLICY_TYPE_MLS + bool "MLS" + help + SELinux policy with multi-catagory and multi-level support
I think we normally don't indent the contents of choice...endchoice blocks.
Quoted 16 lines
package/Config.in +16
-0+endchoice + +config BR2_PACKAGE_REFPOLICY_TYPE + string + default "standard" if BR2_PACKAGE_REFPOLICY_TYPE_STANDARD + default "mcs" if BR2_PACKAGE_REFPOLICY_TYPE_MCS + default "mls" if BR2_PACKAGE_REFPOLICY_TYPE_MLS + +choice + prompt "SELinux default state" + default BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE + + config BR2_PACKAGE_REFPOLICY_STATE_ENFORCE + bool "Enforcing" + help + SELinux security policy is enforced
package/Config.in
Quoted 10 lines
package/Config.in +10
-0+ + config BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE + bool "Permissive" + help + SELinux prints warnings instead of enforcing + + config BR2_PACKAGE_REFPOLICY_STATE_DISABLE + bool "Disabled" + help + No SELinux policy is loaded
Ditto.
Quoted 14 lines
package/Config.in +14
-0+endchoice + +config BR2_PACKAGE_REFPOLICY_STATE + string + default "permissive" if BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE + default "enforcing" if BR2_PACKAGE_REFPOLICY_STATE_ENFORCE + default "disabled" if BR2_PACKAGE_REFPOLICY_STATE_DISABLE + +config BR2_PACKAGE_REFPOLICY_MODULES_FILE + string "Refpolicy modules configuration" + default "package/refpolicy/modules.conf" + help + Location of a custom modules.conf file that lists the + SELinux policy modules to be included in the compiled
package/Config.in
Quoted 10 lines
package/Config.in +10
-0+ policy. See policy/modules.conf in the refpolicy sources for + the complete list of available modules. + NOTE: This file is only used if a Custom Git repo is + not specified. + +config BR2_PACKAGE_REFPOLICY_MODULAR + bool "Build a modular SELinux policy" + help + Select Y to build a modular SELinux policy. By default, + a monolithing policy will be built to save space on the
monolithing -> monolithic.
Quoted 20 lines
package/Config.in +20
-0+ target. A modular policy can also be built if policies + need to be modified without reloading the target. + +config BR2_PACKAGE_REFPOLICY_CUSTOM_GIT + bool "Custom Git repository" + select BR2_PACKAGE_REFPOLICY_CONTRIB + help + This option allows Buildroot to get the refpolicy source + code from a Git repository. This option should generally + be used to add custom SELinux policy to the base refpolicy + without having to deal with lots of patches. + + Please note that with the current configuration of the + mainline refpolicy git repositories, a refpolicy and a + refpolicy-contrib git repo must be specified. These are + linked using a git submodule which does not get initialized + during the Buildroot build. + +if BR2_PACKAGE_REFPOLICY_CUSTOM_GIT +
package/Config.in
Quoted 10 lines
package/Config.in +10
-0+config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git + e.g. a SHA id, a tag, branch, .. + +endif
This part would go away in patch (1).
package/Config.in
Quoted 2 lines
package/Config.in +2
-0+start() { + echo -n "Initializing SELinux: "
Use printf here.
package/Config.in
Quoted 2 lines
package/Config.in +2
-0+ # Context Label /dev/ + if [ -n "$SELINUX_STATE" -a -x /sbin/restorecon ] && fgrep " /dev " /proc/mounts >/dev/null 2>&1 ; then
Why do you check for /sbin/restorecon existence here? Isn't it installed as a mandatory dependency anyway?
package/Config.in
Quoted 5 lines
package/Config.in +5
-0+ /sbin/restorecon -R -F /dev 2>/dev/null + fi + + # Context Label tmpfs mounts + if [ -n "$SELINUX_STATE" -a -x /sbin/restorecon ]; then
Ditto.
Quoted 1 line
+
/sbin/restorecon-R -F $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// && $3 =="tmpfs" { print $2 }'/etc/fstab) >/dev/null 2>&1
Wow, complicated :)
Quoted 28 lines
package/refpolicy/refpolicy.mk new file +22
-0@@ -0,0 +1,123 @@ +################################################################################ +# +# refpolicy +# +################################################################################ + +ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) +REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) +REFPOLICY_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION)) +REFPOLICY_SITE_METHOD = git +REFPOLICY_DEPENDENCIES += refpolicy-contrib +else +REFPOLICY_VERSION = 2.20130424 +REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 +REFPOLICY_SITE = http://oss.tresys.com/files/refpolicy +endif +REFPOLICY_LICENSE = GPLv2 +REFPOLICY_LICENSE_FILES = COPYING + +# Cannot use multiple threads to build the reference policy +REFPOLICY_MAKE = $(TARGET_MAKE_ENV) $(MAKE1) +
package/refpolicy/refpolicy.mk line 32
Quoted 10 lines
package/refpolicy/refpolicy.mk new file +10
-0+REFPOLICY_DEPENDENCIES += host-m4 host-checkpolicy host-policycoreutils \ + host-setools host-gawk host-python policycoreutils + +REFPOLICY_INSTALL_STAGING = YES + +REFPOLICY_POLICY_NAME = br_policy + +# To apply board specific customizations, create a refpolicy folder in +# BR2_GLOBAL_PATCH_DIR. These patches will be applied after the patches +# in package/refpolicy
This sort of comment doesn't belong here, it's general Buildroot usage.
package/refpolicy/refpolicy.mk line 37
Quoted 4 lines
package/refpolicy/refpolicy.mk new file +4
-0+# Passing the HOST_CONFIGURE_OPTS to the target build because all of the +# build utilities are expected to be on system. This fools the make files +# into using the host built utilities to compile the SELinux policy for +# the target.
This is really weird, but OK I haven't looked at the details, and I can understand that refpolicy is a weird beast.
package/refpolicy/refpolicy.mk line 52
Quoted 2 lines
package/refpolicy/refpolicy.mk new file +2
-0+ifeq ($(BR2_PACKAGE_REFPOLICY_MODULAR),y) + REFPOLICY_MONOLITHIC = n
indentation not needed.
package/refpolicy/refpolicy.mk line 117
Quoted 6 lines
package/refpolicy/refpolicy.mk new file +6
-0+define REFPOLICY_POLICY_COMPILE + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/selinux/$(REFPOLICY_POLICY_NAME)/policy + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/selinux/$(REFPOLICY_POLICY_NAME)/modules/active/modules + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/selinux/$(REFPOLICY_POLICY_NAME)/contexts/files + touch $(TARGET_DIR)/etc/selinux/$(REFPOLICY_POLICY_NAME)/contexts/files/file_contexts.local +endef
This...
package/refpolicy/refpolicy.mk line 46
Quoted 2 lines
package/refpolicy/refpolicy.mk new file +2
-0+ +ifeq ($(BR2_PACKAGE_REFPOLICY_MODULAR),y)
... should be defined inside the condition. Though it seems weird to have a variable called REFPOLICY_POLICY_COMPILE that doesn't compile anything at all, and just creates a few directories and creates one empty file.
package/refpolicy/refpolicy.mk line 120
Quoted 1 line
package/refpolicy/refpolicy.mk new file +1
-0+ REFPOLICY_POST_INSTALL_TARGET_HOOKS += REFPOLICY_POLICY_COMPILE
Indentation not needed here.
package/refpolicy/refpolicy.mk line 50
Quoted 3 lines
package/refpolicy/refpolicy.mk new file +3
-0+endif + +$(eval $(generic-package))
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 9/11 python-pyparsing: Add host build option
In reply to Niranjan ReddyFrom: Clayton Shotwell <[email protected]>
---
Changed v9 -> v10:
- No changes
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- No changes
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- No changes
--- package/python-pyparsing/python-pyparsing.mk | 1 + 1 file changed, 1 insertion(+)
package/python-pyparsing/python-pyparsing.mk +1 -0
@@ -12,3 +12,4 @@ PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = distutils $(eval $(python-package)) +$(eval $(host-python-package))
Signature · 1 line
2.5.0
PATCH v10 9/11 python-pyparsing: Add host build option
Hello,
package/python-pyparsing/python-pyparsing.mk PYTHON_PYPARSING_LICENSE_FILES = LICENSE · line 15
Quoted 9 lines · Niranjan Reddy
package/python-pyparsing/python-pyparsing.mk +1
-0@@ -12,3 +12,4 @@ PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = distutils $(eval $(python-package)) +$(eval $(host-python-package))
What is using this new host-python-pyparsing package? Your latest two patches 10 and 11 are not making use of it, and I couldn't spot this being used in the previous patches either (and if it was used in the previous patches, then it would be another ordering issue in your patch series).
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 10/11 util-linux: selinux, audit, and pam support
In reply to Niranjan ReddyFrom: Matt Weber <[email protected]>
---
Changes v9 -> v10:
- No changes
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- No changes
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Update the selinux busybox config to the latest version of busybox (Clayton S.)
Changes v1 -> v4:
- Did not exist
--- package/util-linux/util-linux.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
package/util-linux/util-linux.mk +27 -0
@@ -58,6 +58,20 @@ ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) UTIL_LINUX_DEPENDENCIES += libcap-ng endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +UTIL_LINUX_DEPENDENCIES += libselinux +UTIL_LINUX_CONF_OPTS += --with-selinux +else +UTIL_LINUX_CONF_OPTS += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_DEPENDENCIES += audit +UTIL_LINUX_CONF_OPTS += --with-audit +else +UTIL_LINUX_CONF_OPTS += --without-audit +endif + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)
@@ -159,9 +173,22 @@ define UTIL_LINUX_INSTALL_PAMFILES $(INSTALL) -m 0644 package/util-linux/su.pam \ $(TARGET_DIR)/etc/pam.d/su-l endef + +# Add the required hooks to the pam files if SELinux is enabled +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +define UTIL_LINUX_FIXUP_PAMFILES + for file in login su su-l ; do \ + $(SED) '/selinux/d' $(TARGET_DIR)/etc/pam.d/$${file}; \ + $(SED) '0,/session/s/session/session required pam_selinux.so close\nsession/' $(TARGET_DIR)/etc/pam.d/$${file}; \ + echo "session required pam_selinux.so open" >> $(TARGET_DIR)/etc/pam.d/$${file}; \ + done +endef +endif + endif UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES +UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_FIXUP_PAMFILES # Install agetty->getty symlink to avoid breakage when there's no busybox ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y)
Signature · 1 line
2.5.0
PATCH v10 10/11 util-linux: selinux, audit, and pam support
Dear Niranjan Reddy,
As usual, no commit log, even if some non-trivial things are happening here. It is *really* important to explain what happens, otherwise review is very difficult.
package/util-linux/util-linux.mk ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) · line 73
Quoted 13 lines · Niranjan Reddy
package/util-linux/util-linux.mk +13
-0+ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +UTIL_LINUX_DEPENDENCIES += libselinux +UTIL_LINUX_CONF_OPTS += --with-selinux +else +UTIL_LINUX_CONF_OPTS += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_DEPENDENCIES += audit +UTIL_LINUX_CONF_OPTS += --with-audit +else +UTIL_LINUX_CONF_OPTS += --without-audit +endif
This part is OK.
Quoted 7 lines
package/util-linux/util-linux.mk +1
-0+ # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)@@ -159,9 +173,22 @@ define UTIL_LINUX_INSTALL_PAMFILES $(INSTALL) -m 0644 package/util-linux/su.pam \ $(TARGET_DIR)/etc/pam.d/su-l
package/util-linux/util-linux.mk define UTIL_LINUX_INSTALL_PAMFILES · line 184
Quoted 10 lines
package/util-linux/util-linux.mk +9
-0endef + +# Add the required hooks to the pam files if SELinux is enabled +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +define UTIL_LINUX_FIXUP_PAMFILES + for file in login su su-l ; do \ + $(SED) '/selinux/d' $(TARGET_DIR)/etc/pam.d/$${file}; \ + $(SED) '0,/session/s/session/session required pam_selinux.so close\nsession/' $(TARGET_DIR)/etc/pam.d/$${file}; \ + echo "session required pam_selinux.so open" >> $(TARGET_DIR)/etc/pam.d/$${file}; \ + done
This *might* be OK, but I have to admit that the second SED expression is somewhat convoluted, so it would be good to expand a bit the explanation in the comment above.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v10 11/11 qemu x86 selinux: added common selinux support files
In reply to Niranjan ReddyFrom: Matt Weber <[email protected]>
Add a default busybox SELinux config which disables init and uses sysvinit. Add base skeleton with inittab and fstab tailored to selinux Add base skeleton audit configuration (didn't seem to merit being the package default).
---
Changes v9 -> v10:
- No changes
Changes v8 -> v9:
- No changes
Changes v7 -> v8:
- No changes
Changes v6 -> v7:
- No changes
Changes v5 -> v6:
- No changes
Changes v4 -> v5:
- Update the selinux busybox config to the latest version of busybox (Clayton S.)
Changes v1 -> v4:
- Did not exist
--- board/common_selinux/busybox-selinux.config | 1058 ++++++++++++++++++++ board/common_selinux/post_build.sh | 30 + .../common_selinux/skeleton/etc/audit/auditd.conf | 32 + .../skeleton/etc/audit/rules.d/audit.rules | 3 + board/common_selinux/skeleton/etc/fstab | 15 + board/common_selinux/skeleton/etc/inittab | 29 + board/common_selinux/skeleton_permissions.txt | 26 + 7 files changed, 1193 insertions(+) create mode 100644 board/common_selinux/busybox-selinux.config create mode 100755 board/common_selinux/post_build.sh create mode 100644 board/common_selinux/skeleton/etc/audit/auditd.conf create mode 100644 board/common_selinux/skeleton/etc/audit/rules.d/audit.rules create mode 100755 board/common_selinux/skeleton/etc/fstab create mode 100755 board/common_selinux/skeleton/etc/inittab create mode 100755 board/common_selinux/skeleton_permissions.txt
board/common_selinux/busybox-selinux.config new file +1058 -0
@@ -0,0 +1,1058 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.23.2 +# Wed May 6 10:14:52 2015 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_UNICODE_SUPPORT is not set +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=0 +CONFIG_LAST_SUPPORTED_WCHAR=0 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_PAM=y +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +CONFIG_FEATURE_CLEAN_UP=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +# CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +CONFIG_SELINUX=y +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +CONFIG_BUILD_LIBBUSYBOX=y +CONFIG_FEATURE_INDIVIDUAL=y +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=999 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_FEATURE_SEAMLESS_XZ is not set +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +# CONFIG_FEATURE_SEAMLESS_GZ is not set +# CONFIG_FEATURE_SEAMLESS_Z is not set +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_FEATURE_AR_CREATE=y +# CONFIG_UNCOMPRESS is not set +CONFIG_GUNZIP=y +CONFIG_BUNZIP2=y +CONFIG_UNLZMA=y +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +# CONFIG_BZIP2 is not set +CONFIG_CPIO=y +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_FEATURE_CPIO_P is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GZIP=y +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 +# CONFIG_LZOP is not set +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_AUTODETECT is not set +CONFIG_FEATURE_TAR_FROM=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +CONFIG_FEATURE_TAR_SELINUX=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y +CONFIG_SHUF=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_UNLINK=y +# CONFIG_BASE64 is not set +CONFIG_WHO=y +CONFIG_USERS=y +# CONFIG_CAL is not set +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +# CONFIG_FSYNC is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +# CONFIG_TAC is not set +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +# CONFIG_FGCONSOLE is not set +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +# CONFIG_KBD_MODE is not set +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +# CONFIG_SHOWKEY is not set + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +# CONFIG_FEATURE_FIND_LINKS is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +# CONFIG_HALT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +# CONFIG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +CONFIG_GETTY=y +# CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +# CONFIG_MODINFO is not set +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" + +# +# Linux System Utilities +# +# CONFIG_BLOCKDEV is not set +CONFIG_FATATTR=y +CONFIG_FSTRIM=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +CONFIG_FEATURE_MDEV_EXEC=y +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_REV is not set +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_BLKID=y +# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +CONFIG_FEATURE_GPT_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +# CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_UUID is not set +CONFIG_MORE=y +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_FAKE is not set +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_PIVOT_ROOT is not set +CONFIG_RDATE=y +# CONFIG_RDEV is not set +CONFIG_READPROFILE=y +# CONFIG_RTCWAKE is not set +# CONFIG_SCRIPT is not set +# CONFIG_SCRIPTREPLAY is not set +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y +# CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_CROND=y +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +CONFIG_FEATURE_LESS_REGEXP=y +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_RFKILL is not set +CONFIG_SETSERIAL=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_WALL is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +# CONFIG_INOTIFYD is not set +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +CONFIG_RUNLEVEL=y +# CONFIG_RX is not set +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TIME=y +# CONFIG_TIMEOUT is not set +# CONFIG_TTYSIZE is not set +# CONFIG_VOLNAME is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +# CONFIG_NBDCLIENT is not set +# CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +# CONFIG_PING6 is not set +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +CONFIG_ARPING=y +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPD is not set +# CONFIG_FEATURE_FTP_WRITE is not set +# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_TFTP_DEBUG is not set +CONFIG_TRACEROUTE=y +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPC6 is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +# CONFIG_UDPSVD is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +# CONFIG_IOSTAT is not set +CONFIG_LSOF=y +# CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set +# CONFIG_PMAP is not set +# CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +# CONFIG_FEATURE_SHOW_THREADS is not set +CONFIG_WATCH=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set + +# +# SELinux Utilities +# +CONFIG_CHCON=y +CONFIG_FEATURE_CHCON_LONG_OPTIONS=y +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +CONFIG_RUNCON=y +CONFIG_FEATURE_RUNCON_LONG_OPTIONS=y +CONFIG_SELINUXENABLED=y +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_IDLE_TIMEOUT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_CTTYHACK is not set +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_FEATURE_BASH_IS_ASH=y +# CONFIG_FEATURE_BASH_IS_HUSH is not set +# CONFIG_FEATURE_BASH_IS_NONE is not set +CONFIG_SH_MATH_SUPPORT=y +# CONFIG_SH_MATH_SUPPORT_64 is not set +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +CONFIG_LOGGER=y
board/common_selinux/post_build.sh new file +30 -0
@@ -0,0 +1,30 @@ +#!/bin/bash +################################################################################ +# +# DESCRIPTION: +# This script will do any "post-build" steps (after all packages are built +# but before image creation). Any filesystem permission issues should be +# fixed in this script. +# +# The script requires following variables to be passed into it. +# $1 - the target directory (passed in by default by buildroot if +# script is BR2_ROOTFS_POST_BUILD_SCRIPT) +# +################################################################################ + +DEST_DIR=$1 + +# For SELinux targets, the /var directory symlinks need to be removed +# and replaced with actual folders. The removal is done here and the +# recreation is done in the permissions file for the common_selinux +# local_skeleton +for link in ${DEST_DIR}/var/{cache,lock,log,run,spool,tmp} ${DEST_DIR}/var/lib/misc; do + if [ -h ${link} ]; then + echo "Removing symlink ${link}" + unlink ${link} + fi +done + +# Replace the /run folder with a symlink to /var/run +rm -rf ${DEST_DIR}/run +ln -sf -t ${DEST_DIR} run var/run
board/common_selinux/skeleton/etc/audit/auditd.conf new file +32 -0
@@ -0,0 +1,32 @@ +# +# This file controls the configuration of the audit daemon +# + +log_file = /var/log/audit/audit.log +log_format = RAW +log_group = root +priority_boost = 4 +flush = INCREMENTAL +freq = 20 +num_logs = 5 +disp_qos = lossy +dispatcher = /usr/sbin/audispd +name_format = NONE +##name = mydomain +max_log_file = 6 +max_log_file_action = ROTATE +space_left = 75 +space_left_action = IGNORE +action_mail_acct = root +admin_space_left = 50 +admin_space_left_action = IGNORE +disk_full_action = IGNORE +disk_error_action = IGNORE +##tcp_listen_port = +tcp_listen_queue = 5 +tcp_max_per_addr = 1 +##tcp_client_ports = 1024-65535 +tcp_client_max_idle = 0 +enable_krb5 = no +krb5_principal = auditd +##krb5_key_file = /etc/audit/audit.key
board/common_selinux/skeleton/etc/audit/rules.d/audit.rules new file +3 -0
@@ -0,0 +1,3 @@ +-D +-b 1024 +-e 2
board/common_selinux/skeleton/etc/fstab new file +15 -0
@@ -0,0 +1,15 @@ +# /etc/fstab: static file system information. +# +# <file system> <mount pt> <type> <options> <dump> <pass> +/dev/root / ext3 rw,noauto 0 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs mode=0700,nodev,nosuid,noexec,size=1M 0 0 +tmpfs /tmp tmpfs mode=0700,nodev,nosuid,noexec,size=200M 0 0 +tmpfs /var/cache tmpfs mode=0700,nodev,nosuid,noexec,size=1M 0 0 +tmpfs /var/lock tmpfs mode=0700,nodev,nosuid,noexec,size=1M 0 0 +tmpfs /var/log tmpfs mode=0700,nodev,nosuid,noexec,size=50M 0 0 +tmpfs /var/run tmpfs mode=0700,nodev,nosuid,noexec,size=1M 0 0 +tmpfs /var/spool tmpfs mode=0700,nodev,nosuid,noexec,size=1M 0 0 +sysfs /sys sysfs defaults 0 0 +none /selinux selinuxfs noauto 0 0
board/common_selinux/skeleton/etc/inittab new file +29 -0
@@ -0,0 +1,29 @@ +# /etc/inittab +# +# This inittab is a basic inittab sample for sysvinit, which mimics +# Buildroot's default inittab for BusyBox. +id:1:initdefault: + +proc::sysinit:/bin/mount -t proc proc /proc +sysf::sysinit:/bin/mount -t sysfs sysfs /sys +dpts::sysinit:/bin/mkdir -p /dev/pts -Z `matchpathcon -n /dev/pts` +dshm::sysinit:/bin/mkdir -p /dev/shm -Z `matchpathcon -n /dev/shm` +mpts::sysinit:/bin/mkdir -p /dev/pts +mshm::sysinit:/bin/mkdir -p /dev/shm +fsck::sysinit:/sbin/fsck -ARy +moun::sysinit:/bin/mount -a +host::sysinit:/bin/hostname -F /etc/hostname + +# now run any rc scripts +init::bootwait:/etc/init.d/rcS + +S0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL + +# Stuff to do before rebooting +shd0:06:wait:/etc/init.d/rcK +shd1:06:wait:/sbin/swapoff -a +shd2:06:wait:/bin/umount -a -r + +# The usual halt or reboot actions +lt0:0:wait:/sbin/halt -dhp +reb0:6:wait:/sbin/reboot
board/common_selinux/skeleton_permissions.txt new file +26 -0
@@ -0,0 +1,26 @@ +################################################################################ +# +# See <buildroot-source>/package/makedevs/README for details +# +# This device table is used to assign proper ownership and permissions +# on the files in the local-skeleton directory. It doesn't create any device +# file, as it is used in both static device configurations (where /dev/ is static) +# and in dynamic configurations (where devtmpfs, mdev or udev are used). +# +# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count> + +# All the necessary file permissions for /etc +/etc/audit/auditd.conf f 644 0 0 - - - - - +/etc/audit/rules.d/audit.rules f 644 0 0 - - - - - +/etc/fstab f 644 0 0 - - - - - +/etc/inittab f 644 0 0 - - - - - + +# Setup entries for all of the /var/* directories that need proper +# mount points +/var/cache d 755 0 0 - - - - - +/var/lib/misc d 755 0 0 - - - - - +/var/lock d 755 0 0 - - - - - +/var/log d 755 0 0 - - - - - +/var/run d 755 0 0 - - - - - +/var/spool d 755 0 0 - - - - - +/var/tmp d 755 0 0 - - - - -
Signature · 1 line
2.5.0
PATCH v10 1/11 dbus: selinux file context support
In reply to Niranjan ReddyHello Niranjan,
Thanks a lot for respining the SELinux patch series. If you have some time to work on this in the coming weeks to send new iterations as needed, I really hope to be able to merge this for 2016.05.
package/dbus/S30dbus line 23
Quoted 12 lines · Niranjan Reddy
package/dbus/S30dbus +4
-0@@ -17,6 +17,10 @@ [ -d /var/run/dbus ] || mkdir -p /var/run/dbus [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys [ -d /tmp/dbus ] || mkdir -p /tmp/dbus +[ -d /var/lib/dbus ] || mkdir -p /var/lib/dbus +if [ -e /sbin/restorecon ]; then + restorecon -R /var/run/dbus /var/lock/subsys /tmp/dbus /var/lib/dbus +fi
This really needs a better commit message. Why are you doing this? Why do you need to create /var/lib/dbus if it doesn't exist? Why do you need to do a restorecon on /var/lock/subsys, which doesn't look immediately related to dbus.
Could you give some more details, and integrate those details in a commit log?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com