The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / tar / 0001-fix-build-failure.patch
1 Status: upstream
2 http://git.savannah.gnu.org/cgit/tar.git/commit/?id=e9ddc08da0982f36581ae5a8c7763453ff41cfe8
3
4 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
5
6 From e9ddc08da0982f36581ae5a8c7763453ff41cfe8 Mon Sep 17 00:00:00 2001
7 From: Sergey Poznyakoff <gray@gnu.org>
8 Date: Wed, 24 Sep 2014 21:22:16 +0000
9 Subject: Bugfixes.
10
11 * doc/tar.1: Fix typo in font spec.
12 * src/tar.c (sort_mode_arg, sort_mode_flag): Protect "inode"
13 (SAVEDIR_SORT_INODE) with D_INO_IN_DIRENT
14 ---
15 diff --git a/doc/tar.1 b/doc/tar.1
16 index 9000627..b91de63 100644
17 --- a/doc/tar.1
18 +++ b/doc/tar.1
19 @@ -879,7 +879,7 @@ Exclude files matching patterns listed in FILE.
20  \fB\-\-strip\-components\fR=\fINUMBER\fR
21  Strip \fINUMBER\fR leading components from file names on extraction.
22  .TP
23 -\fB\-\-transform\fR=\fIEXPRESSION\dR, \fB\-\-xform\fR=\fIEXPRESSION\fR
24 +\fB\-\-transform\fR=\fIEXPRESSION\fR, \fB\-\-xform\fR=\fIEXPRESSION\fR
25  Use sed replace \fIEXPRESSION\fR to transform file names.
26  .SS File name matching options
27  These options affect both exclude and include patterns.
28 diff --git a/src/tar.c b/src/tar.c
29 index 225c624..f8102e0 100644
30 --- a/src/tar.c
31 +++ b/src/tar.c
32 @@ -1341,14 +1341,18 @@ static char filename_terminator;
33  static char const *const sort_mode_arg[] = {
34    "none",
35    "name",
36 +#if D_INO_IN_DIRENT
37    "inode",
38 +#endif
39    NULL
40  };
41  
42  static int sort_mode_flag[] = {
43      SAVEDIR_SORT_NONE,
44      SAVEDIR_SORT_NAME,
45 +#if D_INO_IN_DIRENT
46      SAVEDIR_SORT_INODE
47 +#endif
48  };
49  
50  ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
51 --
52 cgit v0.9.0.2