diff -urNp tar-1.22-orig/configure.ac tar-1.22/configure.ac

--- tar-1.22-orig/configure.ac	2009-03-05 08:01:58.000000000 +0100

+++ tar-1.22/configure.ac	2009-11-23 14:48:00.000000000 +0100

@@ -40,7 +40,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h

   sys/param.h sys/device.h sys/filio.h sys/gentape.h \

   sys/inet.h sys/io/trioctl.h \

   sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \

-  unistd.h locale.h)

+  unistd.h locale.h selinux/selinux.h attr/xattr.h sys/acl.h)

 AC_CHECK_HEADERS([sys/buf.h], [], [],

 [#if HAVE_SYS_PARAM_H

@@ -88,6 +88,13 @@ gl_INIT

 tar_PAXUTILS

 AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes)

+AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \

+               setxattr  fsetxattr  lsetxattr \

+               listxattr flistxattr llistxattr,

+               AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),)

+AC_CHECK_LIB(selinux, getfilecon)

+AC_CHECK_LIB(acl, acl_get_fd)

+

 AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])

 AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])

 AC_CHECK_DECLS([time],,, [#include <time.h>])

@@ -203,6 +210,8 @@ AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE

 # Iconv

 AM_ICONV

 AC_CHECK_HEADERS(iconv.h)

+AC_CHECK_HEADERS(selinux/selinux.h)

+AC_CHECK_HEADERS(attr/xattr.h)

 AC_CHECK_TYPE(iconv_t,:,

               AC_DEFINE(iconv_t, int,

                         [Conversion descriptor type]),

diff -urNp tar-1.22-orig/doc/tar.texi tar-1.22/doc/tar.texi

--- tar-1.22-orig/doc/tar.texi	2009-03-05 08:04:13.000000000 +0100

+++ tar-1.22/doc/tar.texi	2009-11-23 14:48:00.000000000 +0100

@@ -2345,6 +2345,10 @@ Normally when creating an archive, @comm

 @samp{/} from member names.  This option disables that behavior.

 @xref{absolute}.

+@opsummary{acl}

+@item --acls

+Causes @command{tar} to store ACL's.  @xref{Attributes}.

+

 @opsummary{after-date}

 @item --after-date

@@ -2844,6 +2848,10 @@ contents have changed (as opposed to jus

 also back up files for which any status information has

 changed).  @xref{after}.

+@opsummary{no-acl}

+@item --no-acls

+Causes @command{tar} not to store and not to extract ACL's.  @xref{Attributes}.

+

 @opsummary{no-anchored}

 @item --no-anchored

 An exclude pattern can match any subsequence of the name's components.

@@ -2919,11 +2927,21 @@ When extracting an archive, subtract the

 the permissions specified in the archive.  This is the default behavior

 for ordinary users.

+@opsummary{no-selinux}

+@item --no-selinux

+Causes @command{tar} not to store and not to extract SELinux security context.

+@xref{Attributes}.

+

 @opsummary{no-unquote}

 @item --no-unquote

 Treat all input file or member names literally, do not interpret

 escape sequences.  @xref{input name quoting}.

+@opsummary{no-xattrs}

+@item --no-xattrs

+Causes @command{tar} not to store and not to extract xattrs. This option also

+enables @option{--no-selinux} and @option{--no-acls}.  @xref{Attributes}.

+

 @opsummary{no-wildcards}

 @item --no-wildcards

 Do not use wildcards.

@@ -3151,6 +3169,11 @@ locations.  Usually @command{tar} determ

 the archive can be seeked or not.  This option is intended for use

 in cases when such recognition fails.

+@opsummary{selinux}

+@item --selinux

+Causes @command{tar} to store SElinux security context.  @xref{Attributes}.

+

+

 @opsummary{show-defaults}

 @item --show-defaults

@@ -3349,6 +3372,11 @@ Used in conjunction with @option{--multi

 keep track of which volume of a multi-volume archive it is working in

 @var{file}.  @xref{volno-file}.

+@opsummary{xattrs}

+@item --xattrs

+Causes @command{tar} to store xattrs. This option also enables

+@option{--selinux} and @option{--acls}.  @xref{Attributes}.

+

 @opsummary{wildcards}

 @item --wildcards

 Use wildcards when matching member names with patterns.

@@ -8350,6 +8378,8 @@ implementation able to read @samp{ustar}

 most @samp{posix} archives as well, with the only exception that any

 additional information (such as long file names etc.) will in such

 case be extracted as plain text files along with the files it refers to.

+This is the only format that can store ACLs, SELinux context and extended

+attributes.

 This archive format will be the default format for future versions

 of @GNUTAR{}.

@@ -8902,6 +8932,51 @@ Same as both @option{--same-permissions}

 This option is deprecated, and will be removed in @GNUTAR{} version 1.23.

+@opindex acls

+@item --acls

+This option causes @command{tar} to store the current ACL in the archive.

+

+The @option{--acls} option has no equivalent short option name.

+

+@opindex selinux

+@item --selinux

+This option causes @command{tar} to store the current SELinux security context

+information in the archive.

+

+The @option{--selinux} option has no equivalent short option name.

+

+@opindex xattrs

+@item --xattrs

+This option causes @command{tar} to store the current extended attributes in

+the archive. This option also enables @option{--acls} and @option{--selinux} if

+they haven't been set already.

+

+The @option{--xattrs} option has no equivalent short option name.

+

+@opindex no-acls

+@item --no-acls

+This option causes @command{tar} not to store the current ACL in the archive

+and not to extract any ACL information in an archive.

+

+The @option{--no-acls} option has no equivalent short option name.

+

+@opindex no-selinux

+@item --no-selinux

+This option causes @command{tar} not to store the current SELinux security

+context information in the archive and not to extract any SELinux information in

+an archive.

+

+The @option{--no-selinux} option has no equivalent short option name.

+

+@opindex no-xattrs

+@item --no-xattrs

+This option causes @command{tar} not to store the current extended attributes in

+the archive and not to extract any extended attributes in an archive. This

+option also enables @option{--no-acls} and @option{--no-selinux} if

+they haven't been set already.

+

+The @option{--no-xattrs} option has no equivalent short option name.

+

 @end table

 @node Portability

diff -urNp tar-1.22-orig/src/common.h tar-1.22/src/common.h

--- tar-1.22-orig/src/common.h	2008-11-30 13:30:29.000000000 +0100

+++ tar-1.22/src/common.h	2009-11-23 14:48:00.000000000 +0100

@@ -248,6 +248,15 @@ GLOBAL int same_owner_option;

 /* If positive, preserve permissions when extracting.  */

 GLOBAL int same_permissions_option;

+/* If positive, save the SELinux context.  */

+GLOBAL int selinux_context_option;

+

+/* If positive, save the ACLs.  */

+GLOBAL int acls_option;

+

+/* If positive, save the user and root xattrs.  */

+GLOBAL int xattrs_option;

+

 /* When set, strip the given number of file name components from the file name

    before extracting */

 GLOBAL size_t strip_name_components;

@@ -673,6 +682,9 @@ extern char *output_start;

 void update_archive (void);

+/* Module attrs.c.  */

+#include "xattrs.h"

+

 /* Module xheader.c.  */

 void xheader_init (struct xheader *xhdr);

@@ -694,6 +706,12 @@ bool xheader_string_end (struct xheader 

 bool xheader_keyword_deleted_p (const char *kw);

 char *xheader_format_name (struct tar_stat_info *st, const char *fmt,

 			   size_t n);

+void xheader_xattr_init(struct tar_stat_info *st);

+void xheader_xattr_free(struct xattr_array *vals, size_t sz);

+void xheader_xattr_copy(const struct tar_stat_info *st,

+                        struct xattr_array **vals, size_t *sz);

+void xheader_xattr_add(struct tar_stat_info *st,

+                       const char *key, const char *val, size_t len);

 /* Module system.c */

diff -urNp tar-1.22-orig/src/create.c tar-1.22/src/create.c

--- tar-1.22-orig/src/create.c	2008-10-30 11:58:04.000000000 +0100

+++ tar-1.22/src/create.c	2009-11-23 14:48:33.000000000 +0100

@@ -24,6 +24,7 @@

 #include <quotearg.h>

 #include "common.h"

+

 #include <hash.h>

 struct link

@@ -944,6 +945,30 @@ start_header (struct tar_stat_info *st)

       GNAME_TO_CHARS (st->gname, header->header.gname);

     }

+  if (archive_format == POSIX_FORMAT)

+    {

+      if (acls_option > 0)

+        {

+          if (st->acls_a_ptr)

+            xheader_store ("SCHILY.acl.access", st, NULL);

+          if (st->acls_d_ptr)

+            xheader_store ("SCHILY.acl.default", st, NULL);

+        }

+      if ((selinux_context_option > 0) && st->cntx_name)

+        xheader_store ("RHT.security.selinux", st, NULL);

+      if (xattrs_option > 0)

+        {

+          size_t scan_xattr = 0;

+          struct xattr_array *xattr_map = st->xattr_map;

+          

+          while (scan_xattr < st->xattr_map_size)

+            {

+              xheader_store (xattr_map[scan_xattr].xkey, st, &scan_xattr);

+              ++scan_xattr;

+            }

+        }

+    }

+

   return header;

 }

@@ -1578,6 +1603,10 @@ dump_file0 (struct tar_stat_info *st, co

 	    }

 	}

+      xattrs_acls_get(st, p, fd, !is_dir);

+      xattrs_selinux_get(st, p, fd);

+      xattrs_xattrs_get(st, p, fd);

+

       if (is_dir)

 	{

 	  const char *tag_file_name;

@@ -1709,6 +1738,9 @@ dump_file0 (struct tar_stat_info *st, co

       if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size)

 	write_long_link (st);

+      xattrs_selinux_get(st, p, -1);

+      xattrs_xattrs_get(st, p, -1);

+

       block_ordinal = current_block_ordinal ();

       st->stat.st_size = 0;	/* force 0 size on symlink */

       header = start_header (st);

diff -urNp tar-1.22-orig/src/extract.c tar-1.22/src/extract.c

--- tar-1.22-orig/src/extract.c	2008-10-30 15:10:28.000000000 +0100

+++ tar-1.22/src/extract.c	2009-11-23 14:48:33.000000000 +0100

@@ -69,6 +69,13 @@ struct delayed_set_stat

     mode_t invert_permissions;

     enum permstatus permstatus;

     bool after_links;

+    char *cntx_name;

+    char *acls_a_ptr;

+    size_t acls_a_len;

+    char *acls_d_ptr;

+    size_t acls_d_len;

+    size_t xattr_map_size;   /* Size of the xattr map */

+    struct xattr_array *xattr_map;

     char file_name[1];

   };

@@ -96,6 +103,18 @@ struct delayed_link

        hard-linked together.  */

     struct string_list *sources;

+    /* SELinux context */

+    char *cntx_name;

+   

+    /* ACLs */

+    char *acls_a_ptr;

+    size_t acls_a_len;

+    char *acls_d_ptr;

+    size_t acls_d_len;

+   

+    size_t xattr_map_size;   /* Size of the xattr map */

+    struct xattr_array *xattr_map;

+   

     /* The desired target of the desired link.  */

     char target[1];

   };

@@ -276,6 +295,10 @@ set_stat (char const *file_name,

 	 give files away.  */

     }

+  xattrs_acls_set(st, file_name, typeflag);

+  xattrs_selinux_set(st, file_name, typeflag);

+  xattrs_xattrs_set(st, file_name, typeflag);

+

   if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)

     {

       /* When lchown exists, it should be used to change the attributes of

@@ -352,6 +375,29 @@ delay_set_stat (char const *file_name, s

   data->invert_permissions = invert_permissions;

   data->permstatus = permstatus;

   data->after_links = 0;

+  data->cntx_name = NULL;

+  assign_string (&data->cntx_name, st->cntx_name);

+  if (st->acls_a_ptr)

+    {

+      data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1);

+      data->acls_a_len = st->acls_a_len;

+    }

+  else

+    {

+      data->acls_a_ptr = NULL;

+      data->acls_a_len = 0;

+    }

+  if (st->acls_d_ptr)

+    {

+      data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1);

+      data->acls_d_len = st->acls_d_len;

+    }

+  else

+    {

+      data->acls_d_ptr = NULL;

+      data->acls_d_len = 0;

+    }

+  xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size);

   strcpy (data->file_name, file_name);

   delayed_set_stat_head = data;

 }

@@ -599,11 +645,22 @@ apply_nonancestor_delayed_set_stat (char

 	  sb.stat.st_gid = data->gid;

 	  sb.atime = data->atime;

 	  sb.mtime = data->mtime;

+          sb.cntx_name = data->cntx_name;

+          sb.acls_a_ptr = data->acls_a_ptr;

+          sb.acls_a_len = data->acls_a_len;

+          sb.acls_d_ptr = data->acls_d_ptr;

+          sb.acls_d_len = data->acls_d_len;

+          sb.xattr_map = data->xattr_map;

+          sb.xattr_map_size = data->xattr_map_size;

 	  set_stat (data->file_name, &sb, cur_info,

 		    data->invert_permissions, data->permstatus, DIRTYPE);

 	}

       delayed_set_stat_head = data->next;

+      xheader_xattr_free (data->xattr_map, data->xattr_map_size);

+      free (data->cntx_name);

+      free (data->acls_a_ptr);

+      free (data->acls_d_ptr);

       free (data);

     }

 }

@@ -882,6 +939,13 @@ create_placeholder_file (char *file_name

 			    + strlen (file_name) + 1);

       p->sources->next = 0;

       strcpy (p->sources->string, file_name);

+      p->cntx_name = NULL;

+      assign_string (&p->cntx_name, current_stat_info.cntx_name);

+      p->acls_a_ptr = NULL;

+      p->acls_a_len = 0;

+      p->acls_d_ptr = NULL;

+      p->acls_d_len = 0;

+      xheader_xattr_copy (&current_stat_info, &p->xattr_map, &p->xattr_map_size);

       strcpy (p->target, current_stat_info.link_name);

       h = delayed_set_stat_head;

@@ -1288,6 +1352,13 @@ apply_delayed_links (void)

 		  struct tar_stat_info st1;

 		  st1.stat.st_uid = ds->uid;

 		  st1.stat.st_gid = ds->gid;

+                  st1.cntx_name = ds->cntx_name;

+                  st1.acls_a_ptr = ds->acls_a_ptr;

+                  st1.acls_a_len = ds->acls_a_len;

+                  st1.acls_d_ptr = ds->acls_d_ptr;

+                  st1.acls_d_len = ds->acls_d_len;

+                  st1.xattr_map = ds->xattr_map;

+                  st1.xattr_map_size = ds->xattr_map_size;

 		  set_stat (source, &st1, NULL, 0, 0, SYMTYPE);

 		  valid_source = source;

 		}

@@ -1301,6 +1372,9 @@ apply_delayed_links (void)

 	  sources = next;

 	}

+   xheader_xattr_free (ds->xattr_map, ds->xattr_map_size);

+   free (ds->cntx_name);

+

       {

 	struct delayed_link *next = ds->next;

 	free (ds);

diff -urNp tar-1.22-orig/src/list.c tar-1.22/src/list.c

--- tar-1.22-orig/src/list.c	2009-11-23 14:47:03.000000000 +0100

+++ tar-1.22/src/list.c	2009-11-23 14:48:00.000000000 +0100

@@ -568,6 +568,13 @@ decode_header (union block *header, stru

   assign_string (&stat_info->gname,

 		 header->header.gname[0] ? header->header.gname : NULL);

+  stat_info->acls_a_ptr = NULL;

+  stat_info->acls_a_len = 0;

+  stat_info->acls_d_ptr = NULL;

+  stat_info->acls_d_len = 0;

+  stat_info->cntx_name = NULL;

+  xheader_xattr_init(stat_info);

+  

   if (format == OLDGNU_FORMAT && incremental_option)

     {

       stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime);

diff -urNp tar-1.22-orig/src/Makefile.am tar-1.22/src/Makefile.am

--- tar-1.22-orig/src/Makefile.am	2007-10-29 18:53:06.000000000 +0100

+++ tar-1.22/src/Makefile.am	2009-11-23 14:48:00.000000000 +0100

@@ -20,7 +20,7 @@

 bin_PROGRAMS = tar

-noinst_HEADERS = arith.h common.h tar.h

+noinst_HEADERS = arith.h common.h tar.h xattrs.h

 tar_SOURCES = \

  buffer.c\

  checkpoint.c\

@@ -39,10 +39,11 @@ tar_SOURCES = \

  tar.c\

  transform.c\

  update.c\

- utf8.c

+ utf8.c\

+ xattrs.c

 INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib

 LDADD = ../lib/libtar.a $(LIBINTL) $(LIBICONV)

-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)

+tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME)

diff -urNp tar-1.22-orig/src/tar.c tar-1.22/src/tar.c

--- tar-1.22-orig/src/tar.c	2009-03-05 08:04:13.000000000 +0100

+++ tar-1.22/src/tar.c	2009-11-23 14:48:00.000000000 +0100

@@ -246,7 +246,8 @@ tar_set_quoting_style (char *arg)

 enum

 {

-  ANCHORED_OPTION = CHAR_MAX + 1,

+  ACLS_OPTION = CHAR_MAX + 1,

+  ANCHORED_OPTION,

   ATIME_PRESERVE_OPTION,

   BACKUP_OPTION,

   CHECK_DEVICE_OPTION,

@@ -276,6 +277,7 @@ enum

   MODE_OPTION,

   MTIME_OPTION,

   NEWER_MTIME_OPTION,

+  NO_ACLS_OPTION,

   NO_ANCHORED_OPTION,

   NO_AUTO_COMPRESS_OPTION,

   NO_CHECK_DEVICE_OPTION,

@@ -288,9 +290,11 @@ enum

   NO_RECURSION_OPTION,

   NO_SAME_OWNER_OPTION,

   NO_SAME_PERMISSIONS_OPTION,

+  NO_SELINUX_CONTEXT_OPTION,

   NO_UNQUOTE_OPTION,

   NO_WILDCARDS_MATCH_SLASH_OPTION,

   NO_WILDCARDS_OPTION,

+  NO_XATTR_OPTION,

   NULL_OPTION,

   NUMERIC_OWNER_OPTION,

   OCCURRENCE_OPTION,

@@ -312,6 +316,7 @@ enum

   RMT_COMMAND_OPTION,

   RSH_COMMAND_OPTION,

   SAME_OWNER_OPTION,

+  SELINUX_CONTEXT_OPTION,

   SHOW_DEFAULTS_OPTION,

   SHOW_OMITTED_DIRS_OPTION,

   SHOW_TRANSFORMED_NAMES_OPTION,

@@ -328,7 +333,8 @@ enum

   VERSION_OPTION,

   VOLNO_FILE_OPTION,

   WILDCARDS_MATCH_SLASH_OPTION,

-  WILDCARDS_OPTION

+  WILDCARDS_OPTION,

+  XATTR_OPTION

 };

 const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION;

@@ -465,6 +471,10 @@ static struct argp_option options[] = {

   {NULL, 0, NULL, 0,

    N_("Handling of file attributes:"), GRID },

+  {"acls", ACLS_OPTION, 0, 0, 

+   N_("Save the ACLs to the archive"), GRID+1 },

+  {"no-acls", NO_ACLS_OPTION, 0, 0, 

+   N_("Don't extract the ACLs from the archive"), GRID+1 },

   {"owner", OWNER_OPTION, N_("NAME"), 0,

    N_("force NAME as owner for added files"), GRID+1 },

   {"group", GROUP_OPTION, N_("NAME"), 0,

@@ -495,6 +505,14 @@ static struct argp_option options[] = {

   {"preserve-order", 's', 0, 0,

    N_("sort names to extract to match archive"), GRID+1 },

   {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },

+  {"selinux", SELINUX_CONTEXT_OPTION, 0, 0, 

+   N_("Save the SELinux context to the archive"), GRID+1 },

+  {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0, 

+   N_("Don't extract the SELinux context from the archive"), GRID+1 },

+  {"xattrs", XATTR_OPTION, 0, 0, 

+   N_("Save the user/root xattrs to the archive"), GRID+1 },

+  {"no-xattrs", NO_XATTR_OPTION, 0, 0, 

+   N_("Don't extract the user/root xattrs from the archive"), GRID+1 },

   {"preserve", PRESERVE_OPTION, 0, 0,

    N_("same as both -p and -s"), GRID+1 },

   {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,

@@ -1932,6 +1950,37 @@ parse_opt (int key, char *arg, struct ar

       same_permissions_option = -1;

       break;

+    case ACLS_OPTION:

+      set_archive_format ("posix");

+      acls_option = 1;

+      break;

+

+    case NO_ACLS_OPTION:

+      acls_option = -1;

+      break;

+

+    case SELINUX_CONTEXT_OPTION:

+      set_archive_format ("posix");

+      selinux_context_option = 1;

+      break;

+

+    case NO_SELINUX_CONTEXT_OPTION:

+      selinux_context_option = -1;

+      break;

+

+    case XATTR_OPTION:

+      set_archive_format ("posix");

+      if (!acls_option) acls_option = 1;

+      if (!selinux_context_option) selinux_context_option = 1;

+      xattrs_option = 1;

+      break;

+

+    case NO_XATTR_OPTION:

+      if (!acls_option) acls_option = -1;

+      if (!selinux_context_option) selinux_context_option = -1;

+      xattrs_option = -1;

+      break;

+

     case RECURSION_OPTION:

       recursion_option = FNM_LEADING_DIR;

       break;

@@ -2330,6 +2379,29 @@ decode_options (int argc, char **argv)

 	  || subcommand_option != LIST_SUBCOMMAND))

     USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));

+  /* star create's non-POSIX typed archives with xattr support, so allow the

+     extra headers */

+  if ((acls_option > 0)

+      && archive_format != POSIX_FORMAT

+      && (subcommand_option != EXTRACT_SUBCOMMAND

+	  || subcommand_option != DIFF_SUBCOMMAND

+	  || subcommand_option != LIST_SUBCOMMAND))

+    USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives")));

+

+  if ((selinux_context_option > 0)

+      && archive_format != POSIX_FORMAT

+      && (subcommand_option != EXTRACT_SUBCOMMAND

+	  || subcommand_option != DIFF_SUBCOMMAND

+	  || subcommand_option != LIST_SUBCOMMAND))

+    USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives")));

+

+  if ((xattrs_option > 0)

+      && archive_format != POSIX_FORMAT

+      && (subcommand_option != EXTRACT_SUBCOMMAND

+	  || subcommand_option != DIFF_SUBCOMMAND

+	  || subcommand_option != LIST_SUBCOMMAND))

+    USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));

+

   /* If ready to unlink hierarchies, so we are for simpler files.  */

   if (recursive_unlink_option)

     old_files_option = UNLINK_FIRST_OLD_FILES;

@@ -2544,11 +2616,15 @@ tar_stat_init (struct tar_stat_info *st)

 void

 tar_stat_destroy (struct tar_stat_info *st)

 {

+  xheader_xattr_free (st->xattr_map, st->xattr_map_size);

   free (st->orig_file_name);

   free (st->file_name);

   free (st->link_name);

   free (st->uname);

   free (st->gname);

+  free (st->cntx_name);

+  free (st->acls_a_ptr);

+  free (st->acls_d_ptr);

   free (st->sparse_map);

   free (st->dumpdir);

   xheader_destroy (&st->xhdr);

diff -urNp tar-1.22-orig/src/tar.h tar-1.22/src/tar.h

--- tar-1.22-orig/src/tar.h	2007-06-27 15:30:32.000000000 +0200

+++ tar-1.22/src/tar.h	2009-11-23 14:48:00.000000000 +0100

@@ -276,6 +276,14 @@ struct xheader

   uintmax_t string_length;

 };

+/* Information about xattrs for a file.  */

+struct xattr_array

+  {

+    char *xkey;

+    char *xval_ptr;

+    size_t xval_len;

+  };

+

 struct tar_stat_info

 {

   char *orig_file_name;     /* name of file read from the archive header */

@@ -287,6 +295,15 @@ struct tar_stat_info

   char          *uname;     /* user name of owner */

   char          *gname;     /* group name of owner */

+

+  char *cntx_name;          /* SELinux context for the current archive entry. */

+

+  char *acls_a_ptr;         /* Access ACLs for the current archive entry. */

+  size_t acls_a_len;        /* Access ACLs for the current archive entry. */

+ 

+  char *acls_d_ptr;         /* Default ACLs for the current archive entry. */

+  size_t acls_d_len;        /* Default ACLs for the current archive entry. */

+

   struct stat   stat;       /* regular filesystem stat */

   /* STAT doesn't always have access, data modification, and status

@@ -309,6 +326,9 @@ struct tar_stat_info

   size_t sparse_map_size;   /* Size of the sparse map */

   struct sp_array *sparse_map;

+  size_t xattr_map_size;   /* Size of the xattr map */

+  struct xattr_array *xattr_map;

+

   /* Extended headers */

   struct xheader xhdr;

diff -urNp tar-1.22-orig/src/xattrs.c tar-1.22/src/xattrs.c

--- tar-1.22-orig/src/xattrs.c	1970-01-01 01:00:00.000000000 +0100

+++ tar-1.22/src/xattrs.c	2009-11-23 14:48:33.000000000 +0100

@@ -0,0 +1,491 @@

+/* Create a tar archive.

+

+   Copyright (C) 2006 Free Software Foundation, Inc.

+

+   Written by James Antill, on 2006-07-27.

+

+   This program is free software; you can redistribute it and/or modify it

+   under the terms of the GNU General Public License as published by the

+   Free Software Foundation; either version 2, or (at your option) any later

+   version.

+

+   This program is distributed in the hope that it will be useful, but

+   WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General

+   Public License for more details.

+

+   You should have received a copy of the GNU General Public License along

+   with this program; if not, write to the Free Software Foundation, Inc.,

+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

+

+#include <system.h>

+

+#include <quotearg.h>

+

+#include "common.h"

+

+

+#ifndef HAVE_SELINUX_SELINUX_H

+# undef HAVE_LIBSELINUX

+#endif

+

+#ifndef HAVE_ATTR_XATTR_H

+# undef HAVE_XATTRS

+#endif

+

+#ifndef HAVE_SYS_ACL_H

+# undef HAVE_LIBACL

+#endif

+

+#ifdef HAVE_SELINUX_SELINUX_H

+# include <selinux/selinux.h>

+#endif

+

+#ifdef HAVE_ATTR_XATTR_H

+# include <attr/xattr.h>

+#endif

+

+#ifdef HAVE_SYS_ACL_H

+# include <sys/acl.h>

+#endif

+

+

+#if 0 /* unused by xattr's atm. */

+static void xattrs__fd_get(struct tar_stat_info *st,

+                           char const *file_name, int fd, const char *attr,

+                           char **ret_ptr, size_t *ret_len)

+{

+#ifdef HAVE_XATTRS

+  static ssize_t asz = 1024;

+  ssize_t ret = 0;

+  static char *val = NULL;

+  

+  if (!val) val = xmalloc (asz);

+  

+  while (((ret = fgetxattr (fd, attr, val, asz)) == -1) &&

+         (errno == ERANGE))

+    {

+      asz <<= 1;

+      val = xrealloc (val, asz);

+    }

+  

+  if (ret != -1)

+    {

+      *ret_ptr = xmemdup (val, ret + 1);

+      *ret_len = ret;

+    }

+  else if (errno != ENOATTR)

+    call_arg_warn ("fgetxattr", file_name);

+#endif

+}

+#endif

+