From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-749566-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 76AB5138A1A for <garchives@archives.gentoo.org>; Sat, 22 Nov 2014 19:03:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54B75E097B; Sat, 22 Nov 2014 19:03:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8590CE0964 for <gentoo-commits@lists.gentoo.org>; Sat, 22 Nov 2014 19:02:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78589340587 for <gentoo-commits@lists.gentoo.org>; Sat, 22 Nov 2014 19:02:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20185AB0D for <gentoo-commits@lists.gentoo.org>; Sat, 22 Nov 2014 19:02:57 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org> Message-ID: <1416681983.fe62598f2fb87fe0dfca34f82311ffd29df37795.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/init.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: fe62598f2fb87fe0dfca34f82311ffd29df37795 X-VCS-Branch: master Date: Sat, 22 Nov 2014 19:02:57 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 65803b5f-dc6c-4b98-b036-1067f350ac75 X-Archives-Hash: 6e1ae523803d573f11c92e7444c18b24 commit: fe62598f2fb87fe0dfca34f82311ffd29df37795 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> AuthorDate: Sat Nov 22 18:46:23 2014 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 18:46:23 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=fe62598f Reshuffle and update with upstream --- policy/modules/system/init.if | 82 ++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index 2b7793a..99e42fc 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -150,39 +150,6 @@ interface(`init_ranged_domain',` ######################################## ## <summary> -## Mark the file type as a daemon pid file, allowing initrc_t -## to create it -## </summary> -## <param name="filetype"> -## <summary> -## Type to mark as a daemon pid file -## </summary> -## </param> -## <param name="class"> -## <summary> -## Class on which the type is applied -## </summary> -## </param> -## <param name="filename"> -## <summary> -## Filename of the file that the init script creates -## </summary> -## </param> -# -interface(`init_daemon_pid_file',` - gen_require(` - attribute daemonpidfile; - type initrc_t; - ') - - typeattribute $1 daemonpidfile; - - files_pid_file($1) - files_pid_filetrans(initrc_t, $1, $2, $3) -') - -######################################## -## <summary> ## Create a domain for long running processes ## (daemons/services) which are started by init scripts. ## </summary> @@ -421,16 +388,50 @@ interface(`init_ranged_system_domain',` ######################################## ## <summary> -## Mark the type as a daemon run dir +## Mark the file type as a daemon pid file, allowing initrc_t +## to create it ## </summary> -## <param name="rundirtype"> +## <param name="filetype"> +## <summary> +## Type to mark as a daemon pid file +## </summary> +## </param> +## <param name="class"> +## <summary> +## Class on which the type is applied +## </summary> +## </param> +## <param name="filename"> +## <summary> +## Filename of the file that the init script creates +## </summary> +## </param> +# +interface(`init_daemon_pid_file',` + gen_require(` + attribute daemonpidfile; + type initrc_t; + ') + + typeattribute $1 daemonpidfile; + + files_pid_file($1) + files_pid_filetrans(initrc_t, $1, $2, $3) +') + +######################################## +## <summary> +## Mark the file type as a daemon run dir, allowing initrc_t +## to create it +## </summary> +## <param name="filetype"> ## <summary> ## Type to mark as a daemon run dir ## </summary> ## </param> ## <param name="filename"> ## <summary> -## Name of the run dir directory +## Filename of the directory that the init script creates ## </summary> ## </param> # @@ -843,6 +844,14 @@ interface(`init_spec_domtrans_script',` files_list_etc($1) spec_domtrans_pattern($1, initrc_exec_t, initrc_t) + ifdef(`distro_gentoo',` + gen_require(` + type rc_exec_t; + ') + + domtrans_pattern($1, rc_exec_t, initrc_t) + ') + ifdef(`enable_mcs',` range_transition $1 initrc_exec_t:process s0; ') @@ -882,6 +891,7 @@ interface(`init_domtrans_script',` gen_require(` type rc_exec_t; ') + domtrans_pattern($1, rc_exec_t, initrc_t) ') ') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-749680-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 19948138A1A for <garchives@archives.gentoo.org>; Sun, 23 Nov 2014 14:06:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 023D4E0856; Sun, 23 Nov 2014 14:06:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C80B9E084C for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 14:06:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF138340486 for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 14:06:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77F8BABF7 for <gentoo-commits@lists.gentoo.org>; Sun, 23 Nov 2014 14:06:11 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org> Message-ID: <1416681983.fe62598f2fb87fe0dfca34f82311ffd29df37795.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:bitcoin commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/init.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: fe62598f2fb87fe0dfca34f82311ffd29df37795 X-VCS-Branch: bitcoin Date: Sun, 23 Nov 2014 14:06:11 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8451c75f-3079-4442-a9c7-3df67e244574 X-Archives-Hash: 8205b3ac8a43b19816dabc47e67c6ee0 Message-ID: <20141123140611.QK4ZCS72M0j3L5Le0HkEWkhq3aAOSLVMXllko0IKYsc@z> commit: fe62598f2fb87fe0dfca34f82311ffd29df37795 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> AuthorDate: Sat Nov 22 18:46:23 2014 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 18:46:23 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=fe62598f Reshuffle and update with upstream --- policy/modules/system/init.if | 82 ++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index 2b7793a..99e42fc 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -150,39 +150,6 @@ interface(`init_ranged_domain',` ######################################## ## <summary> -## Mark the file type as a daemon pid file, allowing initrc_t -## to create it -## </summary> -## <param name="filetype"> -## <summary> -## Type to mark as a daemon pid file -## </summary> -## </param> -## <param name="class"> -## <summary> -## Class on which the type is applied -## </summary> -## </param> -## <param name="filename"> -## <summary> -## Filename of the file that the init script creates -## </summary> -## </param> -# -interface(`init_daemon_pid_file',` - gen_require(` - attribute daemonpidfile; - type initrc_t; - ') - - typeattribute $1 daemonpidfile; - - files_pid_file($1) - files_pid_filetrans(initrc_t, $1, $2, $3) -') - -######################################## -## <summary> ## Create a domain for long running processes ## (daemons/services) which are started by init scripts. ## </summary> @@ -421,16 +388,50 @@ interface(`init_ranged_system_domain',` ######################################## ## <summary> -## Mark the type as a daemon run dir +## Mark the file type as a daemon pid file, allowing initrc_t +## to create it ## </summary> -## <param name="rundirtype"> +## <param name="filetype"> +## <summary> +## Type to mark as a daemon pid file +## </summary> +## </param> +## <param name="class"> +## <summary> +## Class on which the type is applied +## </summary> +## </param> +## <param name="filename"> +## <summary> +## Filename of the file that the init script creates +## </summary> +## </param> +# +interface(`init_daemon_pid_file',` + gen_require(` + attribute daemonpidfile; + type initrc_t; + ') + + typeattribute $1 daemonpidfile; + + files_pid_file($1) + files_pid_filetrans(initrc_t, $1, $2, $3) +') + +######################################## +## <summary> +## Mark the file type as a daemon run dir, allowing initrc_t +## to create it +## </summary> +## <param name="filetype"> ## <summary> ## Type to mark as a daemon run dir ## </summary> ## </param> ## <param name="filename"> ## <summary> -## Name of the run dir directory +## Filename of the directory that the init script creates ## </summary> ## </param> # @@ -843,6 +844,14 @@ interface(`init_spec_domtrans_script',` files_list_etc($1) spec_domtrans_pattern($1, initrc_exec_t, initrc_t) + ifdef(`distro_gentoo',` + gen_require(` + type rc_exec_t; + ') + + domtrans_pattern($1, rc_exec_t, initrc_t) + ') + ifdef(`enable_mcs',` range_transition $1 initrc_exec_t:process s0; ') @@ -882,6 +891,7 @@ interface(`init_domtrans_script',` gen_require(` type rc_exec_t; ') + domtrans_pattern($1, rc_exec_t, initrc_t) ') ') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-751018-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A61461389E2 for <garchives@archives.gentoo.org>; Fri, 28 Nov 2014 10:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F60FE08CD; Fri, 28 Nov 2014 10:04:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C5AAE089C for <gentoo-commits@lists.gentoo.org>; Fri, 28 Nov 2014 10:04:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8738C3404BB for <gentoo-commits@lists.gentoo.org>; Fri, 28 Nov 2014 10:04:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B877DB14A for <gentoo-commits@lists.gentoo.org>; Fri, 28 Nov 2014 10:04:03 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org> Message-ID: <1416681983.fe62598f2fb87fe0dfca34f82311ffd29df37795.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/init.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: fe62598f2fb87fe0dfca34f82311ffd29df37795 X-VCS-Branch: next Date: Fri, 28 Nov 2014 10:04:03 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d1199334-5bd6-413e-8c47-e2fb51dcd945 X-Archives-Hash: e91d8ca29637e925fbbbaae8ca3c9509 Message-ID: <20141128100403.rNvGE_ZyBGrNxShpex8iTRoKh9zJCNcipWsNtOYpBF4@z> commit: fe62598f2fb87fe0dfca34f82311ffd29df37795 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> AuthorDate: Sat Nov 22 18:46:23 2014 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 18:46:23 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=fe62598f Reshuffle and update with upstream --- policy/modules/system/init.if | 82 ++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/policy/modules/system/init.if b/policy/modules/system/init.if index 2b7793a..99e42fc 100644 --- a/policy/modules/system/init.if +++ b/policy/modules/system/init.if @@ -150,39 +150,6 @@ interface(`init_ranged_domain',` ######################################## ## <summary> -## Mark the file type as a daemon pid file, allowing initrc_t -## to create it -## </summary> -## <param name="filetype"> -## <summary> -## Type to mark as a daemon pid file -## </summary> -## </param> -## <param name="class"> -## <summary> -## Class on which the type is applied -## </summary> -## </param> -## <param name="filename"> -## <summary> -## Filename of the file that the init script creates -## </summary> -## </param> -# -interface(`init_daemon_pid_file',` - gen_require(` - attribute daemonpidfile; - type initrc_t; - ') - - typeattribute $1 daemonpidfile; - - files_pid_file($1) - files_pid_filetrans(initrc_t, $1, $2, $3) -') - -######################################## -## <summary> ## Create a domain for long running processes ## (daemons/services) which are started by init scripts. ## </summary> @@ -421,16 +388,50 @@ interface(`init_ranged_system_domain',` ######################################## ## <summary> -## Mark the type as a daemon run dir +## Mark the file type as a daemon pid file, allowing initrc_t +## to create it ## </summary> -## <param name="rundirtype"> +## <param name="filetype"> +## <summary> +## Type to mark as a daemon pid file +## </summary> +## </param> +## <param name="class"> +## <summary> +## Class on which the type is applied +## </summary> +## </param> +## <param name="filename"> +## <summary> +## Filename of the file that the init script creates +## </summary> +## </param> +# +interface(`init_daemon_pid_file',` + gen_require(` + attribute daemonpidfile; + type initrc_t; + ') + + typeattribute $1 daemonpidfile; + + files_pid_file($1) + files_pid_filetrans(initrc_t, $1, $2, $3) +') + +######################################## +## <summary> +## Mark the file type as a daemon run dir, allowing initrc_t +## to create it +## </summary> +## <param name="filetype"> ## <summary> ## Type to mark as a daemon run dir ## </summary> ## </param> ## <param name="filename"> ## <summary> -## Name of the run dir directory +## Filename of the directory that the init script creates ## </summary> ## </param> # @@ -843,6 +844,14 @@ interface(`init_spec_domtrans_script',` files_list_etc($1) spec_domtrans_pattern($1, initrc_exec_t, initrc_t) + ifdef(`distro_gentoo',` + gen_require(` + type rc_exec_t; + ') + + domtrans_pattern($1, rc_exec_t, initrc_t) + ') + ifdef(`enable_mcs',` range_transition $1 initrc_exec_t:process s0; ') @@ -882,6 +891,7 @@ interface(`init_domtrans_script',` gen_require(` type rc_exec_t; ') + domtrans_pattern($1, rc_exec_t, initrc_t) ') ')