Version bump.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 25 insertions, 73 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index 0ae456676b95..1875eaace2a6 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/tomoyo-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.3 2011/09/16 04:13:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.4 2011/09/29 22:15:13 naota Exp $
+
+*tomoyo-tools-2.2.0_p20110211 (29 Sep 2011)
+
+  29 Sep 2011; Naohiro Aota <naota@gentoo.org>
+  -tomoyo-tools-2.2.0_p20090727.ebuild, +tomoyo-tools-2.2.0_p20110211.ebuild,
+  -files/tomoyo-tools-2.2.0_p20090727-gentoo.patch,
+  +files/tomoyo-tools-2.2.0_p20110211-gentoo.patch:
+  Version bump.
 
 *tomoyo-tools-2.4.0_p20110820 (16 Sep 2011)
 
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20090727-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20090727-gentoo.patch
deleted file mode 100644
index 8b0187c2d2c0..000000000000
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20090727-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur tomoyo-tools.orig/tomoyo_init_policy.c tomoyo-tools/tomoyo_init_policy.c
---- tomoyo-tools.orig/tomoyo_init_policy.c	2009-07-27 15:00:00.000000000 +0900
-+++ tomoyo-tools/tomoyo_init_policy.c	2009-07-29 01:56:32.000000000 +0900
-@@ -728,6 +728,15 @@
- 		echo("file_pattern "
- 		     "/tmp/crontab.\\?\\?\\?\\?\\?\\?/crontab");
- 	}
-+	const char *exe = which("crontab");
-+	if (!exe)
-+		return;
-+	if (fgrep("crontab.XXXXXXXXXX", exe))
-+		echo("file_pattern /tmp/crontab.XXXX\\?\\?\\?\\?\\?\\?");
-+	if (fgrep("crontab.XXXXXX", exe))
-+		echo("file_pattern /tmp/crontab.\\?\\?\\?\\?\\?\\?");
-+	if (fgrep("fcr-XXXXXX", exe))
-+		echo("file_pattern /tmp/fcr-\\?\\?\\?\\?\\?\\?");
- }
- 
- static void make_globally_readable_files(void)
-@@ -737,6 +746,8 @@
- 		"/etc/ld.so.cache", "/proc/meminfo",
- 		"/proc/sys/kernel/version", "/etc/localtime",
- 		"/usr/lib/gconv/gconv-modules.cache",
-+		"/usr/lib32/gconv/gconv-modules.cache",
-+		"/usr/lib64/gconv/gconv-modules.cache",
- 		"/usr/share/locale/locale.alias"
- 	};
- 	int i;
-@@ -813,6 +824,7 @@
- 		"/sbin/syslogd",
- 		"/sbin/udevd",
- 		"/usr/X11R6/bin/xfs",
-+		"/usr/bin/dbus-daemon",
- 		"/usr/bin/dbus-daemon-1",
- 		"/usr/bin/jserver",
- 		"/usr/bin/mDNSResponder",
-@@ -906,6 +918,11 @@
- 		echo("file_pattern /var/spool/squid/\\*/\\*/");
- 		echo("file_pattern /var/spool/squid/\\*/\\*/\\*");
- 	}
-+	if (!lstat("/var/cache/squid", &buf) && S_ISDIR(buf.st_mode)) {
-+		echo("file_pattern /var/cache/squid/\\*/");
-+		echo("file_pattern /var/cache/squid/\\*/\\*/");
-+		echo("file_pattern /var/cache/squid/\\*/\\*/\\*");
-+	}
- }
- 
- static void make_patterns_for_spamd(void)
-@@ -1059,6 +1076,10 @@
- 	}
- 	if (fgrep("/tmp/whatis.XXXXXX", exe))
- 		echo("file_pattern /tmp/whatis.\\?\\?\\?\\?\\?\\?");
-+	if (fgrep("/tmp/whatis.tmp.dir.$$", exe)) {
-+		echo("file_pattern /tmp/whatis.tmp.dir\\$/");
-+		echo("file_pattern /tmp/whatis.tmp.dir\\$/w");
-+	}
- }
- 
- static void make_patterns_for_automount(void)
-@@ -1238,6 +1259,10 @@
- 	echo("file_pattern /etc/gshadow.\\$");
- 	echo("file_pattern /etc/passwd.\\$");
- 	echo("file_pattern /etc/shadow.\\$");
-+	echo("file_pattern /etc/group.edit");
-+	echo("file_pattern /etc/gshadow.edit");
-+	echo("file_pattern /etc/passwd.edit");
-+	echo("file_pattern /etc/shadow.edit");
- 	echo("file_pattern /var/cache/logwatch/logwatch.\\*/");
- 	echo("file_pattern /var/cache/logwatch/logwatch.\\*/\\*");
- 	echo("file_pattern /var/tmp/sqlite_\\*");
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-gentoo.patch
new file mode 100644
index 000000000000..33c73bc10dc8
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-gentoo.patch
@@ -0,0 +1,14 @@
+diff -Naur tomoyo-tools.orig/tomoyo_init_policy.c tomoyo-tools/tomoyo_init_policy.c
+--- tomoyo-tools.orig/tomoyo_init_policy.c	2009-07-27 15:00:00.000000000 +0900
++++ tomoyo-tools/tomoyo_init_policy.c	2009-07-29 01:56:32.000000000 +0900
+@@ -1238,6 +1259,10 @@
+ 	echo("file_pattern /etc/gshadow.\\$");
+ 	echo("file_pattern /etc/passwd.\\$");
+ 	echo("file_pattern /etc/shadow.\\$");
++	echo("file_pattern /etc/group.edit");
++	echo("file_pattern /etc/gshadow.edit");
++	echo("file_pattern /etc/passwd.edit");
++	echo("file_pattern /etc/shadow.edit");
+ 	echo("file_pattern /var/cache/logwatch/logwatch.\\*/");
+ 	echo("file_pattern /var/cache/logwatch/logwatch.\\*/\\*");
+ 	echo("file_pattern /var/tmp/sqlite_\\*");
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20090727.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild
index f141c0be301a..010354d2950a 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20090727.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20090727.ebuild,v 1.1 2009/07/28 23:48:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild,v 1.1 2011/09/29 22:15:13 naota Exp $
 
 inherit eutils multilib toolchain-funcs