-diff --git a/src/common.h b/src/common.h
-index 42fd539..fe032ec 100644
--- a/src/common.h
+++ b/src/common.h
-@@ -906,4 +906,7 @@ void finish_deferred_unlinks (void);
- /* Module exit.c */
- extern void (*fatal_exit_hook) (void);
+@@ -971,4 +971,7 @@
+ int group_map_translate (gid_t gid, gid_t *new_gid, char const **new_name);
+
+GLOBAL int debian_longlink_hack;
+GLOBAL int pristine_tar_compat;
+
_GL_INLINE_HEADER_END
-diff --git a/src/create.c b/src/create.c
-index 4344a24..de10cae 100644
--- a/src/create.c
+++ b/src/create.c
-@@ -27,6 +27,9 @@
+@@ -28,6 +28,9 @@
#include "common.h"
#include <hash.h>
/* Error number to use when an impostor is discovered.
Pretend the impostor isn't there. */
enum { IMPOSTOR_ERRNO = ENOENT };
-@@ -534,6 +537,11 @@ write_short_name (struct tar_stat_info *st)
+@@ -535,6 +538,11 @@
return header;
}
/* Write a GNUTYPE_LONGLINK or GNUTYPE_LONGNAME block. */
static void
write_gnu_long_link (struct tar_stat_info *st, const char *p, char type)
-@@ -544,6 +552,11 @@ write_gnu_long_link (struct tar_stat_info *st, const char *p, char type)
+@@ -545,6 +553,11 @@
char *tmpname;
header = start_private_header ("././@LongLink", size, 0);
uid_to_uname (0, &tmpname);
UNAME_TO_CHARS (tmpname, header->header.uname);
free (tmpname);
-@@ -724,7 +737,7 @@ write_header_name (struct tar_stat_info *st)
+@@ -725,7 +738,7 @@
return write_short_name (st);
}
else if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT)
return write_long_name (st);
else
return write_short_name (st);
-@@ -1476,7 +1489,7 @@ dump_hard_link (struct tar_stat_info *st)
+@@ -1496,7 +1509,7 @@
block_ordinal = current_block_ordinal ();
assign_string (&st->link_name, link_name);
if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT)
write_long_link (st);
st->stat.st_size = 0;
-diff --git a/src/tar.c b/src/tar.c
-index 4f5017d..b72e25b 100644
--- a/src/tar.c
+++ b/src/tar.c
-@@ -1246,6 +1246,26 @@ expand_pax_option (struct tar_args *targs, const char *arg)
+@@ -1204,6 +1204,26 @@
return res;
}
\f
static uintmax_t
parse_owner_group (char *arg, uintmax_t field_max, char const **name_option)
-@@ -2626,6 +2646,9 @@ main (int argc, char **argv)
- filename_terminator = '\n';
+@@ -2682,6 +2702,9 @@
+
set_quoting_style (0, DEFAULT_QUOTING_STYLE);
+ debian_longlink_hack_init ();