Gentoo Archives: gentoo-commits

From:	Sven Vermeulen <sven.vermeulen@××××××.be>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
Date:	Tue, 21 Aug 2012 17:52:51
Message-Id:	`1345122137.7e1a2ca173cd0b7d776d4625d262c72261aa5e56.SwifT@gentoo`

1	commit: 7e1a2ca173cd0b7d776d4625d262c72261aa5e56
2	Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3	AuthorDate: Thu Aug 16 13:02:17 2012 +0000
4	Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5	CommitDate: Thu Aug 16 13:02:17 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=7e1a2ca1
7
8	Remove duplicate file context
9
10	A duplicate file context was found which prohibited loading the java module.
11
12	---
13	policy/modules/contrib/java.fc \| 1 -
14	1 files changed, 0 insertions(+), 1 deletions(-)
15
16	diff --git a/policy/modules/contrib/java.fc b/policy/modules/contrib/java.fc
17	index ca524bd..f526749 100644
18	--- a/policy/modules/contrib/java.fc
19	+++ b/policy/modules/contrib/java.fc
20	@@ -4,7 +4,6 @@
21	/opt/(./)?bin/java[^/] -- gen_context(system_u:object_r:java_exec_t,s0)
22	/opt/ibm/java./(bin\|javaws)(/.)? -- gen_context(system_u:object_r:java_exec_t,s0)
23	/opt/matlab./bin./MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
24	-/opt/matlab./bin./MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
25
26	#
27	# /usr