From patchwork Tue Dec 16 03:54:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 421784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id EAEF21400E2 for ; Tue, 16 Dec 2014 14:57:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B28B8A98A; Tue, 16 Dec 2014 03:57:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PSrvelewtzFO; Tue, 16 Dec 2014 03:57:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C7098AEA0; Tue, 16 Dec 2014 03:55:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CF7821C2238 for ; Tue, 16 Dec 2014 03:54:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CB20C8A89C for ; Tue, 16 Dec 2014 03:54:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KIZTFhi-kNBW for ; Tue, 16 Dec 2014 03:54:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs02.rockwellcollins.com (da1vs02.rockwellcollins.com [205.175.227.29]) by whitealder.osuosl.org (Postfix) with ESMTPS id 12D298A91A for ; Tue, 16 Dec 2014 03:54:44 +0000 (UTC) Received: from ofwda1n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs02.rockwellcollins.com with ESMTP; 15 Dec 2014 21:54:43 -0600 X-Received: from smtplb.rockwellcollins.com (smtplb.rockwellcollins.com [131.198.63.134]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 0603B6080E; Mon, 15 Dec 2014 21:54:43 -0600 (CST) X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by smtplb.rockwellcollins.com (Postfix) with ESMTP id 01B6F801EC; Mon, 15 Dec 2014 21:54:43 -0600 (CST) From: Matt Weber To: buildroot@busybox.net Date: Mon, 15 Dec 2014 21:54:15 -0600 Message-Id: <1418702062-61039-24-git-send-email-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418702062-61039-1-git-send-email-matthew.weber@rockwellcollins.com> References: <1418702062-61039-1-git-send-email-matthew.weber@rockwellcollins.com> Subject: [Buildroot] [PATCH 23/30] 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" Signed-off-by: Matt Weber --- 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 2d5d2c8..5fb2c3e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -43,6 +43,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