More bugfixes.

(Portage version: 2.1.1_pre2-r6)

6 files changed, 284 insertions, 1 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 762180983cf2..705f5056e791 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.67 2006/07/07 15:15:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.68 2006/07/08 21:19:52 azarah Exp $
+
+*sandbox-1.2.20_alpha1-r2 (08 Jul 2006)
+*sandbox-1.2.20_alpha1-r1 (08 Jul 2006)
+
+  08 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
+  +files/sandbox-1.2.20_alpha1-double-free.patch,
+  +sandbox-1.2.20_alpha1-r1.ebuild, +sandbox-1.2.20_alpha1-r2.ebuild:
+  More bugfixes.
 
 *sandbox-1.2.20_alpha1 (07 Jul 2006)
 
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r1 b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r1
new file mode 100644
index 000000000000..a403cb1f613c
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r1
@@ -0,0 +1,3 @@
+MD5 90754fc1822e942bfc8c34d16b5611c5 sandbox-1.2.20alpha1.tar.bz2 265714
+RMD160 d645c64a8bb441a8660a79255574fa3ed16b263c sandbox-1.2.20alpha1.tar.bz2 265714
+SHA256 28f91f12c5a648a72d67e93d84a97666f313e4dd1b3159f5f5e54087718f9169 sandbox-1.2.20alpha1.tar.bz2 265714
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r2 b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r2
new file mode 100644
index 000000000000..26737214198d
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1-r2
@@ -0,0 +1,6 @@
+MD5 5c51e360b7234ce8e06de762d9f41618 sandbox-1.2.20alpha1-patches-1.0.tar.bz2 6565
+RMD160 1b100080af0dcf49ff4aaaf7aee815b5fa36bfe6 sandbox-1.2.20alpha1-patches-1.0.tar.bz2 6565
+SHA256 477cd01994ada2f335af06b1f976d847e8b6d329e26d803b7f48d7e63344f13b sandbox-1.2.20alpha1-patches-1.0.tar.bz2 6565
+MD5 90754fc1822e942bfc8c34d16b5611c5 sandbox-1.2.20alpha1.tar.bz2 265714
+RMD160 d645c64a8bb441a8660a79255574fa3ed16b263c sandbox-1.2.20alpha1.tar.bz2 265714
+SHA256 28f91f12c5a648a72d67e93d84a97666f313e4dd1b3159f5f5e54087718f9169 sandbox-1.2.20alpha1.tar.bz2 265714
diff --git a/sys-apps/sandbox/files/sandbox-1.2.20_alpha1-double-free.patch b/sys-apps/sandbox/files/sandbox-1.2.20_alpha1-double-free.patch
new file mode 100644
index 000000000000..e52648fc486f
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-1.2.20_alpha1-double-free.patch
@@ -0,0 +1,14 @@
+Index: src/sandbox.c
+===================================================================
+--- src/sandbox.c	(revision 295)
++++ src/sandbox.c	(working copy)
+@@ -695,9 +695,6 @@
+ 	if (!spawn_shell(argv_bash, sandbox_environ, print_debug))
+ 		success = 0;
+ 
+-	/* Free environ */
+-	free(sandbox_environ);
+-
+ 	/* Free bash stuff */
+ 	for (i = 0; i < 6; i++) {
+ 		if (argv_bash[i])
diff --git a/sys-apps/sandbox/sandbox-1.2.20_alpha1-r1.ebuild b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r1.ebuild
new file mode 100644
index 000000000000..0325861e4998
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.20_alpha1-r1.ebuild,v 1.1 2006/07/08 21:19:52 azarah Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND=""
+
+setup_multilib() {
+	if use amd64 && has_m32 && [[ ${CONF_MULTILIBDIR} == "lib32" ]]; then
+		export DEFAULT_ABI="amd64"
+		export MULTILIB_ABIS="x86 amd64"
+		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
+		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
+		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
+		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}"-double-free.patch
+}
+
+abi_fail_check() {
+	local ABI=$1
+	if [[ ${ABI} == "x86" ]] ; then
+		echo
+		eerror "Building failed for ABI=x86!.  This usually means a broken"
+		eerror "multilib setup.  Please fix that before filling a bugreport"
+		eerror "against sandbox."
+		echo
+	fi
+}
+
+src_compile() {
+	local myconf
+	local iscross=0
+
+	setup_multilib
+
+	filter-lfs-flags #90228
+
+	has_multilib_profile && myconf="--enable-multilib"
+
+	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1
+
+	OABI=${ABI}
+	OCHOST=${CHOST}
+	for ABI in $(get_install_abis); do
+		mkdir "${WORKDIR}/build-${ABI}-${OCHOST}"
+		cd "${WORKDIR}/build-${ABI}-${OCHOST}"
+
+		# Needed for older broken portage versions (bug #109036)
+		has_version '<sys-apps/portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
+		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
+		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${MY_P}/" \
+		econf --libdir="/usr/$(get_libdir)" ${myconf}
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || {
+			abi_fail_check "${ABI}"
+			die "emake failed for ${ABI}"
+		}
+	done
+	ABI=${OABI}
+	CHOST=${OCHOST}
+}
+
+src_install() {
+	setup_multilib
+
+	OABI=${ABI}
+	for ABI in $(get_install_abis); do
+		cd "${WORKDIR}/build-${ABI}-${CHOST}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		make 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 ${IMAGE}/var/log/sandbox
+	chmod 0770 ${IMAGE}/var/log/sandbox
+}
diff --git a/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild
new file mode 100644
index 000000000000..3642d4137c59
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild,v 1.1 2006/07/08 21:19:52 azarah Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+PVER="1.0"
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${MY_P}-patches-${PVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND=""
+
+setup_multilib() {
+	if use amd64 && has_m32 && [[ ${CONF_MULTILIBDIR} == "lib32" ]]; then
+		export DEFAULT_ABI="amd64"
+		export MULTILIB_ABIS="x86 amd64"
+		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
+		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
+		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
+		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${WORKDIR}/patch"
+}
+
+abi_fail_check() {
+	local ABI=$1
+	if [[ ${ABI} == "x86" ]] ; then
+		echo
+		eerror "Building failed for ABI=x86!.  This usually means a broken"
+		eerror "multilib setup.  Please fix that before filling a bugreport"
+		eerror "against sandbox."
+		echo
+	fi
+}
+
+src_compile() {
+	local myconf
+	local iscross=0
+
+	setup_multilib
+
+	filter-lfs-flags #90228
+
+	has_multilib_profile && myconf="--enable-multilib"
+
+	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1
+
+	OABI=${ABI}
+	OCHOST=${CHOST}
+	for ABI in $(get_install_abis); do
+		mkdir "${WORKDIR}/build-${ABI}-${OCHOST}"
+		cd "${WORKDIR}/build-${ABI}-${OCHOST}"
+
+		# Needed for older broken portage versions (bug #109036)
+		has_version '<sys-apps/portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
+		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
+		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${MY_P}/" \
+		econf --libdir="/usr/$(get_libdir)" ${myconf}
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || {
+			abi_fail_check "${ABI}"
+			die "emake failed for ${ABI}"
+		}
+	done
+	ABI=${OABI}
+	CHOST=${OCHOST}
+}
+
+src_install() {
+	setup_multilib
+
+	OABI=${ABI}
+	for ABI in $(get_install_abis); do
+		cd "${WORKDIR}/build-${ABI}-${CHOST}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		make 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 ${IMAGE}/var/log/sandbox
+	chmod 0770 ${IMAGE}/var/log/sandbox
+}