Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6f6a4cc authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Update version to 2.3.0 



Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 7e3d199a

Documentation/tomoyo.txt

+5 −5
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.



LiveCD-based tutorials are available at

http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/ubuntu8.04-live/

http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/centos5-live/ .

http://tomoyo.sourceforge.jp/1.7/1st-step/ubuntu10.04-live/

http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ .

Though these tutorials use non-LSM version of TOMOYO, they are useful for you

to know what TOMOYO is.
@@ -13,12 +13,12 @@ to know what TOMOYO is. 
Build the kernel with CONFIG_SECURITY_TOMOYO=y and pass "security=tomoyo" on

kernel's command line.



Please see http://tomoyo.sourceforge.jp/en/2.2.x/ for details.

Please see http://tomoyo.sourceforge.jp/2.3/ for details.



--- Where is documentation? ---



User <-> Kernel interface documentation is available at

http://tomoyo.sourceforge.jp/en/2.2.x/policy-reference.html .

http://tomoyo.sourceforge.jp/2.3/policy-reference.html .



Materials we prepared for seminars and symposiums are available at

http://sourceforge.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
@@ -50,6 +50,6 @@ multiple LSM modules at the same time. We feel sorry that you have to give up 
SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.



We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM

version of TOMOYO, available at http://tomoyo.sourceforge.jp/en/1.6.x/ .

version of TOMOYO, available at http://tomoyo.sourceforge.jp/1.7/ .

LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning

to port non-LSM version's functionalities to LSM versions.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5605,7 +5605,7 @@ L: tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and us 
L:	tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)

L:	tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)

W:	http://tomoyo.sourceforge.jp/

T:	quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches/

T:	quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/

S:	Maintained

F:	security/tomoyo/

security/tomoyo/common.c

+2 −2
Original line number Diff line number Diff line
@@ -1747,7 +1747,7 @@ static int tomoyo_write_answer(struct tomoyo_io_buffer *head) 
static void tomoyo_read_version(struct tomoyo_io_buffer *head)

{

	if (!head->r.eof) {

		tomoyo_io_printf(head, "2.3.0-pre");

		tomoyo_io_printf(head, "2.3.0");

		head->r.eof = true;

	}

}
@@ -2054,6 +2054,6 @@ void tomoyo_check_profile(void) 
	if (tomoyo_profile_version != 20090903)

		panic("Profile version %u is not supported.\n",

		      tomoyo_profile_version);

	printk(KERN_INFO "TOMOYO: 2.3.0-pre   2010/06/03\n");

	printk(KERN_INFO "TOMOYO: 2.3.0\n");

	printk(KERN_INFO "Mandatory Access Control activated.\n");

}