Backport a fix or two so we can stabilize this version.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 169 insertions, 5 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index b09b6f6d74ea..69fb1e50a8ce 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.110 2009/03/31 11:44:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.111 2009/03/31 11:56:19 vapier Exp $
+
+*sandbox-1.6-r1 (31 Mar 2009)
+
+  31 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/sandbox-1.6-disable-qa-static.patch,
+  +files/0001-libsandbox-handle-more-at-functions.patch,
+  +sandbox-1.6-r1.ebuild:
+  Backport a fix or two so we can stabilize this version.
 
 *sandbox-1.7 (31 Mar 2009)
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 6f9b9480d688..25cb71150a38 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,12 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-libsandbox-handle-more-at-functions.patch 1473 RMD160 ae83a5ce443be6845a48f79cda0c95756a9fb8d5 SHA1 3a85ce88b9846ccbec773f8fd68798b5c9d0c3f9 SHA256 7681e867bb4dea26d165f9a066dca798519e2fd57b49c7b31c0c2fc254037523
 AUX 0001-sandbox-fix-typo-in-struct-sandbox_info_t-decl.patch 1069 RMD160 0473174a7bed25713fd8bc073bda8baa9e574603 SHA1 8bb7fa7bca84009ee2c327f021432d38943798a2 SHA256 cb116c9a13f048d7b294ec65c416fa6e35faadd692dba266972296a54c2a0186
 AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe
 AUX sandbox-1.2.18.1-open-cloexec.patch 492 RMD160 01ea2af19e02d2c011a89bcbe3744bcb3804afd2 SHA1 4c3af0fe648ce52713b4fb52fb5ed85c73a4e298 SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf
 AUX sandbox-1.2.18.1-open-normal-fail.patch 3144 RMD160 8a4653312e5f22fcf6e08204536c911d492be28f SHA1 fe1cc6ad1e113109a957391a954bd89742051450 SHA256 9c3b6c4c5595b95f6a00fa9e94f72bbcb41cd5ba689a8a29ebf61c6024e73449
 AUX sandbox-1.2.18.1-rtld-validation.patch 1415 RMD160 760ddfaed30a526923292f294dae67c2431b4d2e SHA1 92de1391b17b51c00f7ad4b34fecfae1923eef7f SHA256 821c22ce76c4a75ad4e5bde186744811bbf73de341c16c5890edfd8b20c95cf5
 AUX sandbox-1.2.20_alpha2-parallel.patch 259 RMD160 97766f2a6aa6c2c57579b69d46e7a3280df4f570 SHA1 3bb4d5ad7b6a517005c8c489c63b13ec2d5e7aa6 SHA256 e14bf149853ae5d276a852b2aac66d0ec53ad9b0fc5babda61e112ca59a9b862
+AUX sandbox-1.6-disable-qa-static.patch 332 RMD160 5c57e59d49b6c9333d0575e4708354fa14d7bf49 SHA1 fc84e3ab9e0aaea8b34e0771595f4dd3666ae7ba SHA256 060afa33dcfb6836676dc0febd5bc272b66b55e3753f739b56664e9ebce0eb20
 DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 SHA1 d48220a0d52556daca029aa370c0d29c09dd6a92 SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0
 DIST sandbox-1.2.20alpha2.tar.bz2 278323 RMD160 ebb3ca0963878810f3ac86633f848576fddb225e SHA1 3cd2262e9de3ad642b6e021eab26b50d6202ef41 SHA256 19f7148e259cf5212b8e587789b61c33cd4053c1947219a22749e7fb750b21d3
 DIST sandbox-1.3.0.tar.lzma 271954 RMD160 24e1fe4acc700a898b8cd72eaebd0bc0d500b5dc SHA1 9a48566e7647e87553091513b975ad955103dbe7 SHA256 0b5b96ae788d734dda9042e38574ea0d8b9ed75878fdddc359ac75b948f23b82
@@ -38,14 +40,15 @@ EBUILD sandbox-1.3.8.ebuild 2364 RMD160 d23df063e264ba3ba77c68f25eede0c0ac3e6eb1
 EBUILD sandbox-1.3.9.ebuild 2364 RMD160 cd69c17113bdbbe09746690e749d38eae1397b70 SHA1 3b8aa50aacc4157274292baf3a00b6dcc4ff124d SHA256 be98343bdc7ebebba584d7795e8345a42f1cbd6f94c0405a693b6e4ebdc46ca8
 EBUILD sandbox-1.4.ebuild 2362 RMD160 2bafc94c0fd0ca48c8f68c33500ff56c3aa13c9c SHA1 eb9ab5b10e1ff8bc65acbc9b724c96c1d8986d23 SHA256 e2f526f79ae4f7402a9aff0080b85c03138cdf411fbe213c65a05bf078a42f5f
 EBUILD sandbox-1.5.ebuild 2362 RMD160 13dfa1a059849a5c7b37d9b1581c5dbbca6c2fb0 SHA1 c76714a764cea29da0e0ee386ae0ba10e9871c49 SHA256 a000e315deef9dacb7b6144ff7ff9cf6a0675e74aceba33812d93acc2b088142
+EBUILD sandbox-1.6-r1.ebuild 2527 RMD160 513c13a067afb559f5193e372774451ed2c73759 SHA1 0972e1f7722dfa1dd84c50ebed7dc20f08d79c84 SHA256 9d3550265844e7050c4b81ffa76ab48fe535313b2e42d3f9fe6e0ad136845746
 EBUILD sandbox-1.6.ebuild 2362 RMD160 3d43d21529bc6b89b0f38150dad91fb4b4b21529 SHA1 0b75b36570fb7111d417308f21c8e6cd1b6a61a4 SHA256 4965d3b1b9572dacdcf77c83022cb05f6917d32107f944433d0a2797210cb063
 EBUILD sandbox-1.7.ebuild 2362 RMD160 546c2820bc334d7f3f25660d798fdd49a2ac8cdb SHA1 2e13523b187d428dd48acaabba053e17b25eb203 SHA256 050d75abf53b79a65ce0dbe0cd6fad666e8e79841b806aaf1242e709e2f59341
-MISC ChangeLog 15217 RMD160 d7d00740923977cb6a292d317af0642be1542100 SHA1 49eedca15b6241e171b3633c4ab06e8e552ac3bd SHA256 1b12f1f3c16506c66b9bf5ff291e1a59092c1e364f80e72a01a8dda5a0fc57b3
+MISC ChangeLog 15486 RMD160 76a19268f50c97a9ef5cf2e485095dd7b3967f63 SHA1 737d9fb9d19103e2cefd552ffc641f30a642240c SHA256 fe7aa8dfb3b432fe84bcdcb8bf3f85407bdff451c2316f081cbb75cf65047d2a
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknSAiEACgkQn/5bYzqsSmFUvQCeLe343iob+8L2cRn9zKpIlbXa
-6ocAnRW7nNUq6aMsO6aEFOoIyoKUIrKa
-=k5Zb
+iEYEARECAAYFAknSBOkACgkQn/5bYzqsSmE0sQCfSZ+QDrtdTU5g9Y8QLRs15p0l
+I/gAoLFdE9jzqHTjqiuDwwss24kjj78y
+=ctGI
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch b/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch
new file mode 100644
index 000000000000..09462b7e1b64
--- /dev/null
+++ b/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch
@@ -0,0 +1,42 @@
+From 25425878243c5ca1ff21e6f479e585c60b943930 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 30 Mar 2009 19:56:29 -0400
+Subject: [PATCH] libsandbox: handle more *at functions
+
+Add some more *at functions to the main checking code.
+
+URL: http://bugs.gentoo.org/264320
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Reported-by: Harald van Dijk <truedfx@gentoo.org>
+---
+ libsandbox/libsandbox.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
+index 88248af..c3f0b55 100644
+--- a/libsandbox/libsandbox.c
++++ b/libsandbox/libsandbox.c
+@@ -681,15 +681,20 @@ static int check_access(sbcontext_t *sbcontext, int sb_nr, const char *func,
+ 	    sb_nr == SB_NR_CREAT       ||
+ 	    sb_nr == SB_NR_CREAT64     ||
+ 	    sb_nr == SB_NR_MKDIR       ||
++	    sb_nr == SB_NR_MKDIRAT     ||
+ 	    sb_nr == SB_NR_MKNOD       ||
+ 	    sb_nr == SB_NR_MKNODAT     ||
+ 	    sb_nr == SB_NR__XMKNOD     ||
+ 	    sb_nr == SB_NR___XMKNOD    ||
+ 	    sb_nr == SB_NR___XMKNODAT  ||
+ 	    sb_nr == SB_NR_MKFIFO      ||
++	    sb_nr == SB_NR_MKFIFOAT    ||
+ 	    sb_nr == SB_NR_LINK        ||
++	    sb_nr == SB_NR_LINKAT      ||
+ 	    sb_nr == SB_NR_SYMLINK     ||
++	    sb_nr == SB_NR_SYMLINKAT   ||
+ 	    sb_nr == SB_NR_RENAME      ||
++	    sb_nr == SB_NR_RENAMEAT    ||
+ 	    sb_nr == SB_NR_LUTIMES     ||
+ 	    sb_nr == SB_NR_UTIMENSAT   ||
+ 	    sb_nr == SB_NR_UTIME       ||
+-- 
+1.6.2
+
diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch
new file mode 100644
index 000000000000..754ef01968c9
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch
@@ -0,0 +1,13 @@
+sandbox-1.7 traces static apps so disable the qa notice as it just scares
+users ... dont want scary stuff in stable!
+
+--- libsandbox/wrapper-funcs/__wrapper_exec.c
++++ libsandbox/wrapper-funcs/__wrapper_exec.c
+@@ -221,7 +221,6 @@
+ 		if (!FUNCTION_SANDBOX_SAFE(path))
+ 			return result;
+ 
+-		sb_check_exec(path, argv);
+ 	}
+ #endif
+ 
diff --git a/sys-apps/sandbox/sandbox-1.6-r1.ebuild b/sys-apps/sandbox/sandbox-1.6-r1.ebuild
new file mode 100644
index 000000000000..14b3e665dda3
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.6-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.6-r1.ebuild,v 1.1 2009/03/31 11:56:19 vapier Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.lzma
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/lzma-utils"
+RDEPEND=""
+
+EMULTILIB_PKG="true"
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-disable-qa-static.patch
+	epatch "${FILESDIR}"/0001-libsandbox-handle-more-at-functions.patch
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	local OABI=${ABI}
+	for ABI in $(get_install_abis) ; do
+		mkdir "${WORKDIR}/build-${ABI}"
+		cd "${WORKDIR}/build-${ABI}"
+
+		multilib_toolchain_setup ${ABI}
+
+		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${P}/" \
+		econf ${myconf} || die
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || die
+	done
+	ABI=${OABI}
+}
+
+src_test() {
+	local OABI=${ABI}
+	for ABI in $(get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Checking sandbox for ABI=${ABI}..."
+		emake check || die "make check failed for ${ABI}"
+	done
+	ABI=${OABI}
+}
+
+src_install() {
+	local OABI=${ABI}
+	for ABI in $(get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
+	done
+	ABI=${OABI}
+
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${D}"/var/log/sandbox
+	chmod 0770 "${D}"/var/log/sandbox
+
+	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+	if [[ -n ${old} ]] ; then
+		elog "Removing old sandbox libraries for you:"
+		elog ${old//${ROOT}}
+		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
+	fi
+}