[Cmake-commits] CMake branch, next, updated. v2.8.4-1366-g1df325d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1df325da44520a4db2ddc6d2586b83d33d7ec807 (commit)
       via  e8558efa01151a94d0dc16f7327b77560b543ab9 (commit)
      from  e580560077fcd3604b74fdca51824736f9519ab4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1df325da44520a4db2ddc6d2586b83d33d7ec807
commit 1df325da44520a4db2ddc6d2586b83d33d7ec807
Merge: e580560 e8558ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 7 09:00:52 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 7 09:00:52 2011 -0400

    Merge topic 'libarchive-strip-xattr-issue-11958' into next
    
    e8558ef cmArchiveWrite: Clear xattr and acl from entries (#11958)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8558efa01151a94d0dc16f7327b77560b543ab9
commit e8558efa01151a94d0dc16f7327b77560b543ab9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 7 08:27:56 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 7 08:27:56 2011 -0400

    cmArchiveWrite: Clear xattr and acl from entries (#11958)
    
    When reading archive entries from disk strip any xattr and acl entry
    headers that may have been loaded from the filesystem (e.g. selinux).
    These fields are only useful for backup tools and not for packaging and
    distribution of software.  Furthermore, the GNU tar 1.15.1 on at least
    one Linux distribution treats unknown entry headers as an error rather
    than a warning.  Therefore avoiding such fields is necessary for archive
    portability.
    
    Suggested-by: Tim Kientzle <tim at kientzle.com>

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index d9e4742..25dc8ba 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -236,6 +236,9 @@ bool cmArchiveWrite::AddFile(const char* file,
     this->Error += archive_error_string(this->Disk);
     return false;
     }
+  // Clear acl and xattr fields not useful for distribution.
+  archive_entry_acl_clear(e);
+  archive_entry_xattr_clear(e);
   if(archive_write_header(this->Archive, e) != ARCHIVE_OK)
     {
     this->Error = "archive_write_header: ";

-----------------------------------------------------------------------

Summary of changes:
 Source/cmArchiveWrite.cxx |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake