commit: dbab8b0c98dee69518deeb0b970e00bb1b2f848c Author: Milkey Mouse <milkeymouse <AT> meme <DOT> institute> AuthorDate: Fri Apr 27 21:43:14 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Apr 27 21:56:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dbab8b0c
sys-apps/fakeroot: add new package Package-Manager: Portage-2.3.31, Repoman-2.3.9 Manifest-Sign-Key: C6EF5A02F5647987 sys-apps/fakeroot/Manifest | 21 ++++++++++ sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild | 47 ++++++++++++++++++++++ sys-apps/fakeroot/fakeroot-1.22.ebuild | 47 ++++++++++++++++++++++ .../fakeroot/files/fakeroot-1.19-no-acl_h.patch | 37 +++++++++++++++++ .../files/fakeroot-1.20.2-glibc-2.24.patch | 32 +++++++++++++++ sys-apps/fakeroot/files/fakeroot-1.22-no64.patch | 17 ++++++++ .../fakeroot/files/fakeroot-1.22-xstatjunk.patch | 11 +++++ sys-apps/fakeroot/metadata.xml | 8 ++++ 8 files changed, 220 insertions(+) diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest new file mode 100644 index 0000000..4d22c2d --- /dev/null +++ b/sys-apps/fakeroot/Manifest @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231 +DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEE8JaD5QHaZGPThRiKxu9aAvVkeYcFAlrjmWwACgkQxu9aAvVk +eYd4sw/9HqIxExTLkOyrCNNSBgtAvg1nyOGcNp7LayNZ2jdyw7WOAN/UFDQKsgic +/V+gg19QNzS0yNDnUweulZCdBhBwZjMvRz7InlEDfWhBUnXaxj0vADCj3oCr1OqL +6AMptHUwIVftkHnkZXSb8WXpyGz5FzbtUwGJGa4kHMIc9qiGWQ4tdtBvYmFqTKTC +8S9/BuCuM4aNa9B1YVVVuZfnVMN1Db9LrzGod5mUXn+uOeQnlEOhcjvKuGfk7Fb0 +ke38PwhkiUAz9glZyf1C8EnHLGq5srKs6o7Rnelf8qGCEGvW9Ybv5L2VbvBf+Uvn +5xOjC/zBcsJjaGVE6EpEFQ5jjkdT3Cfcu/R7JW0+Sm1DOLjbc1uYWHzts0k/1hzf +mzkDYpaA0w8rUoDknnVdjw1kHGT7Ko+f7MOPavpksLgSji++EzAgKZJTNhJAHaQV +ewQgdaWikBjgMOP5qcbUoT7w+B3Fx4Nsc1H7wBOYAXV7ka/f6VY479vetEg83rjj +Prat/RnkXZ35nL8pzSniadTy3reC3qnus9hC02RY65odPJb9sN5iIf0MUcWke4eI +0WMtzA1MOxAgiuwDcPYpC71coHe7+tV0yh70XaNMOEXUiJxMjM0gvQKDwbTDsh76 +J4YW3pNASEfzdNC/EzarVuwaqEeAwzlj6IkPWJGYeEzWemS1e9E= +=q0XQ +-----END PGP SIGNATURE----- diff --git a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild new file mode 100644 index 0000000..3c94270 --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic + +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"; +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="acl debug static-libs test" + +DEPEND=" + sys-libs/libcap + acl? ( sys-apps/acl ) + test? ( app-arch/sharutils )" + +DOCS="AUTHORS BUGS DEBUG README doc/README.saving" + +PATCHES=( + "${FILESDIR}"/${PN}-1.19-no-acl_h.patch + "${FILESDIR}"/${P}-glibc-2.24.patch + "${FILESDIR}"/${PN}-1.22-xstatjunk.patch + "${FILESDIR}"/${PN}-1.22-no64.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + export ac_cv_header_sys_acl_h=$(usex acl) + + use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + prune_libtool_files +} diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild new file mode 100644 index 0000000..670d76d --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic + +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"; +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl debug static-libs test" + +DEPEND=" + sys-libs/libcap + acl? ( sys-apps/acl ) + test? ( app-arch/sharutils )" + +DOCS="AUTHORS BUGS DEBUG README doc/README.saving" + +PATCHES=( + "${FILESDIR}"/${PN}-1.19-no-acl_h.patch + "${FILESDIR}"/${PN}-1.20.2-glibc-2.24.patch + "${FILESDIR}"/${PN}-1.22-xstatjunk.patch + "${FILESDIR}"/${PN}-1.22-no64.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + export ac_cv_header_sys_acl_h=$(usex acl) + + use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${ED}" -name '*.la' -o -name '*.a' -delete || die +} diff --git a/sys-apps/fakeroot/files/fakeroot-1.19-no-acl_h.patch b/sys-apps/fakeroot/files/fakeroot-1.19-no-acl_h.patch new file mode 100644 index 0000000..d208b8f --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.19-no-acl_h.patch @@ -0,0 +1,37 @@ +http://bugs.gentoo.org/424419 + +--- fakeroot-1.19/libfakeroot.c ++++ fakeroot-1.19/libfakeroot.c +@@ -1908,6 +1908,7 @@ + return fakeroot_disabled; + } + ++#ifdef HAVE_SYS_ACL_H + #ifdef HAVE_ACL_T + acl_t acl_get_fd(int fd) { + errno = ENOTSUP; +@@ -1926,6 +1927,7 @@ + errno = ENOTSUP; + return -1; + } ++#endif /* HAVE_ACL_T */ + #endif /* HAVE_SYS_ACL_H */ + + #ifdef HAVE_FTS_READ +--- fakeroot-1.19/wrapfunc.inp ++++ fakeroot-1.19/wrapfunc.inp +@@ -206,12 +206,14 @@ + #endif /* HAVE_UNLINKAT */ + #endif /* HAVE_FSTATAT */ + ++#ifdef HAVE_SYS_ACL_H + #ifdef HAVE_ACL_T + acl_get_fd;acl_t;(int fd);(fd) + acl_get_file;acl_t;(const char *path_p, acl_type_t type);(path_p, type) + acl_set_fd;int;(int fd, acl_t acl);(fd, acl) + acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl) + #endif /* HAVE_ACL_T */ ++#endif /* HAVE_SYS_ACL_H */ + + #ifdef HAVE_FTS_READ + fts_read;FTSENT *;(FTS *ftsp);(ftsp) diff --git a/sys-apps/fakeroot/files/fakeroot-1.20.2-glibc-2.24.patch b/sys-apps/fakeroot/files/fakeroot-1.20.2-glibc-2.24.patch new file mode 100644 index 0000000..3fd34c8 --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.20.2-glibc-2.24.patch @@ -0,0 +1,32 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode <juli...@ubuntu.com> +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + diff --git a/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch b/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch new file mode 100644 index 0000000..ff95f96 --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch @@ -0,0 +1,17 @@ +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -81,12 +81,14 @@ + #define SEND_STAT64(a,b,c) send_stat64(a,b,c) + #define SEND_GET_STAT(a,b) send_get_stat(a,b) + #define SEND_GET_STAT64(a,b) send_get_stat64(a,b) ++#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c) + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c) + #else + #define SEND_STAT(a,b,c) send_stat(a,b) + #define SEND_STAT64(a,b,c) send_stat64(a,b) + #define SEND_GET_STAT(a,b) send_get_stat(a) + #define SEND_GET_STAT64(a,b) send_get_stat64(a) ++#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b) + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) + #endif + diff --git a/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch b/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch new file mode 100644 index 0000000..12f2759 --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch @@ -0,0 +1,11 @@ +--- fakeroot-1.18.4.orig/configure.ac 2012-06-02 18:23:41.000000000 +0000 ++++ fakeroot-1.18.4configure.ac 2015-09-24 23:15:56.917470073 +0000 +@@ -301,7 +301,7 @@ + FUNC=`echo $SEARCH|sed -e 's/.*%//'` + PRE=`echo $SEARCH|sed -e 's/%.*//'` + FOUND= +- for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do ++ for WRAPPED in ${PRE}${FUNC}; do + AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED) + dnl + dnl to unconditionally define only the _* functions, comment out the 2 lines above, diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml new file mode 100644 index 0000000..4eb20a0 --- /dev/null +++ b/sys-apps/fakeroot/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>base-sys...@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> +</pkgmetadata>
