diff options
author | Naohiro Aota <naota@gentoo.org> | 2011-09-16 04:13:25 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2011-09-16 04:13:25 +0000 |
commit | 3e6000f302f32e911ab6a18331c1e565f1e622f6 (patch) | |
tree | 34dea0bcdd9584aabb8182d098e7152ae4df3074 /sys-apps | |
parent | Revbump to fix typo (diff) | |
download | historical-3e6000f302f32e911ab6a18331c1e565f1e622f6.tar.gz historical-3e6000f302f32e911ab6a18331c1e565f1e622f6.tar.bz2 historical-3e6000f302f32e911ab6a18331c1e565f1e622f6.zip |
Version bump. Add myself as a maintainer.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/tomoyo-tools/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/tomoyo-tools/Manifest | 17 | ||||
-rw-r--r-- | sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch | 113 | ||||
-rw-r--r-- | sys-apps/tomoyo-tools/metadata.xml | 3 | ||||
-rw-r--r-- | sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild | 62 |
5 files changed, 201 insertions, 3 deletions
diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog index a3f3b975930e..0ae456676b95 100644 --- a/sys-apps/tomoyo-tools/ChangeLog +++ b/sys-apps/tomoyo-tools/ChangeLog @@ -1,6 +1,13 @@ # 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.2 2011/01/17 22:44:30 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.3 2011/09/16 04:13:25 naota Exp $ + +*tomoyo-tools-2.4.0_p20110820 (16 Sep 2011) + + 16 Sep 2011; Naohiro Aota <naota@gentoo.org> + +tomoyo-tools-2.4.0_p20110820.ebuild, + +files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch, metadata.xml: + Version bump. Add myself as a maintainer. *tomoyo-tools-2.3.0_p20100820 (17 Jan 2011) diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest index a5fe1923a8c2..ba0e221e3c64 100644 --- a/sys-apps/tomoyo-tools/Manifest +++ b/sys-apps/tomoyo-tools/Manifest @@ -1,9 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX tomoyo-tools-2.2.0_p20090727-gentoo.patch 2403 RMD160 5f0555e62a4e0f6bfe144788c0be1c1c3685b5b1 SHA1 eabeb2fb551db3e81e482dc83ef24269091308e8 SHA256 3bc752c81127fb385aa1c55e1af900b59c9a7cbe9299d70222772f13bcc8c129 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.4.0_p20110820-flags-parallel.patch 4060 RMD160 8aac383ac2c2d29d6a6d4744cfe417aef8fec6ee SHA1 27c0e751ba451d0c4a518f2fd06a6f5230ec037d SHA256 6c213bbec09917125a091aca8715547ce930a2c452a443362270aceedb78279c DIST tomoyo-tools-2.2.0-20090727.tar.gz 75829 RMD160 df7e4e72267aaa0ec2fa546465e1112a858d96e4 SHA1 38e8c1f26f2fbe121a8837515623831a1f348a1c SHA256 7fe5b453b91dd95e7b9c318acf9643737228edc4888addd1891117646fc68527 DIST tomoyo-tools-2.3.0-20100820.tar.gz 97339 RMD160 c1496cb3d0c33a05c6e44ce8b4dc7b3f5805e3a2 SHA1 3353a0adc32d921cfd058513ad98efa6a5efdca6 SHA256 085bade115b46d75f990efba9ca3305341a2ed0813ef79ddaa908bfb558e3cb3 +DIST tomoyo-tools-2.4.0-20110820.tar.gz 191519 RMD160 7a2aee378e490732300a7bcc23e9c5dd6edc77f5 SHA1 833a19f2b0afdc2a096950923864a3041861ee07 SHA256 144313b3e660bee3413d15185bceadf6e197aebebcb3fbe2fe7d4fe6534f36c7 EBUILD tomoyo-tools-2.2.0_p20090727.ebuild 1558 RMD160 d694dc41c133c4bb41e2806bc7381253f9af493f SHA1 5282f0217b5862263c8ab98041b31464a74bfcda SHA256 2b33c94b74c8c63874ceae0b5353dd2b256aa007564a43e26edd6c52ed4aee31 EBUILD tomoyo-tools-2.3.0_p20100820.ebuild 1760 RMD160 bd061be323f22102bf3963d2853732a0b9ef1057 SHA1 3074a06290b207bfaadb1bfce47e70f9edab9e00 SHA256 0cd752038a4fbee2ce4560362a7cca574163a765160bcea3e3d6945998a2ea4c -MISC ChangeLog 849 RMD160 868e3e4506de8998cde13ccbcc294cb96b1d229d SHA1 804db1a9823de94576c5b0e3bce38abeae7e9442 SHA256 297c217730b5619873e61959bfb348865b07fb12c90bed1b6e3ca723dc2192fe -MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371 +EBUILD tomoyo-tools-2.4.0_p20110820.ebuild 1432 RMD160 7a600f6c69698daf0bdb945ca0692c4d11b8506b SHA1 8441f10bee077d8343c70b26ccf431a407b72c83 SHA256 90ccb62654e9ae7861a941a20b51e5d56b3068afa5964c904ac5de1f9c0337be +MISC ChangeLog 1100 RMD160 1142698d6ef471155ee1f920b0e33c9476f6a40e SHA1 5bc86e715c8dbd4686b02874969be439610ddc9f SHA256 fc27fd006712b840da4b71126501887166fa7b8d7132bd53967bab3c8131e1ef +MISC metadata.xml 280 RMD160 c97b72bd1f56c54190ea618b3b076b2ebe6607fb SHA1 13b68fa955564712a29975a703f0d3d262c0885b SHA256 4c466d0dbd166357912f89025b4c1db3e1158ac13c71322c0d505ab4d37be2b3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk5yzOUACgkQGpDnPLSHuMCRCwCfezw8W7tcFX5egDyFKBBpxR5z +f+YAoLKTblDldLH3wPFVDfqheZIDSXTH +=dd4w +-----END PGP SIGNATURE----- diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch new file mode 100644 index 000000000000..8dbc35467666 --- /dev/null +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110820-flags-parallel.patch @@ -0,0 +1,113 @@ +diff --git a/Include.make b/Include.make +index 3f85e61..c34ba28 100644 +--- a/Include.make ++++ b/Include.make +@@ -1,7 +1,5 @@ +-CC := gcc + INSTALL := install + SBINDIR := /sbin + USRSBINDIR := /usr/sbin + USRLIBDIR := /usr/lib + MAN8 := /usr/share/man/man8 +-CFLAGS := -Wall -O2 +diff --git a/kernel_test/Makefile b/kernel_test/Makefile +index 2559b4b..ef599a2 100644 +--- a/kernel_test/Makefile ++++ b/kernel_test/Makefile +@@ -10,25 +10,23 @@ all: $(ALL_FILES) + + $(ALL_FILES): include.h + +-CC=gcc +- +-CFLAGS=-Wall -O2 ++CFLAGS += -Wall -O2 + + # + # Tools for kernel testing. + # + + tomoyo_capability_test: tomoyo_capability_test.c +- $(CC) $(CFLAGS) -o tomoyo_capability_test tomoyo_capability_test.c -lutil ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_capability_test tomoyo_capability_test.c -lutil + + tomoyo_new_capability_test: tomoyo_new_capability_test.c +- $(CC) $(CFLAGS) -o tomoyo_new_capability_test tomoyo_new_capability_test.c -lutil ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_capability_test tomoyo_new_capability_test.c -lutil + + 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 + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + # + # Delete all test programs. +diff --git a/sbin/Makefile b/sbin/Makefile +index 0f53bc6..0e8e42e 100644 +--- a/sbin/Makefile ++++ b/sbin/Makefile +@@ -9,7 +9,7 @@ install: all + $(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_lib_tomoyo/Makefile b/usr_lib_tomoyo/Makefile +index 94020ee..f20ae40 100644 +--- a/usr_lib_tomoyo/Makefile ++++ b/usr_lib_tomoyo/Makefile +@@ -11,7 +11,7 @@ install: all + $(INSTALL) -m 0644 ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/$(USRLIBDIR)/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 fa715b0..5b991db 100644 +--- a/usr_sbin/Makefile ++++ b/usr_sbin/Makefile +@@ -4,9 +4,13 @@ BUILD_FILES := tomoyo-auditd tomoyo-checkpolicy tomoyo-diffpolicy tomoyo-domainm + tomoyo-editpolicy tomoyo-findtemp tomoyo-loadpolicy tomoyo-notifyd tomoyo-patternize \ + tomoyo-pstree tomoyo-queryd tomoyo-savepolicy tomoyo-selectpolicy tomoyo-setlevel \ + tomoyo-setprofile tomoyo-sortpolicy ++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. ++ + $(BUILD_FILES): libtomoyotools.so + + /usr/include/curses.h: +@@ -15,17 +19,17 @@ $(BUILD_FILES): libtomoyotools.so + sleep 10 + + libtomoyotools.so: tomoyotools.c tomoyotools.h +- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.1 ++ $(CC) $(CFLAGS) -fPIC $(LDFLAGS) tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.1 + ln -sf libtomoyotools.so.2.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 -m 0755 $(INSTALLDIR)$(USRLIBDIR) diff --git a/sys-apps/tomoyo-tools/metadata.xml b/sys-apps/tomoyo-tools/metadata.xml index 5b14597b8ad0..1c946afa1b86 100644 --- a/sys-apps/tomoyo-tools/metadata.xml +++ b/sys-apps/tomoyo-tools/metadata.xml @@ -5,5 +5,8 @@ <maintainer> <email>matsuu@gentoo.org</email> </maintainer> +<maintainer> +<email>naota@gentoo.org</email> +</maintainer> </pkgmetadata> diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild new file mode 100644 index 000000000000..cf8d075f31d8 --- /dev/null +++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.4.0_p20110820.ebuild @@ -0,0 +1,62 @@ +# 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.4.0_p20110820.ebuild,v 1.1 2011/09/16 04:13:25 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/52848/${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 + + # Fix libdir + sed -i \ + -e "s:/usr/lib:/usr/$(get_libdir):g" \ + Include.make || die "sed failed" + + echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}" + + tc-export CC +} + +src_install() { + dodir /usr/"$(get_libdir)" || die + + emake INSTALLDIR="${D}" install || 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 +} |