From 9ee12fcf944dfed1fc6709d5f4f18077943e6764 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 3 May 2010 08:59:46 +0000 Subject: [PATCH] amd64 stable Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/fakechroot/ChangeLog | 5 +- sys-apps/fakechroot/Manifest | 9 +- sys-apps/fakechroot/fakechroot-2.6.ebuild | 28 --- sys-apps/fakechroot/fakechroot-2.8.ebuild | 24 -- sys-apps/fakechroot/fakechroot-2.9.ebuild | 4 +- .../fakechroot/files/fakechroot-2.6.patch | 206 ------------------ 6 files changed, 8 insertions(+), 268 deletions(-) delete mode 100644 sys-apps/fakechroot/fakechroot-2.6.ebuild delete mode 100644 sys-apps/fakechroot/fakechroot-2.8.ebuild delete mode 100644 sys-apps/fakechroot/files/fakechroot-2.6.patch diff --git a/sys-apps/fakechroot/ChangeLog b/sys-apps/fakechroot/ChangeLog index 30303e3ff9ae..cc92dd5277ae 100644 --- a/sys-apps/fakechroot/ChangeLog +++ b/sys-apps/fakechroot/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/fakechroot # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/ChangeLog,v 1.8 2010/04/01 08:44:13 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/ChangeLog,v 1.9 2010/05/03 08:59:45 ssuominen Exp $ + + 03 May 2010; Samuli Suominen fakechroot-2.9.ebuild: + amd64 stable wrt #309033 01 Apr 2010; Pawel Hajdan jr fakechroot-2.9.ebuild: diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest index ded281efcd69..0c77ee0066da 100644 --- a/sys-apps/fakechroot/Manifest +++ b/sys-apps/fakechroot/Manifest @@ -1,10 +1,5 @@ -AUX fakechroot-2.6.patch 8286 RMD160 d971cab9908bde150226ffca9a1fe1b08cd28799 SHA1 ecc8b65fa1300e672e7b76232da1d2551b57137a SHA256 b1eee3091426e2d06637083f333c21f4fc08e8579771893d3d11e9e7cc651462 AUX fakechroot-2.9-glibc-2.10-compat.patch 6436 RMD160 1e4c7ce7ee7db24bd22abe647c0c405a0c9d1648 SHA1 ff05265d90abeea5ef0bf683a660b43d5f39c271 SHA256 1535409f5ad0e5049239007615631191399801f021f4365805eee21d8926ad4c -DIST fakechroot_2.6.orig.tar.gz 445712 RMD160 7b4d997b02a3ae9ba27a570ca45ab4768c112f12 SHA1 00e0ba26f127d1fb004093361202845cc230e85f SHA256 2bc10cd8ad2bb9da611af93cc21c9295d820880ae49f70b6d96bc3a2555faaaf -DIST fakechroot_2.8.orig.tar.gz 482013 RMD160 bdac8e181e7df267354042ce0798798e2f821185 SHA1 f4c60c489e821ee73786eac1cf4e8cca2473fea0 SHA256 474939236ed402aede4338d9b5d4149679b5e0f5b5e70594a29dbcf5f14e8095 DIST fakechroot_2.9.orig.tar.gz 490438 RMD160 b4164860eac38d67061c11b15be45212969e7898 SHA1 07f17f1de89aa3c3d05ca35f71c559e9d5c0ee0d SHA256 bfccb079d2d247b05d5f82473beca0043ddfc51a6ed595541575893fa3ab6c3e -EBUILD fakechroot-2.6.ebuild 672 RMD160 0e345804b3a4af35feb3fcd06a209479f0bf9223 SHA1 5d059b235e0759b0957f8cbde136e17a35f9cfc1 SHA256 b38c807cf5587ee29d0ed8cc2896b756da2f7ec26aa7ab68f85c00967be35fce -EBUILD fakechroot-2.8.ebuild 613 RMD160 fbfb925ab46c54b77c75f08e8dfe18d3815886b8 SHA1 b74a0176255fd01193e3ab9d33c7729fc7828133 SHA256 f84806b7fe766615a01f63d92694814fc4829ef94b7d6e80bd82967409f4cc97 -EBUILD fakechroot-2.9.ebuild 748 RMD160 496aa523f17073ff70731467d066aa5f2b69f211 SHA1 fdbe2a7412791317b5c037e0f186c2689719617a SHA256 e88c39941221bc29c814b7a070b920e9d1bc6a5e2e14aef0ee1b6a899887ce92 -MISC ChangeLog 1294 RMD160 f0a7aa841930a85d23a02717d6579c6fa3e21b55 SHA1 9c95e7c48a009e77e3142d3865c27f8e115c68ea SHA256 1ecb84ba9ae72ba988e37033785ded03f454c89838d8e7c8ef1a2f23fe24e241 +EBUILD fakechroot-2.9.ebuild 746 RMD160 e864da9ee7db45337ad5a9f9206d7e8e2240b854 SHA1 19d2a443de2e2fc64b6219fec861ccd71a81f3fa SHA256 3fff70413a355ed71a30e01b264dec5cfb8d6c20bc9d3e029c976d6ace418e2f +MISC ChangeLog 1398 RMD160 14bf56878a3f2db2ed8386134bf529480a1ccf01 SHA1 4472afdccc17350aba2041b5eec088d57b0dc353 SHA256 9098c65574fef25ce5ea45fe0f7052a2b50e732d5eb3cafe52f915a60f0f646a MISC metadata.xml 260 RMD160 7c8f2391a156380ab813494ac3d3db92386fc03b SHA1 631f6ea758b913f6dabd59b83bc8a5f053274f50 SHA256 4e471cd253b0e2e3c1900f0dd3383623080ca9ad9b6e116dd88bac46224681ac diff --git a/sys-apps/fakechroot/fakechroot-2.6.ebuild b/sys-apps/fakechroot/fakechroot-2.6.ebuild deleted file mode 100644 index 81bd1a2cc530..000000000000 --- a/sys-apps/fakechroot/fakechroot-2.6.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/fakechroot-2.6.ebuild,v 1.1 2008/06/10 22:42:10 spock Exp $ - -inherit eutils - -DESCRIPTION="Provide a faked chroot environment without requiring root privileges" -HOMEPAGE="http://fakechroot.alioth.debian.org/" -SRC_URI="mirror://debian/pool/main/f/fakechroot/${PF/-/_}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}.patch -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README THANKS -} diff --git a/sys-apps/fakechroot/fakechroot-2.8.ebuild b/sys-apps/fakechroot/fakechroot-2.8.ebuild deleted file mode 100644 index 6180b4483002..000000000000 --- a/sys-apps/fakechroot/fakechroot-2.8.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/fakechroot-2.8.ebuild,v 1.4 2008/10/24 22:53:34 maekke Exp $ - -inherit eutils - -DESCRIPTION="Provide a faked chroot environment without requiring root privileges" -HOMEPAGE="http://fakechroot.alioth.debian.org/" -SRC_URI="mirror://debian/pool/main/f/fakechroot/${PF/-/_}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -RESTRICT="test" - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README THANKS -} diff --git a/sys-apps/fakechroot/fakechroot-2.9.ebuild b/sys-apps/fakechroot/fakechroot-2.9.ebuild index 8efc34639621..536d33650d4b 100644 --- a/sys-apps/fakechroot/fakechroot-2.9.ebuild +++ b/sys-apps/fakechroot/fakechroot-2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/fakechroot-2.9.ebuild,v 1.3 2010/04/01 08:44:13 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakechroot/fakechroot-2.9.ebuild,v 1.4 2010/05/03 08:59:45 ssuominen Exp $ inherit autotools eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/fakechroot/${PF/-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="" diff --git a/sys-apps/fakechroot/files/fakechroot-2.6.patch b/sys-apps/fakechroot/files/fakechroot-2.6.patch deleted file mode 100644 index 87936921a6a5..000000000000 --- a/sys-apps/fakechroot/files/fakechroot-2.6.patch +++ /dev/null @@ -1,206 +0,0 @@ -diff -Naurp fakechroot-2.6-orig/src/libfakechroot.c fakechroot-2.6/src/libfakechroot.c ---- fakechroot-2.6-orig/src/libfakechroot.c 2008-06-11 00:19:33.000000000 +0200 -+++ fakechroot-2.6/src/libfakechroot.c 2008-06-11 00:21:08.000000000 +0200 -@@ -321,7 +321,9 @@ static char * (*next_canonicalize_file_ - #endif - static int (*next_chdir) (const char *path) = NULL; - static int (*next_chmod) (const char *path, mode_t mode) = NULL; -+static int (*next_fchmodat) (int dfd, const char *path, mode_t mode, int flag) = NULL; - static int (*next_chown) (const char *path, uid_t owner, gid_t group) = NULL; -+static int (*next_fchownat) (int dfd, const char *path, uid_t owner, gid_t group, int flag) = NULL; - /* static int (*next_chroot) (const char *path) = NULL; */ - static int (*next_creat) (const char *pathname, mode_t mode) = NULL; - static int (*next_creat64) (const char *pathname, mode_t mode) = NULL; -@@ -422,12 +424,14 @@ static int (*next_nftw) (const char - static int (*next_nftw64) (const char *dir, int (*fn)(const char *file, const struct stat64 *sb, int flag, struct FTW *s), int nopenfd, int flags) = NULL; - #endif - static int (*next_open) (const char *pathname, int flags, ...) = NULL; -+static int (*next_openat) (int dfd, const char *pathname, int flags, ...) = NULL; - static int (*next_open64) (const char *pathname, int flags, ...) = NULL; -+static int (*next_openat64) (int dfd, const char *pathname, int flags, ...) = NULL; - #if !defined(HAVE___OPENDIR2) - static DIR * (*next_opendir) (const char *name) = NULL; - #endif - static long (*next_pathconf) (const char *path, int name) = NULL; --static int (*next_readlink) (const char *path, char *buf, READLINK_TYPE_ARG3) = NULL; -+static ssize_t (*next_readlink) (const char *path, char *buf, READLINK_TYPE_ARG3) = NULL; - static char * (*next_realpath) (const char *name, char *resolved) = NULL; - static int (*next_remove) (const char *pathname) = NULL; - #ifdef HAVE_REMOVEXATTR -@@ -463,6 +467,9 @@ static int (*next_truncate) (const c - static int (*next_truncate64) (const char *path, off64_t length) = NULL; - #endif - static int (*next_unlink) (const char *pathname) = NULL; -+static int (*next_unlinkat) (int dirfd, const char *pathname, int flags) = NULL; -+static int (*next___fxstatat) (int ver, int dirfd, const char *pathname, struct stat *buf, int flags) = NULL; -+static int (*next___fxstatat64) (int ver, int dirfd, const char *pathname, struct stat64 *buf, int flags) = NULL; - #ifdef HAVE_ULCKPWDF - /* static int (*next_ulckpwdf) (void) = NULL; */ - #endif -@@ -536,7 +543,9 @@ void fakechroot_init (void) - #endif - nextsym(chdir, "chdir"); - nextsym(chmod, "chmod"); -+ nextsym(fchmodat, "fchmodat"); - nextsym(chown, "chown"); -+ nextsym(fchownat, "fchownat"); - /* nextsym(chroot, "chroot"); */ - nextsym(creat, "creat"); - nextsym(creat64, "creat64"); -@@ -637,7 +646,9 @@ void fakechroot_init (void) - nextsym(nftw64, "nftw64"); - #endif - nextsym(open, "open"); -+ nextsym(openat, "openat"); - nextsym(open64, "open64"); -+ nextsym(openat64, "openat64"); - #if !defined(HAVE___OPENDIR2) - nextsym(opendir, "opendir"); - #endif -@@ -678,6 +689,9 @@ void fakechroot_init (void) - nextsym(truncate64, "truncate64"); - #endif - nextsym(unlink, "unlink"); -+ nextsym(unlinkat, "unlinkat"); -+ nextsym(__fxstatat, "__fxstatat"); -+ nextsym(__fxstatat64, "__fxstatat64"); - #ifdef HAVE_ULCKPWDF - /* nextsym(ulckpwdf, "ulckpwdf"); */ - #endif -@@ -921,6 +935,13 @@ int chmod (const char *path, mode_t mode - if (next_chmod == NULL) fakechroot_init(); - return next_chmod(path, mode); - } -+int fchmodat (int dfd, const char *path, mode_t mode, int flag) -+{ -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(path, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ if (next_fchmodat == NULL) fakechroot_init(); -+ return next_fchmodat(dfd, path, mode, flag); -+} - - - /* #include */ -@@ -933,6 +954,13 @@ int chown (const char *path, uid_t owner - return next_chown(path, owner, group); - } - -+int fchownat (int dfd, const char *path, uid_t owner, gid_t group, int flag) -+{ -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(path, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ if (next_fchownat == NULL) fakechroot_init(); -+ return next_fchownat(dfd, path, owner, group, flag); -+} - - /* #include */ - int chroot (const char *path) -@@ -1921,6 +1949,21 @@ int open (const char *pathname, int flag - return next_open(pathname, flags, mode); - } - -+int openat (int dfd, const char *pathname, int flags, ...) { -+ int mode = 0; -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(pathname, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ -+ if (flags & O_CREAT) { -+ va_list arg; -+ va_start (arg, flags); -+ mode = va_arg (arg, int); -+ va_end (arg); -+ } -+ -+ if (next_openat == NULL) fakechroot_init(); -+ return next_openat(dfd, pathname, flags, mode); -+} - - /* #include */ - /* #include */ -@@ -1942,6 +1985,22 @@ int open64 (const char *pathname, int fl - return next_open64(pathname, flags, mode); - } - -+int openat64 (int dfd, const char *pathname, int flags, ...) -+{ -+ int mode = 0; -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(pathname, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ -+ if (flags & O_CREAT) { -+ va_list arg; -+ va_start (arg, flags); -+ mode = va_arg (arg, int); -+ va_end (arg); -+ } -+ -+ if (next_openat64 == NULL) fakechroot_init(); -+ return next_openat64(dfd, pathname, flags, mode); -+} - - #if !defined(HAVE___OPENDIR2) - /* #include */ -@@ -1967,7 +2026,7 @@ long pathconf (const char *path, int nam - - - /* #include */ --int readlink (const char *path, char *buf, READLINK_TYPE_ARG3) -+ssize_t readlink (const char *path, char *buf, READLINK_TYPE_ARG3) - { - int status; - char tmp[FAKECHROOT_MAXPATH], *tmpptr; -@@ -2222,6 +2281,31 @@ int unlink (const char *pathname) - return next_unlink(pathname); - } - -+/* #include */ -+int unlinkat (int dirfd, const char *pathname, int flags) -+{ -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(pathname, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ if (next_unlinkat == NULL) fakechroot_init(); -+ return next_unlinkat(dirfd, pathname, flags); -+} -+ -+/* #include */ -+/* #include */ -+int __fxstatat (int ver, int dirfd, const char *pathname, struct stat *buf, int flags) -+{ -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(pathname, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ if (next___fxstatat == NULL) fakechroot_init(); -+ return next___fxstatat(ver, dirfd, pathname, buf, flags); -+} -+int __fxstatat64 (int ver, int dirfd, const char *pathname, struct stat64 *buf, int flags) -+{ -+ char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH]; -+ expand_chroot_path(pathname, fakechroot_path, fakechroot_ptr, fakechroot_buf); -+ if (next___fxstatat64 == NULL) fakechroot_init(); -+ return next___fxstatat64(ver, dirfd, pathname, buf, flags); -+} - - /* #include */ - /* #include */ -diff -Naurp fakechroot-2.6-orig/test/fakechroot.sh fakechroot-2.6/test/fakechroot.sh ---- fakechroot-2.6-orig/test/fakechroot.sh 2008-06-11 00:19:33.000000000 +0200 -+++ fakechroot-2.6/test/fakechroot.sh 2008-06-11 00:21:08.000000000 +0200 -@@ -30,8 +30,12 @@ for f in \ - /bin/bash \ - /bin/grep \ - /bin/ls \ -+ /bin/cp \ -+ /bin/mkdir \ -+ /bin/chmod \ - /bin/pwd \ - /bin/sh \ -+ /bin/rm \ - /usr/bin/id \ - /usr/bin/find \ - /usr/bin/perl \ -@@ -63,5 +67,5 @@ export LD_PRELOAD - if [ -n "$*" ]; then - HOME=/root /usr/sbin/chroot `pwd`/testtree "$@" - else -- HOME=/root /usr/sbin/chroot `pwd`/testtree /bin/sh -+ HOME=/root /usr/sbin/chroot `pwd`/testtree /bin/bash - fi -- 2.26.2