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-fs/xfsdump/files/, sys-fs/xfsdump/
Date: Sat, 29 Dec 2018 20:21:50
Message-Id: 1546114898.3e787df9bd9b16bfb6be217a4707e0b34cd3a603.blueness@gentoo
1 commit: 3e787df9bd9b16bfb6be217a4707e0b34cd3a603
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 20:21:38 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 20:21:38 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3e787df9
7
8 sys-fs/xfsdump: in tree version works
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 sys-fs/xfsdump/Manifest | 2 -
13 .../xfsdump/files/xfsdump-3.0.4-no-symlink.patch | 22 -----
14 .../files/xfsdump-3.0.5-prompt-overflow.patch | 14 ----
15 sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch | 32 --------
16 sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch | 82 -------------------
17 sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch | 94 ----------------------
18 sys-fs/xfsdump/metadata.xml | 8 --
19 sys-fs/xfsdump/xfsdump-3.1.6.ebuild | 54 -------------
20 sys-fs/xfsdump/xfsdump-3.1.8.ebuild | 68 ----------------
21 9 files changed, 376 deletions(-)
22
23 diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
24 deleted file mode 100644
25 index f073dac..0000000
26 --- a/sys-fs/xfsdump/Manifest
27 +++ /dev/null
28 @@ -1,2 +0,0 @@
29 -DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
30 -DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
31
32 diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch b/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
33 deleted file mode 100644
34 index 014ca33..0000000
35 --- a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
36 +++ /dev/null
37 @@ -1,22 +0,0 @@
38 -http://bugs.gentoo.org/311881
39 -
40 ---- xfsdump-3.0.4/dump/Makefile
41 -+++ xfsdump-3.0.4/dump/Makefile
42 -@@ -102,7 +102,6 @@
43 - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
44 - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
45 - $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
46 -- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
47 - install-dev:
48 -
49 - $(COMMINCL) $(COMMON):
50 ---- xfsdump-3.0.4/restore/Makefile
51 -+++ xfsdump-3.0.4/restore/Makefile
52 -@@ -114,7 +114,6 @@
53 - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
54 - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
55 - $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
56 -- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
57 - install-dev:
58 -
59 - $(COMMINCL) $(COMMON):
60
61 diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
62 deleted file mode 100644
63 index bd7fb3f..0000000
64 --- a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
65 +++ /dev/null
66 @@ -1,14 +0,0 @@
67 -http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
68 -https://bugs.gentoo.org/335115
69 -
70 ---- a/dump/content.c
71 -+++ b/dump/content.c
72 -@@ -6460,7 +6460,7 @@
73 - Media_prompt_erase( drive_t *drivep )
74 - {
75 - fold_t fold;
76 -- char question[ 100 ];
77 -+ char question[ 200 ];
78 - char *preamblestr[ PREAMBLEMAX ];
79 - size_t preamblecnt;
80 - char *querystr[ QUERYMAX ];
81
82 diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
83 deleted file mode 100644
84 index 5d5e54e..0000000
85 --- a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
86 +++ /dev/null
87 @@ -1,32 +0,0 @@
88 -From e12813b9d0883e02cc121ea503f4bff5fb67e9ef Mon Sep 17 00:00:00 2001
89 -From: Mike Frysinger <vapier@g.o>
90 -Date: Fri, 8 Apr 2016 16:41:31 -0400
91 -Subject: [PATCH xfsdump] po: respect LINGUAS build setting
92 -
93 -It is common gettext practice to limit the translations a particular
94 -package will include by setting the LINGUAS environment variable.
95 -
96 -Signed-off-by: Mike Frysinger <vapier@g.o>
97 ----
98 - po/Makefile | 5 ++++-
99 - 1 file changed, 4 insertions(+), 1 deletion(-)
100 -
101 -diff --git a/po/Makefile b/po/Makefile
102 -index 6d40324..48a19c1 100644
103 ---- a/po/Makefile
104 -+++ b/po/Makefile
105 -@@ -6,7 +6,10 @@ TOPDIR = ..
106 - include $(TOPDIR)/include/builddefs
107 -
108 - POTHEAD = $(PKG_NAME).pot
109 --LINGUAS = de pl
110 -+# If the user has requested a specific set of translations, only build those.
111 -+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
112 -+LINGUAS ?= $(SUPPORTED_LINGUAS)
113 -+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
114 - LSRCFILES = $(LINGUAS:%=%.po)
115 - LDIRT = $(POTHEAD)
116 -
117 ---
118 -2.7.4
119 -
120
121 diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
122 deleted file mode 100644
123 index 12ca39e..0000000
124 --- a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
125 +++ /dev/null
126 @@ -1,82 +0,0 @@
127 -diff -Naur xfsdump-3.1.6.orig/common/drive.c xfsdump-3.1.6/common/drive.c
128 ---- xfsdump-3.1.6.orig/common/drive.c 2017-03-18 10:15:09.015308629 -0700
129 -+++ xfsdump-3.1.6/common/drive.c 2017-03-18 10:19:56.248906871 -0700
130 -@@ -17,6 +17,7 @@
131 - */
132 -
133 - #include <stdio.h>
134 -+#include <stdlib.h>
135 - #include <unistd.h>
136 - #include <sys/stat.h>
137 - #include <time.h>
138 -diff -Naur xfsdump-3.1.6.orig/common/main.c xfsdump-3.1.6/common/main.c
139 ---- xfsdump-3.1.6.orig/common/main.c 2017-03-18 10:15:09.012308611 -0700
140 -+++ xfsdump-3.1.6/common/main.c 2017-03-18 10:20:21.938159790 -0700
141 -@@ -55,6 +55,10 @@
142 - #include "content.h"
143 - #include "inventory.h"
144 -
145 -+#ifndef RLIM64_INFINITY
146 -+#define RLIM64_INFINITY (~0ULL)
147 -+#endif
148 -+
149 - #ifdef DUMP
150 - /* main.c - main for dump
151 - */
152 -@@ -2225,7 +2229,10 @@
153 - {SIGTERM, "SIGTERM"},
154 - {SIGUSR1, "SIGUSR1"},
155 - {SIGUSR2, "SIGUSR2"},
156 -+ {SIGCHLD, "SIGCHLD"},
157 -+#ifdef SIGCLD
158 - {SIGCLD, "SIGCLD"},
159 -+#endif
160 - {SIGPWR, "SIGPWR"},
161 - {SIGURG, "SIGURG"},
162 - {SIGPOLL, "SIGPOLL"},
163 -diff -Naur xfsdump-3.1.6.orig/common/types.h xfsdump-3.1.6/common/types.h
164 ---- xfsdump-3.1.6.orig/common/types.h 2017-03-18 10:15:09.011308605 -0700
165 -+++ xfsdump-3.1.6/common/types.h 2017-03-18 10:19:43.429780663 -0700
166 -@@ -47,6 +47,9 @@
167 - /* integers
168 - */
169 - typedef uint32_t size32_t;
170 -+#ifndef __uint32_t
171 -+#define __uint32_t uint32_t
172 -+#endif
173 - typedef uint64_t size64_t;
174 - typedef char char_t;
175 - typedef unsigned char u_char_t;
176 -diff -Naur xfsdump-3.1.6.orig/dump/content.c xfsdump-3.1.6/dump/content.c
177 ---- xfsdump-3.1.6.orig/dump/content.c 2017-03-18 10:15:09.036308756 -0700
178 -+++ xfsdump-3.1.6/dump/content.c 2017-03-18 10:20:21.940159810 -0700
179 -@@ -37,6 +37,7 @@
180 - #include <xfs/jdm.h>
181 - #ifdef linux
182 - #include <xfs/xqm.h>
183 -+#include <linux/limits.h>
184 - #endif
185 -
186 - #include <attr/attributes.h>
187 -diff -Naur xfsdump-3.1.6.orig/dump/var.c xfsdump-3.1.6/dump/var.c
188 ---- xfsdump-3.1.6.orig/dump/var.c 2017-03-18 10:15:09.036308756 -0700
189 -+++ xfsdump-3.1.6/dump/var.c 2017-03-18 10:23:04.657759448 -0700
190 -@@ -16,6 +16,7 @@
191 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
192 - */
193 -
194 -+#include <limits.h>
195 - #include <unistd.h>
196 - #include <stdlib.h>
197 - #include <sys/stat.h>
198 -diff -Naur xfsdump-3.1.6.orig/invutil/invidx.c xfsdump-3.1.6/invutil/invidx.c
199 ---- xfsdump-3.1.6.orig/invutil/invidx.c 2017-03-18 10:15:09.029308713 -0700
200 -+++ xfsdump-3.1.6/invutil/invidx.c 2017-03-18 10:16:19.135769322 -0700
201 -@@ -19,6 +19,7 @@
202 - #include <xfs/xfs.h>
203 - #include <xfs/jdm.h>
204 -
205 -+#include <fcntl.h>
206 - #include <stdio.h>
207 - #include <unistd.h>
208 - #include <stdlib.h>
209
210 diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
211 deleted file mode 100644
212 index de6caa1..0000000
213 --- a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
214 +++ /dev/null
215 @@ -1,94 +0,0 @@
216 -From 1fb0b21870179c3ab5350b29217e0c01cd77c13e Mon Sep 17 00:00:00 2001
217 -From:
218 -Date: Sun, 20 May 2018 17:24:30 -0500
219 -Subject: [PATCH] misc musl fixes
220 -
221 ----
222 - common/drive.c | 1 +
223 - common/main.c | 4 ++++
224 - common/types.h | 3 +++
225 - dump/content.c | 1 +
226 - dump/var.c | 1 +
227 - invutil/invidx.c | 1 +
228 - 6 files changed, 11 insertions(+)
229 -
230 -diff --git a/common/drive.c b/common/drive.c
231 -index 5fe6867..9e10b63 100644
232 ---- a/common/drive.c
233 -+++ b/common/drive.c
234 -@@ -17,6 +17,7 @@
235 - */
236 -
237 - #include <stdio.h>
238 -+#include <stdlib.h>
239 - #include <unistd.h>
240 - #include <sys/stat.h>
241 - #include <time.h>
242 -diff --git a/common/main.c b/common/main.c
243 -index d3bdcf3..b6ba0a6 100644
244 ---- a/common/main.c
245 -+++ b/common/main.c
246 -@@ -56,6 +56,10 @@
247 - #include "content.h"
248 - #include "inventory.h"
249 -
250 -+#ifndef RLIM64_INFINITY
251 -+#define RLIM64_INFINITY (~0ULL)
252 -+#endif
253 -+
254 - #ifdef DUMP
255 - /* main.c - main for dump
256 - */
257 -diff --git a/common/types.h b/common/types.h
258 -index 424b47a..0c58ab5 100644
259 ---- a/common/types.h
260 -+++ b/common/types.h
261 -@@ -47,6 +47,9 @@
262 - /* integers
263 - */
264 - typedef uint32_t size32_t;
265 -+#ifndef __uint32_t
266 -+#define __uint32_t uint32_t
267 -+#endif
268 - typedef uint64_t size64_t;
269 - typedef char char_t;
270 - typedef unsigned char u_char_t;
271 -diff --git a/dump/content.c b/dump/content.c
272 -index bee4e65..f9da485 100644
273 ---- a/dump/content.c
274 -+++ b/dump/content.c
275 -@@ -38,6 +38,7 @@
276 - #ifdef linux
277 - #include <linux/limits.h>
278 - #include <xfs/xqm.h>
279 -+#include <linux/limits.h>
280 - #endif
281 -
282 - #include <attr/attributes.h>
283 -diff --git a/dump/var.c b/dump/var.c
284 -index 6e3ead0..be2f310 100644
285 ---- a/dump/var.c
286 -+++ b/dump/var.c
287 -@@ -16,6 +16,7 @@
288 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
289 - */
290 -
291 -+#include <limits.h>
292 - #include <unistd.h>
293 - #include <stdlib.h>
294 - #include <sys/stat.h>
295 -diff --git a/invutil/invidx.c b/invutil/invidx.c
296 -index 82d89d9..dba88fc 100644
297 ---- a/invutil/invidx.c
298 -+++ b/invutil/invidx.c
299 -@@ -19,6 +19,7 @@
300 - #include <xfs/xfs.h>
301 - #include <xfs/jdm.h>
302 -
303 -+#include <fcntl.h>
304 - #include <stdio.h>
305 - #include <fcntl.h>
306 - #include <unistd.h>
307 ---
308 -2.17.0
309 -
310
311 diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
312 deleted file mode 100644
313 index 56c1244..0000000
314 --- a/sys-fs/xfsdump/metadata.xml
315 +++ /dev/null
316 @@ -1,8 +0,0 @@
317 -<?xml version="1.0" encoding="UTF-8"?>
318 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
319 -<pkgmetadata>
320 -<maintainer type="project">
321 - <email>base-system@g.o</email>
322 - <name>Gentoo Base System</name>
323 -</maintainer>
324 -</pkgmetadata>
325
326 diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
327 deleted file mode 100644
328 index cc16e69..0000000
329 --- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
330 +++ /dev/null
331 @@ -1,54 +0,0 @@
332 -# Copyright 1999-2017 Gentoo Foundation
333 -# Distributed under the terms of the GNU General Public License v2
334 -
335 -EAPI="5"
336 -
337 -inherit multilib eutils flag-o-matic toolchain-funcs
338 -
339 -DESCRIPTION="xfs dump/restore utilities"
340 -HOMEPAGE="http://oss.sgi.com/projects/xfs"
341 -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
342 - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
343 -
344 -LICENSE="LGPL-2.1"
345 -SLOT="0"
346 -KEYWORDS="amd64 ia64 ~mips ppc -sparc x86"
347 -IUSE="ncurses nls"
348 -
349 -RDEPEND="ncurses? ( sys-libs/ncurses:0= )
350 - sys-fs/e2fsprogs
351 - >=sys-fs/xfsprogs-3.2.0
352 - sys-apps/dmapi
353 - >=sys-apps/attr-2.4.19"
354 -DEPEND="${RDEPEND}
355 - nls? (
356 - sys-devel/gettext
357 - elibc_uclibc? ( dev-libs/libintl )
358 - )"
359 -
360 -src_prepare() {
361 - sed -i \
362 - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
363 - include/builddefs.in \
364 - || die
365 - sed -i \
366 - -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
367 - -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
368 - configure || die #605852
369 - epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
370 - epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
371 - epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
372 - epatch "${FILESDIR}"/${PN}-3.1.6-musl.patch #549116
373 -}
374 -
375 -src_configure() {
376 - unset PLATFORM #184564
377 - export OPTIMIZER=${CFLAGS}
378 - export DEBUG=-DNDEBUG
379 -
380 - econf \
381 - $(use_enable nls gettext) \
382 - --libdir="${EPREFIX}/$(get_libdir)" \
383 - --libexecdir="${EPREFIX}/usr/$(get_libdir)" \
384 - --sbindir="${EPREFIX}/sbin"
385 -}
386
387 diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
388 deleted file mode 100644
389 index c6f035a..0000000
390 --- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
391 +++ /dev/null
392 @@ -1,68 +0,0 @@
393 -# Copyright 1999-2018 Gentoo Authors
394 -# Distributed under the terms of the GNU General Public License v2
395 -
396 -EAPI=6
397 -
398 -inherit multilib flag-o-matic toolchain-funcs
399 -
400 -DESCRIPTION="xfs dump/restore utilities"
401 -HOMEPAGE="http://oss.sgi.com/projects/xfs"
402 -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
403 -
404 -LICENSE="LGPL-2.1"
405 -SLOT="0"
406 -KEYWORDS="amd64 ~mips ppc x86"
407 -IUSE="ncurses nls"
408 -
409 -RDEPEND="
410 - >=sys-apps/attr-2.4.19
411 - sys-apps/dmapi
412 - sys-apps/util-linux
413 - sys-fs/e2fsprogs
414 - >=sys-fs/xfsprogs-3.2.0
415 - ncurses? ( sys-libs/ncurses:0= )
416 -"
417 -DEPEND="${RDEPEND}
418 - nls? (
419 - sys-devel/gettext
420 - elibc_uclibc? ( dev-libs/libintl )
421 - )"
422 -
423 -PATCHES=(
424 - "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
425 - "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
426 - "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
427 - "${FILESDIR}"/${PN}-3.1.8-musl.patch #549116
428 -)
429 -
430 -src_prepare() {
431 - sed -i \
432 - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
433 - include/builddefs.in \
434 - || die
435 - sed -i \
436 - -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
437 - -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
438 - configure || die #605852
439 -
440 - default
441 -}
442 -
443 -src_configure() {
444 - unset PLATFORM #184564
445 - export OPTIMIZER=${CFLAGS}
446 - export DEBUG=-DNDEBUG
447 -
448 - local myeconfargs=(
449 - $(use_enable nls gettext)
450 - --libdir="${EPREFIX}/$(get_libdir)"
451 - --libexecdir="${EPREFIX}/usr/$(get_libdir)"
452 - --sbindir="${EPREFIX}/sbin"
453 - )
454 - econf "${myeconfargs[@]}"
455 -}
456 -
457 -src_compile() {
458 - # enable verbose build
459 - emake V=1
460 -}