From 18cde00dbd4f6df2f6032232569cb2f4de9f441a Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Thu, 29 Sep 2011 22:34:06 +0000 Subject: Version bumped. Bug #355823 Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- sys-apps/tomoyo-tools/ChangeLog | 12 ++- sys-apps/tomoyo-tools/Manifest | 16 ++-- ...moyo-tools-2.3.0_p20100820-flags-parallel.patch | 102 --------------------- .../tomoyo-tools-2.3.0_p20100820-gentoo.patch | 16 ---- ...moyo-tools-2.3.0_p20110929-flags-parallel.patch | 90 ++++++++++++++++++ .../tomoyo-tools-2.3.0_p20110929-gentoo.patch | 16 ++++ .../tomoyo-tools-2.3.0_p20100820.ebuild | 70 -------------- .../tomoyo-tools-2.3.0_p20110929.ebuild | 70 ++++++++++++++ 8 files changed, 195 insertions(+), 197 deletions(-) delete mode 100644 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch delete mode 100644 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch create mode 100644 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch create mode 100644 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch delete mode 100644 sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild create mode 100644 sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild (limited to 'sys-apps/tomoyo-tools') 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 + -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_p20100820-flags-parallel.patch deleted file mode 100644 index 8b5167702a92..000000000000 --- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,12 +1,4 @@ --INSTALLDIR = / -- --CC=gcc -- --CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} -- --export CC --export CFLAGS --export INSTALLDIR -+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} - - all: - $(MAKE) -C sbin/ all ---- a/kernel_test/Makefile -+++ b/kernel_test/Makefile -@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to - all: $(ALL_FILES) - chmod 755 testall.sh - --CC=gcc -- --CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} -+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} - - # - # Tools for kernel testing. - # - - tomoyo_new_test: tomoyo_new_test.c include.h -- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil -+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil - chmod 700 tomoyo_new_test - - .c: include.h -- $(CC) $(CFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - chmod 700 $@ - - # ---- a/sbin/Makefile -+++ b/sbin/Makefile -@@ -9,7 +9,7 @@ install: all - cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ - - .c: -- $(CC) $(CFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - - clean: - rm -f -- $(BUILD_FILES) ---- a/usr_lib_tomoyo/Makefile -+++ b/usr_lib_tomoyo/Makefile -@@ -9,7 +9,7 @@ install: all - cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ - - .c: -- $(CC) $(CFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - - 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 - - all: libtomoyotools.so $(BUILD_FILES) - -+$(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 - --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 -+ $(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 -+ $(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_p20100820-gentoo.patch deleted file mode 100644 index 7e005702e6a0..000000000000 --- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch +++ /dev/null @@ -1,16 +0,0 @@ -This is tomoyo-tools-2.2.0_p20090727-gentoo.patch blindly ported to 2.3.0. -Every other change is included by now. - ---- usr_lib_tomoyo/init_policy.c 2011-01-17 22:50:05.241899861 +0100 -+++ usr_lib_tomoyo/init_policy.c 2011-01-17 22:51:00.172806713 +0100 -@@ -1106,6 +1106,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.3.0_p20110929-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch new file mode 100644 index 000000000000..278e28fad6f7 --- /dev/null +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch @@ -0,0 +1,90 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,12 +1,4 @@ +-INSTALLDIR = / +- +-CC=gcc +- +-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} +- +-export CC +-export CFLAGS +-export INSTALLDIR ++CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} + + all: + $(MAKE) -C sbin/ all +--- a/kernel_test/Makefile ++++ b/kernel_test/Makefile +@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to + all: $(ALL_FILES) + chmod 755 testall.sh + +-CC=gcc +- +-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} ++CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} + + # + # Tools for kernel testing. + # + + tomoyo_new_test: tomoyo_new_test.c include.h +- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil + chmod 700 tomoyo_new_test + + .c: include.h +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + chmod 700 $@ + + # +--- a/sbin/Makefile ++++ b/sbin/Makefile +@@ -9,7 +9,7 @@ install: all + cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +--- a/usr_lib_tomoyo/Makefile ++++ b/usr_lib_tomoyo/Makefile +@@ -9,7 +9,7 @@ install: all + cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +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 + + 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 + + .c: +- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. + + 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 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. + + install: all + mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch new file mode 100644 index 000000000000..7e005702e6a0 --- /dev/null +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch @@ -0,0 +1,16 @@ +This is tomoyo-tools-2.2.0_p20090727-gentoo.patch blindly ported to 2.3.0. +Every other change is included by now. + +--- usr_lib_tomoyo/init_policy.c 2011-01-17 22:50:05.241899861 +0100 ++++ usr_lib_tomoyo/init_policy.c 2011-01-17 22:51:00.172806713 +0100 +@@ -1106,6 +1106,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.3.0_p20100820.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild deleted file mode 100644 index 811f157d2382..000000000000 --- a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs - -MY_P="${P/_p/-}" -DESCRIPTION="TOMOYO Linux tools" -HOMEPAGE="http://tomoyo.sourceforge.jp/" -SRC_URI="mirror://sourceforge.jp/tomoyo/48663/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND} - !sys-apps/ccs-tools" - -S="${WORKDIR}/${PN}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-flags-parallel.patch \ - "${FILESDIR}"/${P}-gentoo.patch - - # Fix libdir - for makefile in {,*/}Makefile - do - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \ - "${makefile}" || die - done - - echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}" -} - -src_install() { - dodir /usr/"$(get_libdir)" || die - - emake INSTALLDIR="${D}" install || die - - # Move-link tomoyotools.conf to subdir "conf" - rm "${D}"/usr/$(get_libdir)/tomoyo/tomoyotools.conf || die - insinto /usr/$(get_libdir)/tomoyo/conf - doins usr_lib_tomoyo/tomoyotools.conf || die - dosym conf/tomoyotools.conf /usr/$(get_libdir)/tomoyo/tomoyotools.conf || die - - doenvd "${T}/50${PN}" || die - - # Fix out-of-place readme and license - rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die - dodoc README.tomoyo || die -} - -pkg_postinst() { - elog "Execute the following command to setup the initial policy configuration:" - elog - elog "emerge --config =${CATEGORY}/${PF}" - elog - elog "For more information, please visit the following." - elog - elog "http://tomoyo.sourceforge.jp/" -} - -pkg_config() { - /usr/$(get_libdir)/tomoyo/init_policy -} diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild new file mode 100644 index 000000000000..c7e60fc8f662 --- /dev/null +++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20110929.ebuild @@ -0,0 +1,70 @@ +# 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_p20110929.ebuild,v 1.1 2011/09/29 22:34:06 naota Exp $ + +EAPI="2" + +inherit eutils multilib toolchain-funcs + +MY_P="${P/_p/-}" +DESCRIPTION="TOMOYO Linux tools" +HOMEPAGE="http://tomoyo.sourceforge.jp/" +SRC_URI="mirror://sourceforge.jp/tomoyo/48663/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="sys-libs/ncurses" +RDEPEND="${DEPEND} + !sys-apps/ccs-tools" + +S="${WORKDIR}/${PN}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-flags-parallel.patch \ + "${FILESDIR}"/${P}-gentoo.patch + + # Fix libdir + for makefile in {,*/}Makefile + do + sed -i \ + -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \ + "${makefile}" || die + done + + echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}" +} + +src_install() { + dodir /usr/"$(get_libdir)" || die + + emake INSTALLDIR="${D}" install || die + + # Move-link tomoyotools.conf to subdir "conf" + rm "${D}"/usr/$(get_libdir)/tomoyo/tomoyotools.conf || die + insinto /usr/$(get_libdir)/tomoyo/conf + doins usr_lib_tomoyo/tomoyotools.conf || die + dosym conf/tomoyotools.conf /usr/$(get_libdir)/tomoyo/tomoyotools.conf || die + + doenvd "${T}/50${PN}" || die + + # Fix out-of-place readme and license + rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die + dodoc README.tomoyo || die +} + +pkg_postinst() { + elog "Execute the following command to setup the initial policy configuration:" + elog + elog "emerge --config =${CATEGORY}/${PF}" + elog + elog "For more information, please visit the following." + elog + elog "http://tomoyo.sourceforge.jp/" +} + +pkg_config() { + /usr/$(get_libdir)/tomoyo/init_policy +} -- cgit v1.2.3-65-gdbad