From patchwork Fri Jul 10 23:27:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clayton Shotwell X-Patchwork-Id: 493913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D16D41402BC for ; Sat, 11 Jul 2015 09:31:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EFE9432DF0; Fri, 10 Jul 2015 23:31:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vEdRvOPiE0iT; Fri, 10 Jul 2015 23:30:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AF86232CF0; Fri, 10 Jul 2015 23:29:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DE6381C15E3 for ; Fri, 10 Jul 2015 23:29:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CDC7F32CD8 for ; Fri, 10 Jul 2015 23:29:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0L+MhK3LY-nS for ; Fri, 10 Jul 2015 23:29:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs01.rockwellcollins.com (ch3vs01.rockwellcollins.com [205.175.226.27]) by silver.osuosl.org (Postfix) with ESMTPS id 7F1D132D0E for ; Fri, 10 Jul 2015 23:28:20 +0000 (UTC) Received: from ofwch3n02.rockwellcollins.com (HELO crulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs01.rockwellcollins.com with ESMTP; 10 Jul 2015 18:28:19 -0500 X-Received: from thehammer.rockwellcollins.com (unknown [192.168.141.197]) by crulimr02.rockwellcollins.com (Postfix) with ESMTP id D722A60483; Fri, 10 Jul 2015 18:28:19 -0500 (CDT) From: Clayton Shotwell To: buildroot@buildroot.org Date: Fri, 10 Jul 2015 18:27:54 -0500 Message-Id: <1436570882-56442-9-git-send-email-clayton.shotwell@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436570882-56442-1-git-send-email-clayton.shotwell@rockwellcollins.com> References: <1436570882-56442-1-git-send-email-clayton.shotwell@rockwellcollins.com> Subject: [Buildroot] [PATCH v8 08/16] dbus: selinux file context support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Matt Weber Signed-off-by: Matthew Weber Reviewed-by: Samuel Martin --- 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 ++++ package/dbus/dbus.mk | 14 ++++++++++++++ 2 files changed, 18 insertions(+) mode change 100755 => 100644 package/dbus/S30dbus diff --git a/package/dbus/S30dbus b/package/dbus/S30dbus old mode 100755 new mode 100644 index 0d15c73..be51807 --- a/package/dbus/S30dbus +++ b/package/dbus/S30dbus @@ -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 diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c810800..a5ec807 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -44,6 +44,20 @@ ifeq ($(BR2_microblaze),y) DBUS_CONF_OPTS += --disable-inotify endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_CONF_OPTS += --enable-selinux +DBUS_DEPENDENCIES += libselinux +else +DBUS_CONF_OPTS += --disable-selinux +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_CONF_OPTS += --enable-libaudit +DBUS_DEPENDENCIES += audit libcap-ng +else +DBUS_CONF_OPTS += --disable-libaudit +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) DBUS_CONF_OPTS += --with-x DBUS_DEPENDENCIES += xlib_libX11