sys-apps/tomoyo-tools: Bump to 2.3.0_p20100820 (bug #342169)

Package-Manager: portage-2.1.9.31/cvs/Linux x86_64

5 files changed, 207 insertions, 3 deletions

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index efcf343ff8ad..a3f3b975930e 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/tomoyo-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.1 2009/07/28 23:48:36 matsuu Exp $
+# 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 $
+
+*tomoyo-tools-2.3.0_p20100820 (17 Jan 2011)
+
+  17 Jan 2011; Sebastian Pipping <sping@gentoo.org>
+  +tomoyo-tools-2.3.0_p20100820.ebuild,
+  +files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch,
+  +files/tomoyo-tools-2.3.0_p20100820-gentoo.patch:
+  Bump to 2.3.0_p20100820 (bug #342169)
+  - Move to EAPI 2
+  - Start respecting LDFLAGS
+  - Port patch from 2.2.0_p20090727
+  - Fix parallel make issue
 
 *tomoyo-tools-2.2.0_p20090727 (28 Jul 2009)
 
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index 26c07cfb4435..a5fe1923a8c2 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,5 +1,9 @@
 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
 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
 EBUILD tomoyo-tools-2.2.0_p20090727.ebuild 1558 RMD160 d694dc41c133c4bb41e2806bc7381253f9af493f SHA1 5282f0217b5862263c8ab98041b31464a74bfcda SHA256 2b33c94b74c8c63874ceae0b5353dd2b256aa007564a43e26edd6c52ed4aee31
-MISC ChangeLog 448 RMD160 7a0368cced5368755443f98d43ac1987ad16fe90 SHA1 6cfa49561ae99a01e64ac3e0c02f48f94ddd73b0 SHA256 c0877c107aa4867824098b5124894fc90e0179837c98450157b5a0deee9ee33a
+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
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
new file mode 100644
index 000000000000..8b5167702a92
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch
@@ -0,0 +1,102 @@
+--- 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
new file mode 100644
index 000000000000..7e005702e6a0
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-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
new file mode 100644
index 000000000000..811f157d2382
--- /dev/null
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.3.0_p20100820.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_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
+}