summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2014-03-11 08:13:00 +0000
committerSergey Popov <pinkbyte@gentoo.org>2014-03-11 08:13:00 +0000
commit6eb27d1a3b2b4d155542d86894be48af643edd90 (patch)
treebecb706a4ebf46f497e1320864e1fb87f0ecfdb5 /sys-apps
parentold (diff)
downloadgentoo-2-6eb27d1a3b2b4d155542d86894be48af643edd90.tar.gz
gentoo-2-6eb27d1a3b2b4d155542d86894be48af643edd90.tar.bz2
gentoo-2-6eb27d1a3b2b4d155542d86894be48af643edd90.zip
Revision bump: add support for optional building of CARE binary, wrt bug #502388, thanks to Patrick Lauer. Drop old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/proot/ChangeLog10
-rw-r--r--sys-apps/proot/files/proot-3.2.2-build-care.patch20
-rw-r--r--sys-apps/proot/metadata.xml3
-rw-r--r--sys-apps/proot/proot-3.2.1-r1.ebuild51
-rw-r--r--sys-apps/proot/proot-3.2.1.ebuild48
-rw-r--r--sys-apps/proot/proot-3.2.2-r1.ebuild73
6 files changed, 105 insertions, 100 deletions
diff --git a/sys-apps/proot/ChangeLog b/sys-apps/proot/ChangeLog
index 398435bc4198..034716a590a7 100644
--- a/sys-apps/proot/ChangeLog
+++ b/sys-apps/proot/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-apps/proot
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/ChangeLog,v 1.5 2014/02/25 08:15:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/ChangeLog,v 1.6 2014/03/11 08:13:00 pinkbyte Exp $
+
+*proot-3.2.2-r1 (11 Mar 2014)
+
+ 11 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> -proot-3.2.1.ebuild,
+ -proot-3.2.1-r1.ebuild, +proot-3.2.2-r1.ebuild,
+ +files/proot-3.2.2-build-care.patch, metadata.xml:
+ Revision bump: add support for optional building of CARE binary, wrt bug
+ #502388, thanks to Patrick Lauer. Drop old
*proot-3.2.2 (25 Feb 2014)
diff --git a/sys-apps/proot/files/proot-3.2.2-build-care.patch b/sys-apps/proot/files/proot-3.2.2-build-care.patch
new file mode 100644
index 000000000000..c52a39cf787b
--- /dev/null
+++ b/sys-apps/proot/files/proot-3.2.2-build-care.patch
@@ -0,0 +1,20 @@
+Skip check for building care, patch by Patrick Lauer <patrick AT gentoo.org>
+
+--- src/GNUmakefile 2014-02-25 16:42:04.336863622 +0800
++++ src/GNUmakefile.new 2014-02-25 16:42:26.063050467 +0800
+@@ -54,15 +54,6 @@
+ all: proot
+
+ ######################################################################
+-# Sanity checks
+-
+-ifneq (,$(findstring care,$(MAKECMDGOALS)))
+-ifneq ($(CARE_BUILD_ENV),ok)
+-$(error care is supposed to be built with: http://build.reproducible.io)
+-endif
+-endif
+-
+-######################################################################
+ # Beautified output
+
+ quiet_GEN = @echo " GEN $@"; $(GEN)
diff --git a/sys-apps/proot/metadata.xml b/sys-apps/proot/metadata.xml
index 7c21087ca5ab..9ad8dbdff303 100644
--- a/sys-apps/proot/metadata.xml
+++ b/sys-apps/proot/metadata.xml
@@ -10,4 +10,7 @@
This means that users don't need any privilege or setup to do things like: using an arbitrary directory as the new root filesystem,
making files accessible somewhere else in the filesystem hierarchy, or executing programs built for another CPU architecture
transparently through QEMU user-mode.</longdescription>
+ <use>
+ <flag name="care">Build dynamic CARE binary (more info - http://reproducible.io/)</flag>
+ </use>
</pkgmetadata>
diff --git a/sys-apps/proot/proot-3.2.1-r1.ebuild b/sys-apps/proot/proot-3.2.1-r1.ebuild
deleted file mode 100644
index fb5500d1e550..000000000000
--- a/sys-apps/proot/proot-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.1-r1.ebuild,v 1.1 2013/12/23 16:18:23 pinkbyte Exp $
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils pax-utils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="http://proot.me"
-SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="sys-libs/talloc"
-DEPEND="${RDEPEND}
- test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-makefile.patch" \
- "${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
- epatch_user
-}
-
-src_compile() {
- emake -C src V=1 \
- CC="$(tc-getCC)" \
- CHECK_VERSION="true"
-}
-
-src_install() {
- # Workaround for bug #493416
- pax-mark -Emp src/proot
-
- dobin src/proot
- doman doc/proot.1
- dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
- emake -C tests -j1 CC="$(tc-getCC)"
-}
diff --git a/sys-apps/proot/proot-3.2.1.ebuild b/sys-apps/proot/proot-3.2.1.ebuild
deleted file mode 100644
index 85bace571c85..000000000000
--- a/sys-apps/proot/proot-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.1.ebuild,v 1.1 2013/12/06 07:09:12 pinkbyte Exp $
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="http://proot.me"
-SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="sys-libs/talloc"
-DEPEND="${RDEPEND}
- test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-makefile.patch" \
- "${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
- epatch_user
-}
-
-src_compile() {
- emake -C src V=1 \
- CC="$(tc-getCC)" \
- CHECK_VERSION="true"
-}
-
-src_install() {
- dobin src/proot
- doman doc/proot.1
- dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
- emake -C tests -j1 CC="$(tc-getCC)"
-}
diff --git a/sys-apps/proot/proot-3.2.2-r1.ebuild b/sys-apps/proot/proot-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..c93b0a577f63
--- /dev/null
+++ b/sys-apps/proot/proot-3.2.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.2-r1.ebuild,v 1.1 2014/03/11 08:13:00 pinkbyte Exp $
+
+EAPI=5
+MY_PN="PRoot"
+
+inherit eutils pax-utils toolchain-funcs
+
+DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
+HOMEPAGE="http://proot.me"
+SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="care test"
+
+RDEPEND="care? ( app-arch/libarchive:0= )
+ sys-libs/talloc"
+DEPEND="${RDEPEND}
+ care? ( dev-libs/uthash )
+ test? ( dev-util/valgrind )"
+
+# Breaks sandbox
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
+ "${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
+ "${FILESDIR}/${P}-build-care.patch"
+ epatch_user
+}
+
+src_compile() {
+ # build the proot and care targets
+ emake -C src V=1 \
+ CC="$(tc-getCC)" \
+ CHECK_VERSION="true" \
+ CAREBUILDENV="ok" \
+ proot $(usex care "care" "" "" "")
+}
+
+src_install() {
+ if use care; then
+ # Workaround for bug #493416
+ pax-mark -Emp src/care
+ dobin src/care
+ fi
+ # Workaround for bug #493416
+ pax-mark -Emp src/proot
+
+ dobin src/proot
+ doman doc/proot.1
+ dodoc doc/*.txt doc/articles/*
+}
+
+src_test() {
+ emake -C tests -j1 CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+ if use care; then
+ elog "You have enabled 'care' USE flag, that builds and installs"
+ elog "dynamically linked care binary."
+ elog "Upstream does NOT support such way of building CARE,"
+ elog "it provides only prebuilt binaries."
+ elog "CARE also has known problems on hardened systems"
+ elog "Please do NOT file bugs about them to http://bugs.gentoo.org"
+ fi
+}