Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/fakeroot/files/, sys-apps/fakeroot/
Date: Fri, 27 Apr 2018 21:57:20
Message-Id: 1524866207.dbab8b0c98dee69518deeb0b970e00bb1b2f848c.blueness@gentoo
1 commit: dbab8b0c98dee69518deeb0b970e00bb1b2f848c
2 Author: Milkey Mouse <milkeymouse <AT> meme <DOT> institute>
3 AuthorDate: Fri Apr 27 21:43:14 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 27 21:56:47 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dbab8b0c
7
8 sys-apps/fakeroot: add new package
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11 Manifest-Sign-Key: C6EF5A02F5647987
12
13 sys-apps/fakeroot/Manifest | 21 ++++++++++
14 sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild | 47 ++++++++++++++++++++++
15 sys-apps/fakeroot/fakeroot-1.22.ebuild | 47 ++++++++++++++++++++++
16 .../fakeroot/files/fakeroot-1.19-no-acl_h.patch | 37 +++++++++++++++++
17 .../files/fakeroot-1.20.2-glibc-2.24.patch | 32 +++++++++++++++
18 sys-apps/fakeroot/files/fakeroot-1.22-no64.patch | 17 ++++++++
19 .../fakeroot/files/fakeroot-1.22-xstatjunk.patch | 11 +++++
20 sys-apps/fakeroot/metadata.xml | 8 ++++
21 8 files changed, 220 insertions(+)
22
23 diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
24 new file mode 100644
25 index 0000000..4d22c2d
26 --- /dev/null
27 +++ b/sys-apps/fakeroot/Manifest
28 @@ -0,0 +1,21 @@
29 +-----BEGIN PGP SIGNED MESSAGE-----
30 +Hash: SHA256
31 +
32 +DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
33 +DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
34 +-----BEGIN PGP SIGNATURE-----
35 +
36 +iQIzBAEBCAAdFiEE8JaD5QHaZGPThRiKxu9aAvVkeYcFAlrjmWwACgkQxu9aAvVk
37 +eYd4sw/9HqIxExTLkOyrCNNSBgtAvg1nyOGcNp7LayNZ2jdyw7WOAN/UFDQKsgic
38 +/V+gg19QNzS0yNDnUweulZCdBhBwZjMvRz7InlEDfWhBUnXaxj0vADCj3oCr1OqL
39 +6AMptHUwIVftkHnkZXSb8WXpyGz5FzbtUwGJGa4kHMIc9qiGWQ4tdtBvYmFqTKTC
40 +8S9/BuCuM4aNa9B1YVVVuZfnVMN1Db9LrzGod5mUXn+uOeQnlEOhcjvKuGfk7Fb0
41 +ke38PwhkiUAz9glZyf1C8EnHLGq5srKs6o7Rnelf8qGCEGvW9Ybv5L2VbvBf+Uvn
42 +5xOjC/zBcsJjaGVE6EpEFQ5jjkdT3Cfcu/R7JW0+Sm1DOLjbc1uYWHzts0k/1hzf
43 +mzkDYpaA0w8rUoDknnVdjw1kHGT7Ko+f7MOPavpksLgSji++EzAgKZJTNhJAHaQV
44 +ewQgdaWikBjgMOP5qcbUoT7w+B3Fx4Nsc1H7wBOYAXV7ka/f6VY479vetEg83rjj
45 +Prat/RnkXZ35nL8pzSniadTy3reC3qnus9hC02RY65odPJb9sN5iIf0MUcWke4eI
46 +0WMtzA1MOxAgiuwDcPYpC71coHe7+tV0yh70XaNMOEXUiJxMjM0gvQKDwbTDsh76
47 +J4YW3pNASEfzdNC/EzarVuwaqEeAwzlj6IkPWJGYeEzWemS1e9E=
48 +=q0XQ
49 +-----END PGP SIGNATURE-----
50
51 diff --git a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild
52 new file mode 100644
53 index 0000000..3c94270
54 --- /dev/null
55 +++ b/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild
56 @@ -0,0 +1,47 @@
57 +# Copyright 1999-2018 Gentoo Foundation
58 +# Distributed under the terms of the GNU General Public License v2
59 +
60 +EAPI=6
61 +
62 +inherit autotools eutils flag-o-matic
63 +
64 +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
65 +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
66 +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
67 +
68 +LICENSE="GPL-3"
69 +SLOT="0"
70 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
71 +IUSE="acl debug static-libs test"
72 +
73 +DEPEND="
74 + sys-libs/libcap
75 + acl? ( sys-apps/acl )
76 + test? ( app-arch/sharutils )"
77 +
78 +DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
79 +
80 +PATCHES=(
81 + "${FILESDIR}"/${PN}-1.19-no-acl_h.patch
82 + "${FILESDIR}"/${P}-glibc-2.24.patch
83 + "${FILESDIR}"/${PN}-1.22-xstatjunk.patch
84 + "${FILESDIR}"/${PN}-1.22-no64.patch
85 +)
86 +
87 +src_prepare() {
88 + default
89 + eautoreconf
90 +}
91 +
92 +src_configure() {
93 + export ac_cv_header_sys_acl_h=$(usex acl)
94 +
95 + use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
96 + econf \
97 + $(use_enable static-libs static)
98 +}
99 +
100 +src_install() {
101 + default
102 + prune_libtool_files
103 +}
104
105 diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
106 new file mode 100644
107 index 0000000..670d76d
108 --- /dev/null
109 +++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
110 @@ -0,0 +1,47 @@
111 +# Copyright 1999-2018 Gentoo Foundation
112 +# Distributed under the terms of the GNU General Public License v2
113 +
114 +EAPI=6
115 +
116 +inherit autotools flag-o-matic
117 +
118 +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
119 +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
120 +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
121 +
122 +LICENSE="GPL-3"
123 +SLOT="0"
124 +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
125 +IUSE="acl debug static-libs test"
126 +
127 +DEPEND="
128 + sys-libs/libcap
129 + acl? ( sys-apps/acl )
130 + test? ( app-arch/sharutils )"
131 +
132 +DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
133 +
134 +PATCHES=(
135 + "${FILESDIR}"/${PN}-1.19-no-acl_h.patch
136 + "${FILESDIR}"/${PN}-1.20.2-glibc-2.24.patch
137 + "${FILESDIR}"/${PN}-1.22-xstatjunk.patch
138 + "${FILESDIR}"/${PN}-1.22-no64.patch
139 +)
140 +
141 +src_prepare() {
142 + default
143 + eautoreconf
144 +}
145 +
146 +src_configure() {
147 + export ac_cv_header_sys_acl_h=$(usex acl)
148 +
149 + use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
150 + econf \
151 + $(use_enable static-libs static)
152 +}
153 +
154 +src_install() {
155 + default
156 + find "${ED}" -name '*.la' -o -name '*.a' -delete || die
157 +}
158
159 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
160 new file mode 100644
161 index 0000000..d208b8f
162 --- /dev/null
163 +++ b/sys-apps/fakeroot/files/fakeroot-1.19-no-acl_h.patch
164 @@ -0,0 +1,37 @@
165 +http://bugs.gentoo.org/424419
166 +
167 +--- fakeroot-1.19/libfakeroot.c
168 ++++ fakeroot-1.19/libfakeroot.c
169 +@@ -1908,6 +1908,7 @@
170 + return fakeroot_disabled;
171 + }
172 +
173 ++#ifdef HAVE_SYS_ACL_H
174 + #ifdef HAVE_ACL_T
175 + acl_t acl_get_fd(int fd) {
176 + errno = ENOTSUP;
177 +@@ -1926,6 +1927,7 @@
178 + errno = ENOTSUP;
179 + return -1;
180 + }
181 ++#endif /* HAVE_ACL_T */
182 + #endif /* HAVE_SYS_ACL_H */
183 +
184 + #ifdef HAVE_FTS_READ
185 +--- fakeroot-1.19/wrapfunc.inp
186 ++++ fakeroot-1.19/wrapfunc.inp
187 +@@ -206,12 +206,14 @@
188 + #endif /* HAVE_UNLINKAT */
189 + #endif /* HAVE_FSTATAT */
190 +
191 ++#ifdef HAVE_SYS_ACL_H
192 + #ifdef HAVE_ACL_T
193 + acl_get_fd;acl_t;(int fd);(fd)
194 + acl_get_file;acl_t;(const char *path_p, acl_type_t type);(path_p, type)
195 + acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
196 + acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)
197 + #endif /* HAVE_ACL_T */
198 ++#endif /* HAVE_SYS_ACL_H */
199 +
200 + #ifdef HAVE_FTS_READ
201 + fts_read;FTSENT *;(FTS *ftsp);(ftsp)
202
203 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
204 new file mode 100644
205 index 0000000..3fd34c8
206 --- /dev/null
207 +++ b/sys-apps/fakeroot/files/fakeroot-1.20.2-glibc-2.24.patch
208 @@ -0,0 +1,32 @@
209 +Description: Hide error from dlsym()
210 + dlsym(), starting in glibc 2.24 actually reports errors. In our case,
211 + we try to get ACL functions which are not in the glibc. This causes
212 + failures in test suites, so hide those messages for non-debugging
213 + purposes for now. It also makes the build logs annoying to read.
214 +Author: Julian Andres Klode <juliank@××××××.com>
215 +Origin: vendor
216 +Bug-Debian: https://bugs.debian.org/830912
217 +Forwarded: no
218 +Last-Update: 2016-08-12
219 +
220 +--- a/libfakeroot.c
221 ++++ b/libfakeroot.c
222 +@@ -256,10 +256,16 @@ void load_library_symbols(void){
223 + /* clear dlerror() just in case dlsym() legitimately returns NULL */
224 + msg = dlerror();
225 + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
226 ++
227 + if ( (msg = dlerror()) != NULL){
228 +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
229 +-/* abort ();*/
230 ++#ifdef LIBFAKEROOT_DEBUGGING
231 ++ if (fakeroot_debug) {
232 ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
233 ++/* abort ();*/
234 ++ }
235 ++#endif
236 + }
237 ++
238 + }
239 + }
240 +
241
242 diff --git a/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch b/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch
243 new file mode 100644
244 index 0000000..ff95f96
245 --- /dev/null
246 +++ b/sys-apps/fakeroot/files/fakeroot-1.22-no64.patch
247 @@ -0,0 +1,17 @@
248 +--- a/libfakeroot.c
249 ++++ b/libfakeroot.c
250 +@@ -81,12 +81,14 @@
251 + #define SEND_STAT64(a,b,c) send_stat64(a,b,c)
252 + #define SEND_GET_STAT(a,b) send_get_stat(a,b)
253 + #define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
254 ++#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
255 + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
256 + #else
257 + #define SEND_STAT(a,b,c) send_stat(a,b)
258 + #define SEND_STAT64(a,b,c) send_stat64(a,b)
259 + #define SEND_GET_STAT(a,b) send_get_stat(a)
260 + #define SEND_GET_STAT64(a,b) send_get_stat64(a)
261 ++#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
262 + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
263 + #endif
264 +
265
266 diff --git a/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch b/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch
267 new file mode 100644
268 index 0000000..12f2759
269 --- /dev/null
270 +++ b/sys-apps/fakeroot/files/fakeroot-1.22-xstatjunk.patch
271 @@ -0,0 +1,11 @@
272 +--- fakeroot-1.18.4.orig/configure.ac 2012-06-02 18:23:41.000000000 +0000
273 ++++ fakeroot-1.18.4configure.ac 2015-09-24 23:15:56.917470073 +0000
274 +@@ -301,7 +301,7 @@
275 + FUNC=`echo $SEARCH|sed -e 's/.*%//'`
276 + PRE=`echo $SEARCH|sed -e 's/%.*//'`
277 + FOUND=
278 +- for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
279 ++ for WRAPPED in ${PRE}${FUNC}; do
280 + AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
281 + dnl
282 + dnl to unconditionally define only the _* functions, comment out the 2 lines above,
283
284 diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
285 new file mode 100644
286 index 0000000..4eb20a0
287 --- /dev/null
288 +++ b/sys-apps/fakeroot/metadata.xml
289 @@ -0,0 +1,8 @@
290 +<?xml version="1.0" encoding="UTF-8"?>
291 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
292 +<pkgmetadata>
293 + <maintainer type="project">
294 + <email>base-system@g.o</email>
295 + <name>Gentoo Base System</name>
296 + </maintainer>
297 +</pkgmetadata>