01/01: gnu: base: Fix a bug that occurs in non-Linux systems.

[Manolis Fragkiskos Ragkousis]

phant0mas pushed a commit to branch core-updates
in repository guix.

commit 94d915d0b0f33a453d902bbffbbb62c241dbab99
Author: Manolis Ragkousis <address@hidden>
Date:   Thu May 21 16:47:26 2015 +0300

    gnu: base: Fix a bug that occurs in non-Linux systems.
    
    * gnu/packages/base.scm (tar): Apply patch.
    * gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                      |    1 +
 gnu/packages/base.scm                              |    3 +-
 gnu/packages/patches/tar-d_ino_in_dirent-fix.patch |   33 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 26228fc..2641b9a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -541,6 +541,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/slim-sigusr1.patch                      \
   gnu/packages/patches/soprano-find-clucene.patch              \
   gnu/packages/patches/superlu-dist-scotchmetis.patch          \
+  gnu/packages/patches/tar-d_ino_in_dirent-fix.patch           \
   gnu/packages/patches/tcsh-fix-autotest.patch                 \
   gnu/packages/patches/teckit-cstdio.patch                     \
   gnu/packages/patches/texi2html-document-encoding.patch       \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c6206fd..0a27093 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -136,7 +136,8 @@ implementation offers several extensions over the standard 
utility.")
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))))
+              "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))
+            (patches (list (search-patch "tar-d_ino_in_dirent-fix.patch")))))
    (build-system gnu-build-system)
    (synopsis "Managing tar archives")
    (description
diff --git a/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch 
b/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch
new file mode 100644
index 0000000..39d8e2b
--- /dev/null
+++ b/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch
@@ -0,0 +1,33 @@
+commit e9ddc08da0982f36581ae5a8c7763453ff41cfe8
+Author: Sergey Poznyakoff <address@hidden>
+Date:   Thu Sep 25 00:22:16 2014 +0300
+
+    Bugfixes.
+    
+    * doc/tar.1: Fix typo in font spec.
+    * src/tar.c (sort_mode_arg, sort_mode_flag): Protect "inode"
+    (SAVEDIR_SORT_INODE) with D_INO_IN_DIRENT
+
+diff --git a/src/tar.c b/src/tar.c
+index 225c624..f8102e0 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -1341,14 +1341,18 @@ static char filename_terminator;
+ static char const *const sort_mode_arg[] = {
+   "none",
+   "name",
++#if D_INO_IN_DIRENT
+   "inode",
++#endif
+   NULL
+ };
+ 
+ static int sort_mode_flag[] = {
+     SAVEDIR_SORT_NONE,
+     SAVEDIR_SORT_NAME,
++#if D_INO_IN_DIRENT
+     SAVEDIR_SORT_INODE
++#endif
+ };
+ 
+ ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
\ No newline at end of file