diff options
| -rw-r--r-- | sys-apps/sandbox/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/sandbox/Manifest | 29 | ||||
| -rw-r--r-- | sys-apps/sandbox/files/digest-sandbox-1.2.18.1-r2 | 3 | ||||
| -rw-r--r-- | sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch | 15 | ||||
| -rw-r--r-- | sys-apps/sandbox/sandbox-1.2.18.1-r2.ebuild | 121 |
5 files changed, 171 insertions, 5 deletions
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog index 22c3b23d5707..2f9d6740ad9e 100644 --- a/sys-apps/sandbox/ChangeLog +++ b/sys-apps/sandbox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/sandbox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.77 2007/10/17 15:55:16 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.78 2007/10/23 23:47:27 vapier Exp $ + +*sandbox-1.2.18.1-r2 (23 Oct 2007) + + 23 Oct 2007; Mike Frysinger <vapier@gentoo.org> + +files/sandbox-1.2.18.1-open-cloexec.patch, +sandbox-1.2.18.1-r2.ebuild: + Work with new "e" fopen() flag in glibc-2.7 #196720. *sandbox-1.2.18.1-r1 (17 Oct 2007) diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 7c44cfc3e637..fa4bb8c2ac34 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,7 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe MD5 1e4d8cd352642245a1af233d6b9b4e2f files/09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 files/09sandbox 37 SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe files/09sandbox 37 +AUX sandbox-1.2.18.1-open-cloexec.patch 492 RMD160 01ea2af19e02d2c011a89bcbe3744bcb3804afd2 SHA1 4c3af0fe648ce52713b4fb52fb5ed85c73a4e298 SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf +MD5 b4434880a9299a496cfd58dec1ed1306 files/sandbox-1.2.18.1-open-cloexec.patch 492 +RMD160 01ea2af19e02d2c011a89bcbe3744bcb3804afd2 files/sandbox-1.2.18.1-open-cloexec.patch 492 +SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf files/sandbox-1.2.18.1-open-cloexec.patch 492 AUX sandbox-1.2.18.1-open-normal-fail.patch 3144 RMD160 8a4653312e5f22fcf6e08204536c911d492be28f SHA1 fe1cc6ad1e113109a957391a954bd89742051450 SHA256 9c3b6c4c5595b95f6a00fa9e94f72bbcb41cd5ba689a8a29ebf61c6024e73449 MD5 a48cef118a8c24ef1bcceaba2d51dff7 files/sandbox-1.2.18.1-open-normal-fail.patch 3144 RMD160 8a4653312e5f22fcf6e08204536c911d492be28f files/sandbox-1.2.18.1-open-normal-fail.patch 3144 @@ -30,6 +37,10 @@ EBUILD sandbox-1.2.18.1-r1.ebuild 3007 RMD160 81c28f4cbb472fd2e373235b762196ee6e MD5 5721d35dddb5b04fa6a989d22c1a9299 sandbox-1.2.18.1-r1.ebuild 3007 RMD160 81c28f4cbb472fd2e373235b762196ee6efc6502 sandbox-1.2.18.1-r1.ebuild 3007 SHA256 978437ed290e771bdf7adb0c68ba9e058cc418667ac6d233c9cebf75c9dbea08 sandbox-1.2.18.1-r1.ebuild 3007 +EBUILD sandbox-1.2.18.1-r2.ebuild 3072 RMD160 3a59adda868ea532b7f1254752487b30dc62ccfc SHA1 a372c17ddce36f6cbf59b9ada36d60791459a07a SHA256 67ced6d3a44ebfecd3f329fc18a7ee32af6819f131f8416bc56df92d6ca7f68f +MD5 dc8554c429932325aa8b834eecf1030f sandbox-1.2.18.1-r2.ebuild 3072 +RMD160 3a59adda868ea532b7f1254752487b30dc62ccfc sandbox-1.2.18.1-r2.ebuild 3072 +SHA256 67ced6d3a44ebfecd3f329fc18a7ee32af6819f131f8416bc56df92d6ca7f68f sandbox-1.2.18.1-r2.ebuild 3072 EBUILD sandbox-1.2.18.1.ebuild 2945 RMD160 9cb706febadfbabc777045d2407e69136607f02f SHA1 068c759e39db22fb25ad13e276caeda1783d09a4 SHA256 d0cbee404fca3aa5655427deb8d63ced658f0379fd81b8102f4cfceeff5b1af7 MD5 29829d7ef94972dfc17144f3b6674e1d sandbox-1.2.18.1.ebuild 2945 RMD160 9cb706febadfbabc777045d2407e69136607f02f sandbox-1.2.18.1.ebuild 2945 @@ -46,10 +57,10 @@ EBUILD sandbox-1.2.20_alpha2.ebuild 3311 RMD160 095366a13d7b84ef8e84c2f3a66685a3 MD5 d1b9a715855c7e8172d2100f2083bf1c sandbox-1.2.20_alpha2.ebuild 3311 RMD160 095366a13d7b84ef8e84c2f3a66685a336e92b2c sandbox-1.2.20_alpha2.ebuild 3311 SHA256 594099cafb47cec4f2c825fce6106f356d0df1173ce7a22420bedcfab1996663 sandbox-1.2.20_alpha2.ebuild 3311 -MISC ChangeLog 10466 RMD160 32f514cde29898654e3f1f4e5581ae4e950d0a62 SHA1 6060ced4d69bf03cfb7fc4af2cc119df19be9d7c SHA256 2cef1e16cb4b17ef39ec4d94b44c814ba04916825c5f542307569b1aac58c185 -MD5 2b93b138c1fe0e3ede16411f5653a02f ChangeLog 10466 -RMD160 32f514cde29898654e3f1f4e5581ae4e950d0a62 ChangeLog 10466 -SHA256 2cef1e16cb4b17ef39ec4d94b44c814ba04916825c5f542307569b1aac58c185 ChangeLog 10466 +MISC ChangeLog 10686 RMD160 1fa706fb394227b5773430fccf294917bc8e7789 SHA1 daf824185072afae8b05839777de93c133db99d5 SHA256 a80a4ef5c47aee7136211eb2ec244aa99132fd32da7c006cdee158eba3747c3c +MD5 8d57981062651a6d1ae6c13c2495a0ef ChangeLog 10686 +RMD160 1fa706fb394227b5773430fccf294917bc8e7789 ChangeLog 10686 +SHA256 a80a4ef5c47aee7136211eb2ec244aa99132fd32da7c006cdee158eba3747c3c ChangeLog 10686 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 metadata.xml 337 @@ -72,9 +83,19 @@ SHA256 0bab4b68b71b653265a17720073d927350749a95a482b8ae18a441efb8ee554d files/di MD5 97542900fffd5ddceb03ac5cf7b9eb52 files/digest-sandbox-1.2.18.1-r1 253 RMD160 241481cf56ce1fb1f8cdbb07545f9055f0af9a65 files/digest-sandbox-1.2.18.1-r1 253 SHA256 0bab4b68b71b653265a17720073d927350749a95a482b8ae18a441efb8ee554d files/digest-sandbox-1.2.18.1-r1 253 +MD5 97542900fffd5ddceb03ac5cf7b9eb52 files/digest-sandbox-1.2.18.1-r2 253 +RMD160 241481cf56ce1fb1f8cdbb07545f9055f0af9a65 files/digest-sandbox-1.2.18.1-r2 253 +SHA256 0bab4b68b71b653265a17720073d927350749a95a482b8ae18a441efb8ee554d files/digest-sandbox-1.2.18.1-r2 253 MD5 7cc4a98b40559e1cae429de1f3bf221d files/digest-sandbox-1.2.20_alpha1-r2 560 RMD160 800ef0043b9fe1e638a1c79d8ecf3db1df5d5185 files/digest-sandbox-1.2.20_alpha1-r2 560 SHA256 7d453d052ed64233f6cdddd915e70c15ef022b13e4b42eaefe111fa1a76833ae files/digest-sandbox-1.2.20_alpha1-r2 560 MD5 029fb3464c9a7f555b36bf111f123c12 files/digest-sandbox-1.2.20_alpha2 265 RMD160 0805fbaf35432d9426e0ab9399fb1e5afbfbff6b files/digest-sandbox-1.2.20_alpha2 265 SHA256 0bb111ea38da430d257ed23ea847c863228fb9096b7a3bdbabfd2bc2662978b5 files/digest-sandbox-1.2.20_alpha2 265 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHHof7p/wUKkr7RBoRAlJ9AKCe01RJRQzLT/bydJ1elWiN10qIMQCfcBeP +zhGDiLGlYabxcZSngKyfZ2w= +=KcRN +-----END PGP SIGNATURE----- diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.18.1-r2 b/sys-apps/sandbox/files/digest-sandbox-1.2.18.1-r2 new file mode 100644 index 000000000000..f894e17eaa8e --- /dev/null +++ b/sys-apps/sandbox/files/digest-sandbox-1.2.18.1-r2 @@ -0,0 +1,3 @@ +MD5 8637808ea8fa55fe10c57d335911e847 sandbox-1.2.18.1.tar.bz2 236755 +RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 sandbox-1.2.18.1.tar.bz2 236755 +SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0 sandbox-1.2.18.1.tar.bz2 236755 diff --git a/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch b/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch new file mode 100644 index 000000000000..806f1a3a6773 --- /dev/null +++ b/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/196720 + +mark the new "e" fopen() flag as safe + +--- sandbox-1.2.18.1/src/libsandbox.c ++++ sandbox-1.2.18.1/src/libsandbox.c +@@ -1595,7 +1595,7 @@ + { + if (*mode == 'r' && (0 == (strcmp(mode, "r")) || + /* The strspn accept args are known non-writable modifiers */ +- (strlen(++mode) == strspn(mode, "xbtmc")))) { ++ (strlen(++mode) == strspn(mode, "xbtmce")))) { + return before_syscall("open_rd", file); + } else { + return before_syscall("open_wr", file); diff --git a/sys-apps/sandbox/sandbox-1.2.18.1-r2.ebuild b/sys-apps/sandbox/sandbox-1.2.18.1-r2.ebuild new file mode 100644 index 000000000000..d28f2cbed286 --- /dev/null +++ b/sys-apps/sandbox/sandbox-1.2.18.1-r2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.18.1-r2.ebuild,v 1.1 2007/10/23 23:47:27 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.bz2 + http://dev.gentoo.org/~azarah/sandbox/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" + +DEPEND="" + +EMULTILIB_PKG="true" + +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}-open-normal-fail.patch #135745 + epatch "${FILESDIR}"/${P}-open-cloexec.patch #196720 +} + +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="../${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} + + 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 +} |