[Cmake-commits] CMake branch, next, updated. v2.8.8-3039-gfd3718e

[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  fd3718e407b64948bd790b095c200a41ee3b67e2 (commit)
       via  a34015d356c2a4084029e57a822c96330408c8d6 (commit)
      from  e16fedc1d2a8bd147050a4a5c10b98149ef113af (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=fd3718e407b64948bd790b095c200a41ee3b67e2
commit fd3718e407b64948bd790b095c200a41ee3b67e2
Merge: e16fedc a34015d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 6 07:37:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 6 07:37:11 2012 -0400

    Merge topic 'archive-exclude-file-flags' into next
    
    a34015d cmArchiveWrite: Clear fflags from archive entries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a34015d356c2a4084029e57a822c96330408c8d6
commit a34015d356c2a4084029e57a822c96330408c8d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 6 07:29:19 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 6 07:29:19 2012 -0400

    cmArchiveWrite: Clear fflags from archive entries
    
    When reading archive entries from disk strip any "fflags" entry headers
    that may have been loaded from the filesystem when libarchive is built
    with HAVE_STRUCT_STAT_ST_FLAGS (struct stat has 'st_flags').  The local
    filesystem flags are not useful for distribution.  Furthermore, GNU tar
    does not understand the "SCHILY.fflags" extended header used to store
    the flags in the archive.  Use the approach from commit e8558efa
    (cmArchiveWrite: Clear xattr and acl from entries, 2011-04-07) to remove
    the flags and avoid producing the non-portable extended header.

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index dc6b749..b410e44 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -240,6 +240,7 @@ bool cmArchiveWrite::AddFile(const char* file,
   // Clear acl and xattr fields not useful for distribution.
   archive_entry_acl_clear(e);
   archive_entry_xattr_clear(e);
+  archive_entry_set_fflags(e, 0, 0);
   if(archive_write_header(this->Archive, e) != ARCHIVE_OK)
     {
     this->Error = "archive_write_header: ";

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

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


hooks/post-receive
-- 
CMake