Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsdump/, sys-fs/xfsdump/files/
Date: Mon, 26 Oct 2015 04:16:54
Message-Id: 1445832944.d3fcf50e0abe50480b1676ad861acbbf7220b3a8.vapier@gentoo
1 commit: d3fcf50e0abe50480b1676ad861acbbf7220b3a8
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 04:09:10 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 04:15:44 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fcf50e
7
8 sys-fs/xfsdump: version bump to 3.1.5 #560358
9
10 sys-fs/xfsdump/Manifest | 1 +
11 .../files/xfsdump-3.1.5-config-platform.patch | 26 ++++++++++
12 sys-fs/xfsdump/xfsdump-3.1.5.ebuild | 57 ++++++++++++++++++++++
13 3 files changed, 84 insertions(+)
14
15 diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
16 index bb29e7e..a101d13 100644
17 --- a/sys-fs/xfsdump/Manifest
18 +++ b/sys-fs/xfsdump/Manifest
19 @@ -2,3 +2,4 @@ DIST xfsdump-3.0.6.tar.gz 789635 SHA256 d6aa8040f7fe7c4dcb41190b7530c36177b08413
20 DIST xfsdump-3.1.2.tar.gz 831511 SHA256 dc3065b9aeb00de078b8a54ae3f46c71d43d4c4ad4c69ec77343182e881fa4d8 SHA512 23a295ec17002284852f83583a9a66600f2c94742f9c0372db6193e38a53142f71ab3c46fb6d48f0caa9a2737712e217c9adf798edfbd172403d6c372fc63b02 WHIRLPOOL 4854f65496a47a96b5bd00353e31ae816a3898d5aef314b0e16b148da291acf2b123ae4182c8e4791b992bc83a9d32d40d6874b69920d36953935a473c425bef
21 DIST xfsdump-3.1.3.tar.gz 826922 SHA256 f02138a5d96e06c506ac8cb6e4fedeb0bf7d7cf8b9747f262d0735b885dbf8fa SHA512 18f5ce7e249b317247012246fd7c5980f62cc46a5718adc80a3137be4f2d7c47edd7d1286e31fbae9c0629a49fc13482308e37950c5122165929088e467865b9 WHIRLPOOL cb80202e16c14ac279ffc698acf1ad3b1fe7365a451d05bba5ec5410b6cdcaf06f7f1986f374130cc40d0a43ccb0eedb2ed433a3e41c6701e9c94c247d821207
22 DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
23 +DIST xfsdump-3.1.5.tar.gz 848863 SHA256 2f1fad1754c94163a2401e69fa09ef06f587f780239a131e7ec0a14a3a3959e3 SHA512 107d23e3d1a84aaef0ef4c0f541f37a860ccbef996e0886a6f56f01c7998451210b127289c21ec71e9ef5db7d124d479b41017e9e3d5c2d9c68b2dbbfd316620 WHIRLPOOL ed7d6c11c4354540d8accb8c0d4955fc039bdead3c2f854e609756d14a856b862884adc1dba059ed28fa57ece76c8be3f073b8058c59dbac807a7af9fbbf482d
24
25 diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch
26 new file mode 100644
27 index 0000000..1c8c855
28 --- /dev/null
29 +++ b/sys-fs/xfsdump/files/xfsdump-3.1.5-config-platform.patch
30 @@ -0,0 +1,26 @@
31 +a few xfsprogs defs are still used in the code base.
32 +these are copied from the platform_defs.h.in file.
33 +
34 +--- include/config.h.in
35 ++++ include/config.h.in
36 +@@ -21,4 +21,20 @@
37 + #endif
38 + #include <locale.h>
39 +
40 ++#define IRIX_DEV_BITSMAJOR 14
41 ++#define IRIX_DEV_BITSMINOR 18
42 ++#define IRIX_DEV_MAXMAJ 0x1ff
43 ++#define IRIX_DEV_MAXMIN 0x3ffff
44 ++#define IRIX_DEV_MAJOR(dev) ((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \
45 ++ & IRIX_DEV_MAXMAJ))
46 ++#define IRIX_DEV_MINOR(dev) ((int)((dev) & IRIX_DEV_MAXMIN))
47 ++#define IRIX_MKDEV(major,minor) ((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \
48 ++ | (minor&IRIX_DEV_MAXMIN)))
49 ++#define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))
50 ++
51 ++#ifndef min
52 ++#define min(a,b) (((a)<(b))?(a):(b))
53 ++#define max(a,b) (((a)>(b))?(a):(b))
54 ++#endif
55 ++
56 + #endif /* __CONFIG_H__ */
57
58 diff --git a/sys-fs/xfsdump/xfsdump-3.1.5.ebuild b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild
59 new file mode 100644
60 index 0000000..b64e028
61 --- /dev/null
62 +++ b/sys-fs/xfsdump/xfsdump-3.1.5.ebuild
63 @@ -0,0 +1,57 @@
64 +# Copyright 1999-2015 Gentoo Foundation
65 +# Distributed under the terms of the GNU General Public License v2
66 +# $Id$
67 +
68 +EAPI="5"
69 +
70 +inherit multilib eutils
71 +
72 +DESCRIPTION="xfs dump/restore utilities"
73 +HOMEPAGE="http://oss.sgi.com/projects/xfs"
74 +SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
75 + ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
76 +
77 +LICENSE="LGPL-2.1"
78 +SLOT="0"
79 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
80 +IUSE=""
81 +
82 +RDEPEND="sys-fs/e2fsprogs
83 + >=sys-fs/xfsprogs-3.2.0
84 + sys-apps/dmapi
85 + >=sys-apps/attr-2.4.19"
86 +DEPEND="${RDEPEND}
87 + sys-devel/gettext"
88 +
89 +src_prepare() {
90 + sed -i \
91 + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
92 + include/builddefs.in \
93 + || die
94 + epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
95 + epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
96 +
97 + # The release when used with xfsprogs-4.2+ is ... a mess.
98 + epatch "${FILESDIR}"/${P}-config-platform.patch
99 + find -type f -name '*.c' -exec sed -i \
100 + -e '1i#include "config.h"' \
101 + -e '1i#include <assert.h>' \
102 + -e '1i#include <fcntl.h>' \
103 + -e '1i#include <stdarg.h>' \
104 + -e '1i#include <stdlib.h>' \
105 + -e '1i#include <string.h>' \
106 + -e '1i#include <unistd.h>' \
107 + -e '1i#include <sys/wait.h>' \
108 + {} + || die
109 +}
110 +
111 +src_configure() {
112 + unset PLATFORM #184564
113 + export OPTIMIZER=${CFLAGS}
114 + export DEBUG=-DNDEBUG
115 +
116 + econf \
117 + --libdir="${EPREFIX}/$(get_libdir)" \
118 + --libexecdir="${EPREFIX}/usr/$(get_libdir)" \
119 + --sbindir="${EPREFIX}/sbin"
120 +}