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 AEC7C139694 for ; Thu, 30 Mar 2017 17:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 714EE23401E; Thu, 30 Mar 2017 17:06:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DBD623401C for ; Thu, 30 Mar 2017 17:06:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 433D1341655 for ; Thu, 30 Mar 2017 17:06:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82E1173F1 for ; Thu, 30 Mar 2017 17:06:22 +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: <1490882410.9c069ad294b09ac28ca1fe83ff999e77975c3cd0.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 policy/modules/contrib/dbus.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 9c069ad294b09ac28ca1fe83ff999e77975c3cd0 X-VCS-Branch: master Date: Thu, 30 Mar 2017 17:06:22 +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: b1bf644b-83db-44c3-9427-e0d4e7d4d8af X-Archives-Hash: 2a8b1093c2e2e55f4b3ad21c78dd238a commit: 9c069ad294b09ac28ca1fe83ff999e77975c3cd0 Author: Chris PeBenito ieee org> AuthorDate: Sat Mar 25 16:55:52 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Mar 30 14:00:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9c069ad2 /var/run -> /run again Here's the latest version of my patch to remove all /var/run when it's not needed. I have removed the subst thing from the patch, but kept a distro_debian bit that relies on it. So with this patch the policy won't install if you build it with distro_debian unless you have my subst patch. Chris, if your automated tests require that it build and install with distro_debian then skip the patch for sysnetwork.fc. >From Russell Coker policy/modules/contrib/dbus.fc | 4 ++++ policy/modules/contrib/dbus.te | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/dbus.fc b/policy/modules/contrib/dbus.fc index 725276de..c2a15358 100644 --- a/policy/modules/contrib/dbus.fc +++ b/policy/modules/contrib/dbus.fc @@ -20,3 +20,7 @@ HOME_DIR/\.dbus(/.*)? gen_context(system_u:object_r:session_dbusd_home_t,s0) # /var/run prefix exception; https://dbus.freedesktop.org/doc/dbus-specification.html#idm2461 /var/run/dbus/system_bus_socket gen_context(system_u:object_r:system_dbusd_var_run_t,s0) + +ifdef(`distro_debian',` +/var/run/dbus(/.*)? gen_context(system_u:object_r:system_dbusd_var_run_t,s0) +') diff --git a/policy/modules/contrib/dbus.te b/policy/modules/contrib/dbus.te index f307ddec..941d2f47 100644 --- a/policy/modules/contrib/dbus.te +++ b/policy/modules/contrib/dbus.te @@ -1,4 +1,4 @@ -policy_module(dbus, 1.22.3) +policy_module(dbus, 1.22.4) gen_require(` class dbus all_dbus_perms; 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 4A19D139694 for ; Thu, 30 Mar 2017 17:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A92AE23403F; Thu, 30 Mar 2017 17:09:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F1C323403F for ; Thu, 30 Mar 2017 17:09:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8C917341641 for ; Thu, 30 Mar 2017 17:09:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC8A473E6 for ; Thu, 30 Mar 2017 17:09:00 +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: <1490882410.9c069ad294b09ac28ca1fe83ff999e77975c3cd0.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/dbus.fc policy/modules/contrib/dbus.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 9c069ad294b09ac28ca1fe83ff999e77975c3cd0 X-VCS-Branch: next Date: Thu, 30 Mar 2017 17:09:00 +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: 001ae57a-5850-4cf1-902a-ca297558fa65 X-Archives-Hash: bdedc8db3cb73c11e6482cd8ce860e80 Message-ID: <20170330170900.MIaGsArzF8RvnZb-Apa2OYV5M_6Av4kVryQ_LMMdEso@z> commit: 9c069ad294b09ac28ca1fe83ff999e77975c3cd0 Author: Chris PeBenito ieee org> AuthorDate: Sat Mar 25 16:55:52 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Mar 30 14:00:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9c069ad2 /var/run -> /run again Here's the latest version of my patch to remove all /var/run when it's not needed. I have removed the subst thing from the patch, but kept a distro_debian bit that relies on it. So with this patch the policy won't install if you build it with distro_debian unless you have my subst patch. Chris, if your automated tests require that it build and install with distro_debian then skip the patch for sysnetwork.fc. >From Russell Coker policy/modules/contrib/dbus.fc | 4 ++++ policy/modules/contrib/dbus.te | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/dbus.fc b/policy/modules/contrib/dbus.fc index 725276de..c2a15358 100644 --- a/policy/modules/contrib/dbus.fc +++ b/policy/modules/contrib/dbus.fc @@ -20,3 +20,7 @@ HOME_DIR/\.dbus(/.*)? gen_context(system_u:object_r:session_dbusd_home_t,s0) # /var/run prefix exception; https://dbus.freedesktop.org/doc/dbus-specification.html#idm2461 /var/run/dbus/system_bus_socket gen_context(system_u:object_r:system_dbusd_var_run_t,s0) + +ifdef(`distro_debian',` +/var/run/dbus(/.*)? gen_context(system_u:object_r:system_dbusd_var_run_t,s0) +') diff --git a/policy/modules/contrib/dbus.te b/policy/modules/contrib/dbus.te index f307ddec..941d2f47 100644 --- a/policy/modules/contrib/dbus.te +++ b/policy/modules/contrib/dbus.te @@ -1,4 +1,4 @@ -policy_module(dbus, 1.22.3) +policy_module(dbus, 1.22.4) gen_require(` class dbus all_dbus_perms;