commit: 4994c7667bd2d9e54fa79f705a51a9fbd1af5522 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sun Jan 17 20:09:22 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sun Jan 17 20:12:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4994c766
sys-apps/sandbox: drop versions <2.6 sys-apps/sandbox/Manifest | 4 - .../files/sandbox-1.6-disable-pthread.patch | 37 ------- .../files/sandbox-1.6-disable-qa-static.patch | 13 --- sys-apps/sandbox/sandbox-1.6-r2.ebuild | 104 ------------------ sys-apps/sandbox/sandbox-2.3-r1.ebuild | 103 ------------------ sys-apps/sandbox/sandbox-2.4.ebuild | 100 ------------------ sys-apps/sandbox/sandbox-2.5.ebuild | 117 --------------------- 7 files changed, 478 deletions(-) diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 38fb2ea..fa19c3f 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,8 +1,4 @@ -DIST sandbox-1.6.tar.lzma 307014 SHA256 52cfd286da3d5d51f3b6e012e409e931b21e32b4f2f16ba5677e46328680f4f4 SHA512 f470599a67443fa107612fef1cc73b64b3146003ae21bb5ae5abd852c4c37aec93ac09be646fda9d55d4c3aeef0cf28a42fa675f2acbb53c1d903e400538ba4c WHIRLPOOL 7c7fbe57cc831d0eb7853476e264a85bb8113620948e761563a872d3d55fd3c0ff063332397199001ea9dcb8258f348b827f337b876b2a26f727f10abbc8f712 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192 -DIST sandbox-2.3.tar.xz 344260 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5 SHA512 06ddaa6dc0822474c263650e95284af6cb69c60c9443b5caaf95af8140283f937d5594849064847fe3a4ad89b29b6ef6d6e909a9b85bb5d7fcf8b427d0e9c7e4 WHIRLPOOL 5d3f45a0bbb1aeffb8c83f8978bea65764aa438a5abcb50c66b5f66232d972bde84013694f6806fcc0026cd6d37420c69655d66ec5984a1c6f71a68dcfc95d11 -DIST sandbox-2.4.tar.xz 344664 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e SHA512 c0f8b789bcabd48e03a20a97c9daa82c48f264d7641ecfa51dff7a2d2c34be398cf1db6235eb0211bf0fa78b07bd6e633e06bc102904bf9dd8a95f9fde1ca615 WHIRLPOOL 22f0f55f6e638275781ab5afa29b1a7f5e7f3335a3d2ff37d9fcce0bf9284b271bf1d69b98bcd4b06fdb9ff1528d044f9fb111a58c2a1a5ce33cbe28c0cb869d -DIST sandbox-2.5.tar.xz 355680 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a SHA512 7b870295bb78c1da5550b650a3983d93e503935a8e8452a29a5c6310cc2c2d569a898ea1534e2c670b4a3e5607504fac55f69da6878e0adc9c2c65a5476b4fb0 WHIRLPOOL 887d36638111b09d77674002c07ebad84c24bc4f645d9fb78e180a6c6e7407eb3fb6857877bc152e0cefb676f01df60b20857b8487ce28ff3e4438aef744fe53 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03 DIST sandbox-2.7.tar.xz 390304 SHA256 d6e1230180d84fb64c9788dd372a73a1cd2496ead91cad333a211320d3041149 SHA512 81056460afabe3f9163594f662f5faf87b6dfe8511a001fc4d6ce0171492eb29f3b645a45320032d34475bb2c24bf212d1d05b50878a340f1e2ca580f8f8f38a WHIRLPOOL ad070df6351537e49f939ba195f27ccf5e4566bb8b6e4ba391ab8174771eacf909571284c6fa873d5b55e8540605d2766a3de5d451b6af132c0ff6d96e43f554 DIST sandbox-2.8.tar.xz 410588 SHA256 f01dcac27a4641d1898c4a19bf3a0572f8ec85c3ba12e6ede8af36f6bc047165 SHA512 73a21e72f5825f43ee887efbe73f4ccd8771c7f45438104077aa83448d0a2727ab65be89a7a1a690d3662594df680ca4dc29908763e5abe2a81594b6f8f6ff2e WHIRLPOOL 6c93a0d8737bab4e710f0f20645514c9a5413a2d357a64c2e8b8428567221b949134881e705f979aa374635a278c0b3c646a6cffaf1015024db8f2aab2ec7c74 diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch deleted file mode 100644 index 490bc41..0000000 --- a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch +++ /dev/null @@ -1,37 +0,0 @@ -http://bugs.gentoo.org/263657 - -disable pthread locks ... this is how stable has always worked, so there -wont be any regressions ... - -diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c -index 034d0e7..595d17f 100644 ---- a/libsandbox/libsandbox.c -+++ b/libsandbox/libsandbox.c -@@ -814,9 +814,6 @@ - return result; - } - --/* Need to protect the global sbcontext structure */ --static pthread_mutex_t sb_syscall_lock = PTHREAD_MUTEX_INITIALIZER; -- - bool before_syscall(int dirfd, int sb_nr, const char *func, const char *file, int flags) - { - int old_errno = errno; -@@ -843,8 +840,6 @@ - file = at_file_buf; - } - -- pthread_mutex_lock(&sb_syscall_lock); -- - if (!sb_init) { - init_context(&sbcontext); - sb_init = true; -@@ -885,8 +880,6 @@ - - result = check_syscall(&sbcontext, sb_nr, func, file, flags); - -- pthread_mutex_unlock(&sb_syscall_lock); -- - if (0 == result) { - if ((NULL != getenv(ENV_SANDBOX_PID)) && (is_env_on(ENV_SANDBOX_ABORT))) - 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 deleted file mode 100644 index 754ef01..0000000 --- a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-r2.ebuild b/sys-apps/sandbox/sandbox-1.6-r2.ebuild deleted file mode 100644 index d59b16e..0000000 --- a/sys-apps/sandbox/sandbox-1.6-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"; -SRC_URI="mirror://gentoo/${P}.tar.lzma - https://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 x86 ~sparc-fbsd -x86-fbsd" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -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() { - unpacker_src_unpack - cd "${S}" - epatch "${FILESDIR}"/${P}-disable-qa-static.patch - epatch "${FILESDIR}"/${P}-disable-pthread.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 -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.3-r1.ebuild b/sys-apps/sandbox/sandbox-2.3-r1.ebuild deleted file mode 100644 index 30c85db..0000000 --- a/sys-apps/sandbox/sandbox-2.3-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"; -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -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" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_compile() { - filter-lfs-flags #90228 - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && 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 $(sb_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 $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Installing sandbox for ABI=${ABI}..." - emake DESTDIR="${D}" install || die "make install failed for ${ABI}" - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die - done - ABI=${OABI} - - doenvd "${FILESDIR}"/09sandbox - - # fix 00default install #333131 - rm "${D}"/etc/sandbox.d/*.in || die - - 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 -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.4.ebuild b/sys-apps/sandbox/sandbox-2.4.ebuild deleted file mode 100644 index bb5a592..0000000 --- a/sys-apps/sandbox/sandbox-2.4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"; -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -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" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_compile() { - filter-lfs-flags #90228 - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && 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 $(sb_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 $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Installing sandbox for ABI=${ABI}..." - emake DESTDIR="${D}" install || die "make install failed for ${ABI}" - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die - 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 -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild deleted file mode 100644 index 9047ea0..0000000 --- a/sys-apps/sandbox/sandbox-2.5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"; -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -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" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -sb_foreach_abi() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Running $1 for ABI=${ABI}..." - "$@" - done - ABI=${OABI} -} - -sb_configure() { - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die -} - -sb_compile() { - emake || die -} - -src_compile() { - filter-lfs-flags #90228 - - # Run configures in parallel! - multijob_init - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - multijob_child_init sb_configure - done - ABI=${OABI} - multijob_finish - - sb_foreach_abi sb_compile -} - -sb_test() { - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die -} - -src_test() { - sb_foreach_abi sb_test -} - -sb_install() { - emake DESTDIR="${D}" install || die - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die -} - -src_install() { - sb_foreach_abi sb_install - - 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 -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -}
