diff --git a/NEWS b/NEWS

index 12c1dd6..8aeae33 100644

--- a/NEWS

+++ b/NEWS

@@ -1,4 +1,4 @@

-GNU tar NEWS - User visible changes. 2011-03-12

+GNU tar NEWS - User visible changes. 2012-11-19

 Please send GNU tar bug reports to <bug-tar@gnu.org>

@@ -22,6 +22,17 @@ zero-sized files.

 When invoked with these two options, tar 1.25 would add only the

 top-level directory to the archive, but not its contents.

+* Support for POSIX ACLs, extended attributes and SELinux context.

+

+Starting with this version tar is able to store, extract and list

+extended file attributes, POSIX.1e ACLs and SELinux context.  This is

+controlled by the command line options --xattrs, --acls and --selinux,

+correspondingly.  Each of these options has a `--no-' counterpart

+(e.g. --no-xattrs), which disables the corresponding feature.

+Additionally, the options --xattrs-include and --xattrs-exclude allow

+you to selectively control for which files to store (or extract) the

+extended attributes.

+

 version 1.25 - Sergey Poznyakoff, 2010-11-07

diff --git a/THANKS b/THANKS

index 0364c50..54c96a0 100644

--- a/THANKS

+++ b/THANKS

@@ -296,6 +296,7 @@ Kimmy Posey		kimmyd@bnr.ca

 Koji Kishi		kis@rqa.sony.co.jp

 Konno Hiroharu		konno@pac.co.jp

 Kurt Jaeger		pi@lf.net

+James Antill            jantill@redhat.com

 Larry Creech		lcreech@lonestar.rcclub.org

 Larry Schwimmer		rosebud@cyclone.stanford.edu

 Lasse Collin 		lasse.collin@tukaani.org

@@ -374,6 +375,7 @@ Oswald P. Backus IV	backus@lks.csi.com

 Pascal Meheut		pascal@cnam.cnam.fr

 Patrick Fulconis	fulco@sig.uvsq.fr

 Patrick Timmons		timmons@electech.polymtl.ca

+Pavel Raiskup           praiskup@redhat.com

 Paul Eggert		eggert@twinsun.com

 Paul Kanz		paul@icx.com

 Paul Mitchell		P.Mitchell@surrey.ac.uk

diff --git a/acinclude.m4 b/acinclude.m4

index 10a27e5..30381d3 100644

--- a/acinclude.m4

+++ b/acinclude.m4

@@ -24,3 +24,29 @@ AC_DEFUN([TAR_COMPR_PROGRAM],[

 	     [tar_compr_var=m4_if($2,,$1,$2)])

  AC_DEFINE_UNQUOTED(tar_compr_define, "$tar_compr_var",

                     [Define to the program name of ]$1[ compressor program])])

+

+# Provide <attr/xattr.h>, if necessary

+

+AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H],

+[

+  AC_ARG_WITH([xattrs],

+    AS_HELP_STRING([--without-xattrs], [don't use linux extended attributes]),

+    [], [with_xattrs=maybe]

+  )

+

+  AC_CHECK_HEADERS([attr/xattr.h])

+  AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes])

+  if test "$ac_cv_header_attr_xattr_h" = yes; then

+    AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \

+                   setxattr  fsetxattr  lsetxattr \

+                   listxattr flistxattr llistxattr,

+        # only when functions are present

+        AC_DEFINE([HAVE_ATTR_XATTR_H], [1],

+                    [define to 1 if we have <attr/xattr.h> header])

+        if test "$with_xattrs" != no; then

+          AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.])

+        fi

+    )

+  fi

+])

+		    

\ No newline at end of file

diff --git a/configure.ac b/configure.ac

index db69cb8..9b3e0c8 100644

--- a/configure.ac

+++ b/configure.ac

@@ -70,6 +70,29 @@ if test $diff_cv_st_fstype_string = yes; then

     [Define if struct stat has a char st_fstype[] member.])

 fi

+# even if we use gnulib's acl.h with integrated m4 file later on (used because

+# of very useful file_has_acl() function) we need following checks that restrict

+# tar to use POSIX.1e ACLs only.

+AC_ARG_WITH([posix-acls],

+    AS_HELP_STRING([--without-posix-acls],

+                   [do not use POSIX.1e access control lists]),

+    [with_posix_acls=no])

+if test "x$with_posix_acls" != "xno"; then

+  AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_get_file],  [acl pacl],, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_get_fd],    [acl pacl],, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_set_file],  [acl pacl],, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_set_fd],    [acl pacl],, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_to_text],   [acl pacl],, [with_posix_acl=no])

+  AC_SEARCH_LIBS([acl_from_text], [acl pacl],, [with_posix_acl=no])

+  if test "x$with_posix_acls" != xno; then

+    AC_DEFINE(HAVE_POSIX_ACLS,,[Define when we have working POSIX acls])

+  fi

+else

+  # disable acls in gnulib's checks

+  export enable_acl=no

+fi

+

 AC_TYPE_SIGNAL

 AC_TYPE_MODE_T

 AC_TYPE_PID_T

@@ -90,7 +113,10 @@ gl_INIT

 # paxutils modules

 tar_PAXUTILS

+TAR_HEADERS_ATTR_XATTR_H

+

 AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink])

+

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

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

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

diff --git a/lib/Makefile.am b/lib/Makefile.am

index efd6826..d73fac8 100644

--- a/lib/Makefile.am

+++ b/lib/Makefile.am

@@ -28,11 +28,24 @@ BUILT_SOURCES = rmt-command.h

 CLEANFILES = rmt-command.h rmt-command.h-t

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

-noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h

+noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h xattr-at.h

 libtar_a_SOURCES = \

   paxerror.c paxexit-status.c paxlib.h paxnames.c \

   prepargs.c prepargs.h \

   rtapelib.c \

   rmt.h \

   stdopen.c stdopen.h \

-  system.h system-ioctl.h

+  system.h system-ioctl.h \

+  xattr-at.c

+

+if !TAR_COND_XATTR_H

+BUILT_SOURCES += attr/xattr.h

+attr/xattr.h: attr-xattr.in.h $(top_builddir)/config.status

+	$(AM_V_at)$(MKDIR_P) attr

+	$(AM_V_GEN)rm -f $@-t $@ && \

+	 cp $(srcdir)/attr-xattr.in.h attr/xattr.h

+

+MOSTLYCLEANFILES = attr/xattr.h attr/xattr.h

+endif

+

+EXTRA_DIST = attr-xattr.in.h

diff --git a/lib/attr-xattr.in.h b/lib/attr-xattr.in.h

new file mode 100644

index 0000000..b5796fe

--- /dev/null

+++ b/lib/attr-xattr.in.h

@@ -0,0 +1,58 @@

+/* Replacement <attr/xattr.h> for platforms that lack it.

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

+

+   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */

+

+#ifndef TAR_ATTR_XATTR_H

+#define TAR_ATTR_XATTR_H

+#include <errno.h>

+

+/* setting */

+static inline int setxattr (const char *path, const char *name, const void

+                            *value, size_t size, int flags)

+{ errno = ENOTSUP; return -1; }

+

+static inline int lsetxattr (const char *path, const char *name, const void

+                             *value, size_t size, int flags)

+{ errno = ENOTSUP; return -1; }

+

+static inline int fsetxattr (int filedes, const char *name, const void *value,

+                             size_t size, int flags)

+{ errno = ENOTSUP; return -1; }

+

+

+/* getting */

+static inline ssize_t getxattr (const char *path, const char *name, void *value,

+                                size_t size)

+{ errno = ENOTSUP; return -1; }

+static inline ssize_t lgetxattr (const char *path, const char *name, void

+                                 *value, size_t size)

+{ errno = ENOTSUP; return -1; }

+static inline ssize_t fgetxattr (int filedes, const char *name, void *value,

+                                 size_t size)

+{ errno = ENOTSUP; return -1; }

+

+

+/* listing */

+static inline ssize_t listxattr (const char *path, char *list, size_t size)

+{ errno = ENOTSUP; return -1; }

+

+static inline ssize_t llistxattr (const char *path, char *list, size_t size)

+{ errno = ENOTSUP; return -1; }

+

+static inline ssize_t flistxattr (int filedes, char *list, size_t size)

+{ errno = ENOTSUP; return -1; }

+

+#endif

+

diff --git a/lib/xattr-at.c b/lib/xattr-at.c

new file mode 100644

index 0000000..746578c

--- /dev/null

+++ b/lib/xattr-at.c

@@ -0,0 +1,110 @@

+/* openat-style fd-relative functions for operating with extended file

+   attributes.

+

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

+

+   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */

+

+#include <config.h>

+

+#include "xattr-at.h"

+#include "openat.h"

+

+#include <stdlib.h>

+#include <unistd.h>

+#include <errno.h>

+#include <fcntl.h>

+

+#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */

+#include "save-cwd.h"

+

+#include "openat-priv.h"

+

+/* setxattrat */

+#define AT_FUNC_NAME setxattrat

+#define AT_FUNC_F1 setxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , const char *name, const void *value \

+                                        , size_t size, int flags

+#define AT_FUNC_POST_FILE_ARGS          , name, value, size, flags

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

+

+/* lsetxattrat */

+#define AT_FUNC_NAME lsetxattrat

+#define AT_FUNC_F1 lsetxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , const char *name, const void *value \

+                                        , size_t size, int flags

+#define AT_FUNC_POST_FILE_ARGS          , name, value, size, flags

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

+

+/* getxattrat */

+#define AT_FUNC_NAME getxattrat

+#define AT_FUNC_RESULT ssize_t

+#define AT_FUNC_F1 getxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , const char *name, void *value \

+                                        , size_t size

+#define AT_FUNC_POST_FILE_ARGS          , name, value, size

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_RESULT

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

+

+/* lgetxattrat */

+#define AT_FUNC_NAME lgetxattrat

+#define AT_FUNC_RESULT ssize_t

+#define AT_FUNC_F1 lgetxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , const char *name, void *value \

+                                        , size_t size

+#define AT_FUNC_POST_FILE_ARGS          , name, value, size

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_RESULT

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

+

+/* listxattrat */

+#define AT_FUNC_NAME listxattrat

+#define AT_FUNC_RESULT ssize_t

+#define AT_FUNC_F1 listxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , char *list , size_t size

+#define AT_FUNC_POST_FILE_ARGS          , list , size

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_RESULT

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

+

+/* llistxattrat */

+#define AT_FUNC_NAME llistxattrat

+#define AT_FUNC_RESULT ssize_t

+#define AT_FUNC_F1 llistxattr

+#define AT_FUNC_POST_FILE_PARAM_DECLS   , char *list , size_t size

+#define AT_FUNC_POST_FILE_ARGS          , list , size

+#include "at-func.c"

+#undef AT_FUNC_NAME

+#undef AT_FUNC_F1

+#undef AT_FUNC_RESULT

+#undef AT_FUNC_POST_FILE_PARAM_DECLS

+#undef AT_FUNC_POST_FILE_ARGS

diff --git a/lib/xattr-at.h b/lib/xattr-at.h

new file mode 100644

index 0000000..360245c

--- /dev/null

+++ b/lib/xattr-at.h

@@ -0,0 +1,66 @@

+/* Prototypes for openat-style fd-relative functions for operating with

+   extended file attributes.

+

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

+

+   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */

+

+#ifndef XATTRS_AT_H

+#define XATTRS_AT_H

+

+#include <sys/types.h>

+#include <attr/xattr.h>

+

+/* These are the dir-fd-relative variants of the functions without the

+   "at" suffix.  For example, setxattrat (AT_FDCWD, path, name, value, size,

+   flags &c) is usually equivalent to setxattr (file, name, value, size,

+   flags).  For more info use the setxattr(2), getxattr(2) or listxattr(2)

+   manpages. */

+

+/* dir-fd-relative setxattr.  Operation sets the VALUE of the extended

+   attribute identified by NAME and associated with the given PATH in the

+   filesystem relatively to directory identified by DIR_FD.  See the

+   setxattr(2) manpage for the description of all parameters. */

+int setxattrat (int dir_fd, const char *path, const char *name,

+                const void *value, size_t size, int flags);

+

+/* dir-fd-relative lsetxattr.  This function is just like setxattrat,

+   except when DIR_FD and FILE specify a symlink:  lsetxattrat operates on the

+   symlink, while the setxattrat operates on the referent of the symlink.  */

+int lsetxattrat (int dir_fd, const char *path, const char *name,

+                 const void *value, size_t size, int flags);

+

+/* dir-fd-relative getxattr.  Operation gets the VALUE of the extended

+   attribute idenfified by NAME and associated with the given PATH in the

+   filesystem relatively to directory identified by DIR_FD.  For more info

+   about all parameters see the getxattr(2) manpage. */

+ssize_t getxattrat (int dir_fd, const char *path, const char *name,

+                    void *value, size_t size);

+

+/* dir-fd-relative lgetxattr.  This function is just like getxattrat,

+   except when DIR_FD and FILE specify a symlink:  lgetxattrat operates on the

+   symlink, while the getxattrat operates on the referent of the symlink.  */

+ssize_t lgetxattrat (int dir_fd, const char *path, const char *name,

+                     void *value, size_t size);

+

+/* dir-fd-relative listxattr.  Obtain the list of extended attrubtes names.  For

+   more info see the listxattr(2) manpage. */

+ssize_t listxattrat (int dir_fd, const char *path, char *list, size_t size);

+

+/* dir-fd-relative llistxattr.  This function is just like listxattrat,

+   except when DIR_FD and FILE specify a symlink:  llistxattr operates on the

+   symlink, while the listxattrat operates on the referent of the symlink.  */

+ssize_t llistxattrat (int dir_fd, const char *path, char *list, size_t size);

+

+#endif /* XATTRS_AT_H */

diff --git a/src/Makefile.am b/src/Makefile.am

index de310f4..782df19 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -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\

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

  unlink.c\

  update.c\

  utf8.c\

- warning.c

+ warning.c\

+ xattrs.c

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

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

-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)

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

diff --git a/src/common.h b/src/common.h

index 2409413..16ba401 100644

--- a/src/common.h

+++ b/src/common.h

@@ -1,8 +1,8 @@

 /* Common declarations for the tar program.

    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,

-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

-   Inc.

+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012

+   Free Software Foundation, Inc.

    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

@@ -91,6 +91,11 @@ enum subcommand

 GLOBAL enum subcommand subcommand_option;

+#define READ_LIKE_SUBCOMMAND                    \

+  (subcommand_option == EXTRACT_SUBCOMMAND      \

+   || subcommand_option == DIFF_SUBCOMMAND      \

+   || subcommand_option == LIST_SUBCOMMAND)

+

 /* Selected format for output archive.  */

 GLOBAL enum archive_format archive_format;

@@ -254,6 +259,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;

@@ -708,6 +722,9 @@ extern char *output_start;

 void update_archive (void);

+/* Module attrs.c.  */

+#include "xattrs.h"

+

 /* Module xheader.c.  */

 void xheader_decode (struct tar_stat_info *stat);

@@ -728,6 +745,12 @@ bool xheader_string_end (struct xheader *xhdr, char const *keyword);

 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 */

@@ -809,6 +832,7 @@ void checkpoint_run (bool do_write);

 #define WARN_XDEV                0x00040000

 #define WARN_DECOMPRESS_PROGRAM  0x00080000

 #define WARN_EXISTING_FILE       0x00100000

+#define WARN_XATTR_WRITE         0x00200000

 /* The warnings composing WARN_VERBOSE_WARNINGS are enabled by default

    in verbose mode */

diff --git a/src/create.c b/src/create.c

index f98cbb5..25387a9 100644

--- a/src/create.c

+++ b/src/create.c

@@ -1,7 +1,8 @@

 /* Create a tar archive.

    Copyright (C) 1985, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,

-   2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.

+   2003, 2004, 2005, 2006, 2007, 2009, 2010, 2012

+   Free Software Foundation, Inc.

    Written by John Gilmore, on 1985-08-25.

@@ -936,6 +937,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;

 }

@@ -1711,6 +1736,10 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p)

       bool ok;

       struct stat final_stat;

+      xattrs_acls_get (parentfd, name, st, 0, !is_dir);

+      xattrs_selinux_get (parentfd, name, st, fd);

+      xattrs_xattrs_get (parentfd, name, st, fd);

+

       if (is_dir)

 	{

 	  const char *tag_file_name;

@@ -1830,6 +1859,9 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p)

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

 	write_long_link (st);

+      xattrs_selinux_get (parentfd, name, st, 0);

+      xattrs_xattrs_get (parentfd, name, st, 0);

+

       block_ordinal = current_block_ordinal ();

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

       header = start_header (st);

@@ -1848,11 +1880,26 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p)

     }

 #endif

   else if (S_ISCHR (st->stat.st_mode))

-    type = CHRTYPE;

+    {

+      type = CHRTYPE;

+      xattrs_acls_get (parentfd, name, st, 0, true);

+      xattrs_selinux_get (parentfd, name, st, 0);

+      xattrs_xattrs_get (parentfd, name, st, 0);

+    }

   else if (S_ISBLK (st->stat.st_mode))

-    type = BLKTYPE;

+    {

+      type = BLKTYPE;

+      xattrs_acls_get (parentfd, name, st, 0, true);

+      xattrs_selinux_get (parentfd, name, st, 0);

+      xattrs_xattrs_get (parentfd, name, st, 0);

+    }

   else if (S_ISFIFO (st->stat.st_mode))

-    type = FIFOTYPE;

+    {

+      type = FIFOTYPE;

+      xattrs_acls_get (parentfd, name, st, 0, true);

+      xattrs_selinux_get (parentfd, name, st, 0);

+      xattrs_xattrs_get (parentfd, name, st, 0);

+    }

   else if (S_ISSOCK (st->stat.st_mode))

     {

       WARNOPT (WARN_FILE_IGNORED,

diff --git a/src/extract.c b/src/extract.c

index 662ea0b..87b383a 100644

--- a/src/extract.c

+++ b/src/extract.c

@@ -1,7 +1,8 @@

 /* Extract files from a tar archive.

    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,

-   2001, 2003, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.

+   2001, 2003, 2004, 2005, 2006, 2007, 2010, 2012

+   Free Software Foundation, Inc.

    Written by John Gilmore, on 1985-11-19.

@@ -97,6 +98,14 @@ struct delayed_set_stat

     /* Directory that the name is relative to.  */

     int change_dir;

+    /* extended attributes*/

+    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;

+    struct xattr_array *xattr_map;

     /* Length and contents of name.  */

     size_t file_name_len;

     char file_name[1];

@@ -134,6 +143,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;

+    struct xattr_array *xattr_map;

+

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

     char target[1];

   };

@@ -360,6 +381,12 @@ set_stat (char const *file_name,

 	    st->stat.st_mode & ~ current_umask,

 	    0 < same_permissions_option && ! interdir ? MODE_ALL : MODE_RWX,

 	    fd, current_mode, current_mode_mask, typeflag, atflag);

+

+  /* these three calls must be done *after* fd_chown() call because fd_chown

+     causes that linux capabilities becomes cleared. */

+  xattrs_xattrs_set (st, file_name, typeflag, 1);

+  xattrs_acls_set (st, file_name, typeflag);

+  xattrs_selinux_set (st, file_name, typeflag);

 }

 /* For each entry H in the leading prefix of entries in HEAD that do

@@ -431,6 +458,36 @@ delay_set_stat (char const *file_name, struct tar_stat_info const *st,

   data->atflag = atflag;

   data->after_links = 0;

   data->change_dir = chdir_current;

+  data->cntx_name = NULL;

+  if (st)

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

+  if (st && 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 && 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;

+    }

+  if (st)

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

+  else

+    {

+      data->xattr_map = NULL;

+      data->xattr_map_size = 0;

+    }

   strcpy (data->file_name, file_name);

   delayed_set_stat_head = data;

   if (must_be_dot_or_slash (file_name))

@@ -678,6 +735,40 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)

   return RECOVER_NO;

 }

+/* Restore stat extended attributes (xattr) for FILE_NAME, using information

+   given in *ST.  Restore before extraction because they may affect file layout

+   (e.g. on Lustre distributed parallel filesystem - setting info about how many

+   servers is this file striped over, stripe size, mirror copies, etc.

+   in advance dramatically improves the following  performance of reading and

+   writing a file).  If not restoring permissions, invert the INVERT_PERMISSIONS

+   bits from the file's current permissions.  TYPEFLAG specifies the type of the

+   file.  FILE_CREATED indicates set_xattr has created the file */

+static int