From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 03BBF1396D0 for ; Sat, 9 Sep 2017 02:43:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9535F1FC117; Sat, 9 Sep 2017 02:43:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74BD31FC112 for ; Sat, 9 Sep 2017 02:43:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E2733417E0 for ; Sat, 9 Sep 2017 02:43:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74EE59082 for ; Sat, 9 Sep 2017 02:43:01 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1504910931.6e4ce53825874b005a6d13c2fbd08d6b7d89472b.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/dbus.fc X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 6e4ce53825874b005a6d13c2fbd08d6b7d89472b X-VCS-Branch: master Date: Sat, 9 Sep 2017 02:43:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4b57a778-05f2-4d0b-998e-9e0a64d25ea0 X-Archives-Hash: 138cc071fe2ca67ab431453bdb0e9c9a commit: 6e4ce53825874b005a6d13c2fbd08d6b7d89472b Author: Nicolas Iooss m4x org> AuthorDate: Wed Aug 23 19:36:42 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Fri Sep 8 22:48:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=6e4ce538 dbus: move comments out of the file context definitions When loading module dbus from Reference Policy's git master, semodule fails: Invalid syntax Bad context Bad filecon declaration at /var/lib/selinux/refpolicy/tmp/modules/400/dbus/cil:734 semodule: Failed! "/usr/lib/selinux/hll/pp dbus.pp" generates the following lines (prefixed by the line number): 733 (filecon "/usr/bin/dbus-daemon(-1)?" file (system_u object_r dbusd_exec_t (systemlow systemlow))) 734 (filecon "/usr/bin/dbus-broker-launch" file (system_u object_r dbusd_exec_t # needed by dbus-broker (systemlow systemlow))) 735 (filecon "/usr/bin/dbus-broker" file (system_u object_r dbusd_exec_t # needed by dbus-broker (systemlow systemlow))) The comments need to be on their own lines in order to be ignored by semodule. policy/modules/contrib/dbus.fc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/policy/modules/contrib/dbus.fc b/policy/modules/contrib/dbus.fc index c18fd7fd..e9a13ee9 100644 --- a/policy/modules/contrib/dbus.fc +++ b/policy/modules/contrib/dbus.fc @@ -8,8 +8,10 @@ HOME_DIR/\.dbus(/.*)? gen_context(system_u:object_r:session_dbusd_home_t,s0) /run/user/%{USERID}/dbus-1(/.*)? gen_context(system_u:object_r:session_dbusd_runtime_t,s0) /usr/bin/dbus-daemon(-1)? -- gen_context(system_u:object_r:dbusd_exec_t,s0) -/usr/bin/dbus-broker-launch -- gen_context(system_u:object_r:dbusd_exec_t,s0) # needed by dbus-broker -/usr/bin/dbus-broker -- gen_context(system_u:object_r:dbusd_exec_t,s0) # needed by dbus-broker + +# needed by dbus-broker +/usr/bin/dbus-broker-launch -- gen_context(system_u:object_r:dbusd_exec_t,s0) +/usr/bin/dbus-broker -- gen_context(system_u:object_r:dbusd_exec_t,s0) /usr/lib/dbus-.*/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)