From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5DD421389E2 for ; Wed, 3 Dec 2014 12:56:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 941BCE0951; Wed, 3 Dec 2014 12:56:39 +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 25734E093A for ; Wed, 3 Dec 2014 12:56:36 +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 CFE3D34067C for ; Wed, 3 Dec 2014 12:56:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A23EB749 for ; Wed, 3 Dec 2014 12:56:30 +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: <1417596213.60135df3a91152af95bdab0fb136da7d5a3523e1.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:adminroles commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/spamassassin.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 60135df3a91152af95bdab0fb136da7d5a3523e1 X-VCS-Branch: adminroles Date: Wed, 3 Dec 2014 12:56:30 +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: 5ac74b83-ed6c-4cdf-9257-c2124b144e57 X-Archives-Hash: 0e693b1084c4a89e1274ae4c447276d8 commit: 60135df3a91152af95bdab0fb136da7d5a3523e1 Author: Jason Zaman perfinion com> AuthorDate: Wed Nov 26 06:39:16 2014 +0000 Commit: Jason Zaman perfinion com> CommitDate: Wed Dec 3 08:43:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=60135df3 remove spamassassin_role() from spamassassin_admin() spamassassin_role contains some named filetrans's which can not be applied twice. The roles already contain spamassassin_role which makes adding spamassassin_admin impossible. This removes the role so they can both be applied. --- policy/modules/contrib/spamassassin.if | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/spamassassin.if b/policy/modules/contrib/spamassassin.if index 1499b0b..7f5a1cc 100644 --- a/policy/modules/contrib/spamassassin.if +++ b/policy/modules/contrib/spamassassin.if @@ -404,5 +404,6 @@ interface(`spamassassin_admin',` files_list_pids($1) admin_pattern($1, spamd_var_run_t) - spamassassin_role($2, $1) + # This makes it impossible to apply _admin if _role has already been applied + #spamassassin_role($2, $1) ') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B7B31389E2 for ; Wed, 3 Dec 2014 12:55:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 585C2E08BE; Wed, 3 Dec 2014 12:55:01 +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 19928E08B1 for ; Wed, 3 Dec 2014 12:54:58 +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 1D2A53405E2 for ; Wed, 3 Dec 2014 12:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B588B74A for ; Wed, 3 Dec 2014 12:54:54 +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: <1417596213.60135df3a91152af95bdab0fb136da7d5a3523e1.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/spamassassin.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 60135df3a91152af95bdab0fb136da7d5a3523e1 X-VCS-Branch: master Date: Wed, 3 Dec 2014 12:54:54 +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: 229f840e-1438-48a0-aaea-812e78c34d89 X-Archives-Hash: f064c218a84282b5750526930e271b6b Message-ID: <20141203125454.5qBHxxO-iD_qBmOHJpesMosF2-vNFSMlQtP-BIFfOTc@z> commit: 60135df3a91152af95bdab0fb136da7d5a3523e1 Author: Jason Zaman perfinion com> AuthorDate: Wed Nov 26 06:39:16 2014 +0000 Commit: Jason Zaman perfinion com> CommitDate: Wed Dec 3 08:43:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=60135df3 remove spamassassin_role() from spamassassin_admin() spamassassin_role contains some named filetrans's which can not be applied twice. The roles already contain spamassassin_role which makes adding spamassassin_admin impossible. This removes the role so they can both be applied. --- policy/modules/contrib/spamassassin.if | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/spamassassin.if b/policy/modules/contrib/spamassassin.if index 1499b0b..7f5a1cc 100644 --- a/policy/modules/contrib/spamassassin.if +++ b/policy/modules/contrib/spamassassin.if @@ -404,5 +404,6 @@ interface(`spamassassin_admin',` files_list_pids($1) admin_pattern($1, spamd_var_run_t) - spamassassin_role($2, $1) + # This makes it impossible to apply _admin if _role has already been applied + #spamassassin_role($2, $1) ') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7C0A51389E2 for ; Wed, 3 Dec 2014 12:56:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FE8FE08F5; Wed, 3 Dec 2014 12:56:15 +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 492F3E08F0 for ; Wed, 3 Dec 2014 12:56:14 +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 3C32F340667 for ; Wed, 3 Dec 2014 12:56:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E0C0B749 for ; Wed, 3 Dec 2014 12:56:09 +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: <1417596213.60135df3a91152af95bdab0fb136da7d5a3523e1.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:userroles commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/spamassassin.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 60135df3a91152af95bdab0fb136da7d5a3523e1 X-VCS-Branch: userroles Date: Wed, 3 Dec 2014 12:56:09 +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: bf8a5552-4bf8-4675-b3e5-a33e76052a0e X-Archives-Hash: f764a9e1c000f69645a5ea6711862893 Message-ID: <20141203125609.TON_xGfSr_WCiWmQnMRzkbGyPRV5Yq7-7EBqzleR37I@z> commit: 60135df3a91152af95bdab0fb136da7d5a3523e1 Author: Jason Zaman perfinion com> AuthorDate: Wed Nov 26 06:39:16 2014 +0000 Commit: Jason Zaman perfinion com> CommitDate: Wed Dec 3 08:43:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=60135df3 remove spamassassin_role() from spamassassin_admin() spamassassin_role contains some named filetrans's which can not be applied twice. The roles already contain spamassassin_role which makes adding spamassassin_admin impossible. This removes the role so they can both be applied. --- policy/modules/contrib/spamassassin.if | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/spamassassin.if b/policy/modules/contrib/spamassassin.if index 1499b0b..7f5a1cc 100644 --- a/policy/modules/contrib/spamassassin.if +++ b/policy/modules/contrib/spamassassin.if @@ -404,5 +404,6 @@ interface(`spamassassin_admin',` files_list_pids($1) admin_pattern($1, spamd_var_run_t) - spamassassin_role($2, $1) + # This makes it impossible to apply _admin if _role has already been applied + #spamassassin_role($2, $1) ')