[tar/f16] Really add fixes for store&restore security.capability extended attributes category(#771927) and add

[Ondrej Vasik]

commit 3b264d728786164f570b8163aa214ac2d72a28ef
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Thu Aug 9 12:15:43 2012 +0200

    Really add fixes for store&restore security.capability extended attributes category(#771927) and add virtual provides for bundled(gnulib) copylib (#821790)

 tar-1.24-xattrs.patch |    8 +++++---
 tar.spec              |   12 ++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/tar-1.24-xattrs.patch b/tar-1.24-xattrs.patch
index 9423531..cb147b6 100644
--- a/tar-1.24-xattrs.patch
+++ b/tar-1.24-xattrs.patch
@@ -808,7 +808,7 @@ diff -urNp tar-1.24-orig/src/tar.h tar-1.24/src/tar.h
 diff -urNp tar-1.24-orig/src/xattrs.c tar-1.24/src/xattrs.c
 --- tar-1.24-orig/src/xattrs.c	1970-01-01 01:00:00.000000000 +0100
 +++ tar-1.24/src/xattrs.c	2010-10-25 10:24:52.568214736 +0200
-@@ -0,0 +1,489 @@
+@@ -0,0 +1,490 @@
 +/* Create a tar archive.
 +
 +   Copyright (C) 2006 Free Software Foundation, Inc.
@@ -1286,7 +1286,8 @@ diff -urNp tar-1.24-orig/src/xattrs.c tar-1.24/src/xattrs.c
 +          if (strncmp (keyword, "user.", strlen("user.")) &&
 +              strncmp (keyword, "lustre.", strlen("lustre.")) &&
 +              strncmp (keyword, "trusted.", strlen("trusted.")) &&
-+              strncmp (keyword, "security.NTACL", strlen("security.NTACL")))
++              strncmp (keyword, "security.NTACL", strlen("security.NTACL")) &&
++              strncmp (keyword, "security.capability", strlen("security.capability")))
 +            continue; /* don't try and set anything but normal xattrs */
 +
 +          xattrs__fd_set (st, file_name, typeflag, keyword,
@@ -1589,7 +1590,7 @@ diff -urNp tar-1.24-orig/src/xheader.c tar-1.24/src/xheader.c
  
    /* These may be present in a first global header of the archive.
       They provide the same functionality as GNUTYPE_MULTIVOL header.
-@@ -1561,11 +1704,41 @@ struct xhdr_tab const xhdr_tab[] = {
+@@ -1561,11 +1704,42 @@ struct xhdr_tab const xhdr_tab[] = {
       GNU.volume.offset keeps the offset of the start of this volume,
       otherwise kept in oldgnu_header.offset.  */
    { "GNU.volume.filename", volume_label_coder, volume_filename_decoder,
@@ -1630,6 +1631,7 @@ diff -urNp tar-1.24-orig/src/xheader.c tar-1.24/src/xheader.c
 +  { "SCHILY.xattr.trusted", xattr_coder, xattr_decoder, 0, true },
 +  { "SCHILY.xattr.lustre",  xattr_coder, xattr_decoder, 0, true },
 +  { "SCHILY.xattr.security.NTACL", xattr_coder, xattr_decoder, 0, true },
++  { "SCHILY.xattr.security.capability", xattr_coder, xattr_decoder, 0, true },
 +
 +  /* ignore everything else in the xattr namespaces... */
 +  { "SCHILY.xattr",         dummy_coder, dummy_decoder, 0, true },
diff --git a/tar.spec b/tar.spec
index d494135..9282025 100644
--- a/tar.spec
+++ b/tar.spec
@@ -5,7 +5,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -39,6 +39,7 @@ BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
 BuildRequires: libselinux-devel
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: bundled(gnulib)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -126,12 +127,15 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
-* Thu Jul 12 2012 Pavel Raiskup <praiskup at redhat.com 2:1.26-7
-- force the fchown() be called before xattrs_set() (#771927)
-* Sat Jun 16 2012 Ondrej Vasik <ovasik at redhat.com> - 2:1.26-3
+* Thu Aug 09 2012 Ondrej Vasik <ovasik at redhat.com 2:1.26-5
 - store&restore security.capability extended attributes category
   (#771927)
 - add virtual provides for bundled(gnulib) copylib (#821790)
+
+* Thu Jul 12 2012 Pavel Raiskup <praiskup at redhat.com 2:1.26-4
+- force the fchown() be called before xattrs_set() (#771927)
+
+* Sat Jun 16 2012 Ondrej Vasik <ovasik at redhat.com> - 2:1.26-3
 - fix for bad cooperation of the '-C' (change directory) and '-u' (update
   package) options (#688567)
 - Man page heading formatting fixes.