aboutsummaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-12-29 15:21:38 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-12-29 15:21:38 -0500
commit3e787df9bd9b16bfb6be217a4707e0b34cd3a603 (patch)
tree2157c2e4a1e9324abc9b0c2a23fc0ec3cb05c3f1 /sys-fs
parentsys-fs/xfsprogs: in tree version works (diff)
downloadmusl-3e787df9bd9b16bfb6be217a4707e0b34cd3a603.tar.gz
musl-3e787df9bd9b16bfb6be217a4707e0b34cd3a603.tar.bz2
musl-3e787df9bd9b16bfb6be217a4707e0b34cd3a603.zip
sys-fs/xfsdump: in tree version works
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/xfsdump/Manifest2
-rw-r--r--sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch22
-rw-r--r--sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch14
-rw-r--r--sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch32
-rw-r--r--sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch82
-rw-r--r--sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch94
-rw-r--r--sys-fs/xfsdump/metadata.xml8
-rw-r--r--sys-fs/xfsdump/xfsdump-3.1.6.ebuild54
-rw-r--r--sys-fs/xfsdump/xfsdump-3.1.8.ebuild68
9 files changed, 0 insertions, 376 deletions
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
deleted file mode 100644
index f073dac..0000000
--- a/sys-fs/xfsdump/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
-DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
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
deleted file mode 100644
index 014ca33..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/311881
-
---- xfsdump-3.0.4/dump/Makefile
-+++ xfsdump-3.0.4/dump/Makefile
-@@ -102,7 +102,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
---- xfsdump-3.0.4/restore/Makefile
-+++ xfsdump-3.0.4/restore/Makefile
-@@ -114,7 +114,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
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
deleted file mode 100644
index bd7fb3f..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
-https://bugs.gentoo.org/335115
-
---- a/dump/content.c
-+++ b/dump/content.c
-@@ -6460,7 +6460,7 @@
- Media_prompt_erase( drive_t *drivep )
- {
- fold_t fold;
-- char question[ 100 ];
-+ char question[ 200 ];
- char *preamblestr[ PREAMBLEMAX ];
- size_t preamblecnt;
- char *querystr[ QUERYMAX ];
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
deleted file mode 100644
index 5d5e54e..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e12813b9d0883e02cc121ea503f4bff5fb67e9ef Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 8 Apr 2016 16:41:31 -0400
-Subject: [PATCH xfsdump] po: respect LINGUAS build setting
-
-It is common gettext practice to limit the translations a particular
-package will include by setting the LINGUAS environment variable.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- po/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/po/Makefile b/po/Makefile
-index 6d40324..48a19c1 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -6,7 +6,10 @@ TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
- POTHEAD = $(PKG_NAME).pot
--LINGUAS = de pl
-+# If the user has requested a specific set of translations, only build those.
-+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
-+LINGUAS ?= $(SUPPORTED_LINGUAS)
-+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
- LSRCFILES = $(LINGUAS:%=%.po)
- LDIRT = $(POTHEAD)
-
---
-2.7.4
-
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
deleted file mode 100644
index 12ca39e..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur xfsdump-3.1.6.orig/common/drive.c xfsdump-3.1.6/common/drive.c
---- xfsdump-3.1.6.orig/common/drive.c 2017-03-18 10:15:09.015308629 -0700
-+++ xfsdump-3.1.6/common/drive.c 2017-03-18 10:19:56.248906871 -0700
-@@ -17,6 +17,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <time.h>
-diff -Naur xfsdump-3.1.6.orig/common/main.c xfsdump-3.1.6/common/main.c
---- xfsdump-3.1.6.orig/common/main.c 2017-03-18 10:15:09.012308611 -0700
-+++ xfsdump-3.1.6/common/main.c 2017-03-18 10:20:21.938159790 -0700
-@@ -55,6 +55,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-@@ -2225,7 +2229,10 @@
- {SIGTERM, "SIGTERM"},
- {SIGUSR1, "SIGUSR1"},
- {SIGUSR2, "SIGUSR2"},
-+ {SIGCHLD, "SIGCHLD"},
-+#ifdef SIGCLD
- {SIGCLD, "SIGCLD"},
-+#endif
- {SIGPWR, "SIGPWR"},
- {SIGURG, "SIGURG"},
- {SIGPOLL, "SIGPOLL"},
-diff -Naur xfsdump-3.1.6.orig/common/types.h xfsdump-3.1.6/common/types.h
---- xfsdump-3.1.6.orig/common/types.h 2017-03-18 10:15:09.011308605 -0700
-+++ xfsdump-3.1.6/common/types.h 2017-03-18 10:19:43.429780663 -0700
-@@ -47,6 +47,9 @@
- /* integers
- */
- typedef uint32_t size32_t;
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
- typedef uint64_t size64_t;
- typedef char char_t;
- typedef unsigned char u_char_t;
-diff -Naur xfsdump-3.1.6.orig/dump/content.c xfsdump-3.1.6/dump/content.c
---- xfsdump-3.1.6.orig/dump/content.c 2017-03-18 10:15:09.036308756 -0700
-+++ xfsdump-3.1.6/dump/content.c 2017-03-18 10:20:21.940159810 -0700
-@@ -37,6 +37,7 @@
- #include <xfs/jdm.h>
- #ifdef linux
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
-diff -Naur xfsdump-3.1.6.orig/dump/var.c xfsdump-3.1.6/dump/var.c
---- xfsdump-3.1.6.orig/dump/var.c 2017-03-18 10:15:09.036308756 -0700
-+++ xfsdump-3.1.6/dump/var.c 2017-03-18 10:23:04.657759448 -0700
-@@ -16,6 +16,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <limits.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-diff -Naur xfsdump-3.1.6.orig/invutil/invidx.c xfsdump-3.1.6/invutil/invidx.c
---- xfsdump-3.1.6.orig/invutil/invidx.c 2017-03-18 10:15:09.029308713 -0700
-+++ xfsdump-3.1.6/invutil/invidx.c 2017-03-18 10:16:19.135769322 -0700
-@@ -19,6 +19,7 @@
- #include <xfs/xfs.h>
- #include <xfs/jdm.h>
-
-+#include <fcntl.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
deleted file mode 100644
index de6caa1..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1fb0b21870179c3ab5350b29217e0c01cd77c13e Mon Sep 17 00:00:00 2001
-From:
-Date: Sun, 20 May 2018 17:24:30 -0500
-Subject: [PATCH] misc musl fixes
-
----
- common/drive.c | 1 +
- common/main.c | 4 ++++
- common/types.h | 3 +++
- dump/content.c | 1 +
- dump/var.c | 1 +
- invutil/invidx.c | 1 +
- 6 files changed, 11 insertions(+)
-
-diff --git a/common/drive.c b/common/drive.c
-index 5fe6867..9e10b63 100644
---- a/common/drive.c
-+++ b/common/drive.c
-@@ -17,6 +17,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <time.h>
-diff --git a/common/main.c b/common/main.c
-index d3bdcf3..b6ba0a6 100644
---- a/common/main.c
-+++ b/common/main.c
-@@ -56,6 +56,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-diff --git a/common/types.h b/common/types.h
-index 424b47a..0c58ab5 100644
---- a/common/types.h
-+++ b/common/types.h
-@@ -47,6 +47,9 @@
- /* integers
- */
- typedef uint32_t size32_t;
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
- typedef uint64_t size64_t;
- typedef char char_t;
- typedef unsigned char u_char_t;
-diff --git a/dump/content.c b/dump/content.c
-index bee4e65..f9da485 100644
---- a/dump/content.c
-+++ b/dump/content.c
-@@ -38,6 +38,7 @@
- #ifdef linux
- #include <linux/limits.h>
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
-diff --git a/dump/var.c b/dump/var.c
-index 6e3ead0..be2f310 100644
---- a/dump/var.c
-+++ b/dump/var.c
-@@ -16,6 +16,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <limits.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-diff --git a/invutil/invidx.c b/invutil/invidx.c
-index 82d89d9..dba88fc 100644
---- a/invutil/invidx.c
-+++ b/invutil/invidx.c
-@@ -19,6 +19,7 @@
- #include <xfs/xfs.h>
- #include <xfs/jdm.h>
-
-+#include <fcntl.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
---
-2.17.0
-
diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-fs/xfsdump/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
deleted file mode 100644
index cc16e69..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~mips ppc -sparc x86"
-IUSE="ncurses nls"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )
- sys-fs/e2fsprogs
- >=sys-fs/xfsprogs-3.2.0
- sys-apps/dmapi
- >=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
- nls? (
- sys-devel/gettext
- elibc_uclibc? ( dev-libs/libintl )
- )"
-
-src_prepare() {
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in \
- || die
- sed -i \
- -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
- -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
- configure || die #605852
- epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
- epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
- epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
- epatch "${FILESDIR}"/${PN}-3.1.6-musl.patch #549116
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- econf \
- $(use_enable nls gettext) \
- --libdir="${EPREFIX}/$(get_libdir)" \
- --libexecdir="${EPREFIX}/usr/$(get_libdir)" \
- --sbindir="${EPREFIX}/sbin"
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
deleted file mode 100644
index c6f035a..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="ncurses nls"
-
-RDEPEND="
- >=sys-apps/attr-2.4.19
- sys-apps/dmapi
- sys-apps/util-linux
- sys-fs/e2fsprogs
- >=sys-fs/xfsprogs-3.2.0
- ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}
- nls? (
- sys-devel/gettext
- elibc_uclibc? ( dev-libs/libintl )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
- "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
- "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
- "${FILESDIR}"/${PN}-3.1.8-musl.patch #549116
-)
-
-src_prepare() {
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in \
- || die
- sed -i \
- -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
- -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
- configure || die #605852
-
- default
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- local myeconfargs=(
- $(use_enable nls gettext)
- --libdir="${EPREFIX}/$(get_libdir)"
- --libexecdir="${EPREFIX}/usr/$(get_libdir)"
- --sbindir="${EPREFIX}/sbin"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # enable verbose build
- emake V=1
-}