From 2dd907fc743c6f24e4e32778617c51e2b5985653 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 15 Oct 2013 10:15:07 -0600
Subject: [PATCH] update longlink patch for upstream 1.27

---
 debian/patches/longlink-hack.diff | 44 +++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/patches/longlink-hack.diff b/debian/patches/longlink-hack.diff
index 7163e47f..b6bc385c 100644
--- a/debian/patches/longlink-hack.diff
+++ b/debian/patches/longlink-hack.diff
@@ -1,16 +1,19 @@
-diff -ur orig/tar-1.25/src/common.h tar-1.25/src/common.h
---- orig/tar-1.25/src/common.h	2010-11-10 18:41:01.000000000 -0400
-+++ tar-1.25/src/common.h	2010-11-11 20:28:06.000000000 -0400
-@@ -834,3 +834,5 @@
- 
+diff --git a/src/common.h b/src/common.h
+index eb801bb..4aaace5 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -907,4 +907,6 @@ void finish_deferred_unlinks (void);
  /* Module exit.c */
  extern void (*fatal_exit_hook) (void);
-+
+ 
 +GLOBAL int debian_longlink_hack;
-diff -ur orig/tar-1.25/src/create.c tar-1.25/src/create.c
---- orig/tar-1.25/src/create.c	2010-11-10 18:41:01.000000000 -0400
-+++ tar-1.25/src/create.c	2010-11-11 20:30:44.000000000 -0400
-@@ -26,6 +26,8 @@
++
+ _GL_INLINE_HEADER_END
+diff --git a/src/create.c b/src/create.c
+index e14e13d..3a84c79 100644
+--- a/src/create.c
++++ b/src/create.c
+@@ -27,6 +27,8 @@
  #include "common.h"
  #include <hash.h>
  
@@ -19,7 +22,7 @@ diff -ur orig/tar-1.25/src/create.c tar-1.25/src/create.c
  /* Error number to use when an impostor is discovered.
     Pretend the impostor isn't there.  */
  enum { IMPOSTOR_ERRNO = ENOENT };
-@@ -735,7 +737,7 @@
+@@ -724,7 +726,7 @@ write_header_name (struct tar_stat_info *st)
        return write_short_name (st);
      }
    else if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT)
@@ -28,7 +31,7 @@ diff -ur orig/tar-1.25/src/create.c tar-1.25/src/create.c
      return write_long_name (st);
    else
      return write_short_name (st);
-@@ -1456,7 +1458,7 @@
+@@ -1476,7 +1478,7 @@ dump_hard_link (struct tar_stat_info *st)
  	  block_ordinal = current_block_ordinal ();
  	  assign_string (&st->link_name, link_name);
  	  if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT)
@@ -37,11 +40,12 @@ diff -ur orig/tar-1.25/src/create.c tar-1.25/src/create.c
  	    write_long_link (st);
  
  	  st->stat.st_size = 0;
-diff -ur orig/tar-1.25/src/tar.c tar-1.25/src/tar.c
---- orig/tar-1.25/src/tar.c	2010-11-10 18:41:01.000000000 -0400
-+++ tar-1.25/src/tar.c	2010-11-11 20:28:59.000000000 -0400
-@@ -2566,6 +2566,16 @@
-   report_textual_dates (&args);
+diff --git a/src/tar.c b/src/tar.c
+index 4f5017d..e9a5126 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -1246,6 +1246,16 @@ expand_pax_option (struct tar_args *targs, const char *arg)
+   return res;
  }
  
 +/* Debian specific environment variable used by pristine-tar to enable use of
@@ -55,9 +59,9 @@ diff -ur orig/tar-1.25/src/tar.c tar-1.25/src/tar.c
 +}
 +
  
- /* Tar proper.  */
- 
-@@ -2585,6 +2595,8 @@
+ static uintmax_t
+ parse_owner_group (char *arg, uintmax_t field_max, char const **name_option)
+@@ -2626,6 +2636,8 @@ main (int argc, char **argv)
    filename_terminator = '\n';
    set_quoting_style (0, DEFAULT_QUOTING_STYLE);
  
-- 
2.47.2