summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/tomoyo-tools')
-rw-r--r--sys-apps/tomoyo-tools/ChangeLog12
-rw-r--r--sys-apps/tomoyo-tools/Manifest16
-rw-r--r--sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch (renamed from sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch)46
-rw-r--r--sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch (renamed from sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch)0
-rw-r--r--sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild (renamed from sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild)2
5 files changed, 37 insertions, 39 deletions
diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index 1875eaace2a6..982950e159e4 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,16 @@
# 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.4 2011/09/29 22:15:13 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.5 2011/09/29 22:34:06 naota Exp $
+
+*tomoyo-tools-2.3.0_p20110929 (29 Sep 2011)
+
+ 29 Sep 2011; Naohiro Aota <naota@gentoo.org>
+ -tomoyo-tools-2.3.0_p20100820.ebuild, +tomoyo-tools-2.3.0_p20110929.ebuild,
+ -files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch,
+ -files/tomoyo-tools-2.3.0_p20100820-gentoo.patch,
+ +files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch,
+ +files/tomoyo-tools-2.3.0_p20110929-gentoo.patch:
+ Version bumped. Bug #355823
*tomoyo-tools-2.2.0_p20110211 (29 Sep 2011)
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index 31cb7f612453..b0226dda87a2 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -2,21 +2,21 @@
Hash: SHA1
AUX tomoyo-tools-2.2.0_p20110211-gentoo.patch 708 RMD160 04f0ebfc9520bcc9c4c93632ea8bd48c2b97dc07 SHA1 f7b75000a1eee52edd65a310af5e16344736c9ee SHA256 5f14654b236a43acd8e8d71ece53f71df41a542b33fbe265bf2bee0989714d98
-AUX tomoyo-tools-2.3.0_p20100820-flags-parallel.patch 4103 RMD160 c6187f78dba725243aa1c2cd23d8ecd29a49916c SHA1 3465b957eb8d8e3d17ae13e3a20f23edd809be4c SHA256 9ad3fc6656ca959d0f98de52d4691e3c9f3de82d6b334977cf8c64498a53a523
-AUX tomoyo-tools-2.3.0_p20100820-gentoo.patch 724 RMD160 8b20b0fdc821ba72fa2495b8f48b086c1f7eb71d SHA1 4dbbe71e0f78bd51272ae4271093302e1403246d SHA256 864aeee12e99961b7ee7706cbc74db7de149177ddaca20da4a627fa71c6026c6
+AUX tomoyo-tools-2.3.0_p20110929-flags-parallel.patch 3060 RMD160 9db2e8941cc6b80a363799a03b6eaa9358763599 SHA1 8840cca8978379c376450ab0a6e7827b5cd37fd3 SHA256 4a358394d49bdc83a710f90e40bd504c9695212c45ffc2385fab900d31d6c97e
+AUX tomoyo-tools-2.3.0_p20110929-gentoo.patch 724 RMD160 8b20b0fdc821ba72fa2495b8f48b086c1f7eb71d SHA1 4dbbe71e0f78bd51272ae4271093302e1403246d SHA256 864aeee12e99961b7ee7706cbc74db7de149177ddaca20da4a627fa71c6026c6
AUX tomoyo-tools-2.4.0_p20110820-flags-parallel.patch 4060 RMD160 8aac383ac2c2d29d6a6d4744cfe417aef8fec6ee SHA1 27c0e751ba451d0c4a518f2fd06a6f5230ec037d SHA256 6c213bbec09917125a091aca8715547ce930a2c452a443362270aceedb78279c
DIST tomoyo-tools-2.2.0-20110211.tar.gz 78043 RMD160 39d9578bdda4bb206880f00b95c390fa5a301a35 SHA1 f593b101d105ee5d9b53670ed58944199a6190aa SHA256 9788d5e61430ab8b1c990baabe640b43807366e121723f7b3bb0d88589bf1e9e
-DIST tomoyo-tools-2.3.0-20100820.tar.gz 97339 RMD160 c1496cb3d0c33a05c6e44ce8b4dc7b3f5805e3a2 SHA1 3353a0adc32d921cfd058513ad98efa6a5efdca6 SHA256 085bade115b46d75f990efba9ca3305341a2ed0813ef79ddaa908bfb558e3cb3
+DIST tomoyo-tools-2.3.0-20110929.tar.gz 115875 RMD160 2c5584039b181e25b25e7700ec72fa3014316eda SHA1 3e76e585ce897608e3f1004d8cbfe0dfebe9f744 SHA256 484a41d48c358c117757b8ad6af6a4fe85bc6b0cfe6dd6565bb92d3d9daee70e
DIST tomoyo-tools-2.4.0-20110820.tar.gz 191519 RMD160 7a2aee378e490732300a7bcc23e9c5dd6edc77f5 SHA1 833a19f2b0afdc2a096950923864a3041861ee07 SHA256 144313b3e660bee3413d15185bceadf6e197aebebcb3fbe2fe7d4fe6534f36c7
EBUILD tomoyo-tools-2.2.0_p20110211.ebuild 1557 RMD160 e35478c2a83098847622f907eb8c38ce4c15f56b SHA1 96820756459ec3ed0daf504e46f3979b833d0406 SHA256 fe33cf7a9a6491a6c760d9e2c14b111ea6629249604fa64cdec09c8716c850e4
-EBUILD tomoyo-tools-2.3.0_p20100820.ebuild 1760 RMD160 bd061be323f22102bf3963d2853732a0b9ef1057 SHA1 3074a06290b207bfaadb1bfce47e70f9edab9e00 SHA256 0cd752038a4fbee2ce4560362a7cca574163a765160bcea3e3d6945998a2ea4c
+EBUILD tomoyo-tools-2.3.0_p20110929.ebuild 1760 RMD160 56ecfe9a088a53a13e6f38020ef6ef283f9f5e48 SHA1 1db52ef6ac1df12dcc19254f399905cdec479d0d SHA256 33105558ef288e4711ce13d3f194589274b01e9ad06c13b307da546c23766e75
EBUILD tomoyo-tools-2.4.0_p20110820.ebuild 1432 RMD160 7a600f6c69698daf0bdb945ca0692c4d11b8506b SHA1 8441f10bee077d8343c70b26ccf431a407b72c83 SHA256 90ccb62654e9ae7861a941a20b51e5d56b3068afa5964c904ac5de1f9c0337be
-MISC ChangeLog 1391 RMD160 a2da1bbf9bb83a45b5edde791b145b06850daaa2 SHA1 955c98da665ce10d62bf9fadae01a732241b00f6 SHA256 9dc76c04701fbdfc5bc64a02dc27a38ddbd5bebd10e096a616947279a2fc4c05
+MISC ChangeLog 1816 RMD160 d837fcf0f1732d8a2abc4205743c035266c7120e SHA1 3cc22515a37a36384569341814b7445f68a22c4a SHA256 ccaf5042ab7177678879e151e3befef8de6e1c71fdf9363420320c7f070bcf05
MISC metadata.xml 259 RMD160 22f85d140355c094c3aee2a5c5a823bd0f3fe888 SHA1 09eb7d683c41add3d3fc85fc6c283c0619e61ed3 SHA256 5afc0793a91f3fc43b4d21375ad710fac25f1296ea782c453e512c9363f60187
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6E7fUACgkQGpDnPLSHuMDOdwCfe3oBeE3khEg2bWscZZSGRdXX
-ntQAoLdHLw5yNRQJDuPabRHwIkcUhPXi
-=qRE8
+iEYEARECAAYFAk6E8mEACgkQGpDnPLSHuMAMeQCdHU0/eCik+uEJngsf4NJh1RZT
+t9wAnjwzk2hCJAsOmsY8xYFroPmxhBt+
+=THIw
-----END PGP SIGNATURE-----
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch
index 8b5167702a92..278e28fad6f7 100644
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch
@@ -62,41 +62,29 @@
clean:
rm -f -- $(BUILD_FILES)
---- a/usr_sbin/Makefile 2011-01-17 22:55:46.784698002 +0100
-+++ b/usr_sbin/Makefile 2011-01-17 23:01:59.420137754 +0100
-@@ -1,25 +1,29 @@
- BUILD_FILES = tomoyo-domainmatch tomoyo-queryd tomoyo-pstree tomoyo-checkpolicy tomoyo-editpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy
-+SIMPLE = tomoyo-domainmatch tomoyo-pstree tomoyo-checkpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy
+diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile
+index cdaf507..2b7c4f0 100644
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -14,17 +14,17 @@ $(BUILD_FILES): libtomoyotools.so
+ sleep 10
- all: libtomoyotools.so $(BUILD_FILES)
+ libtomoyotools.so: tomoyotools.c tomoyotools.h
+- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1
+ ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so
-+$(SIMPLE): % : %.c libtomoyotools.so
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L.
-+
- /usr/include/curses.h:
- @echo "/usr/include/curses.h is missing."
- @echo "Run 'yum install ncurses-devel' or 'apt-get install libncurses5-dev'"
- sleep 10
+ .c:
+- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L.
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L.
--tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h
-- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON || ln -f dummy tomoyo-editpolicy
-+tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so
+ tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so
+- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON
--tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h
-- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. || ln -f dummy tomoyo-queryd
-+tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so
+ tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so
+- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L.
- libtomoyotools.so: tomoyotools.c tomoyotools.h
-- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.0
-+ $(CC) $(CFLAGS) -fPIC $(LDFLAGS) tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.0
- ln -sf libtomoyotools.so.1.0.0 libtomoyotools.so
-
- .c:
-- $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $<
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -ltomoyotools -L. $<
-
install: all
mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib
- cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/usr/sbin/
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch
index 7e005702e6a0..7e005702e6a0 100644
--- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild
index 811f157d2382..c7e60fc8f662 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild
@@ -1,6 +1,6 @@
# 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.3.0_p20100820.ebuild,v 1.1 2011/01/17 22:44:30 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild,v 1.1 2011/09/29 22:34:06 naota Exp $
EAPI="2"