summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-04-12 18:43:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-04-12 18:43:15 (GMT)
commiteeb2e2eaecd27be16c647f2c7cfe406bf33d7fea (patch)
treec23033aa0763bd6987601329c8e44aed3db0a680 /Source
parent2adb7d36f249f1392293eb2d4f7b6ea51a8e882e (diff)
parente8558efa01151a94d0dc16f7327b77560b543ab9 (diff)
downloadCMake-eeb2e2eaecd27be16c647f2c7cfe406bf33d7fea.zip
CMake-eeb2e2eaecd27be16c647f2c7cfe406bf33d7fea.tar.gz
CMake-eeb2e2eaecd27be16c647f2c7cfe406bf33d7fea.tar.bz2
Merge topic 'libarchive-strip-xattr-issue-11958'
e8558ef cmArchiveWrite: Clear xattr and acl from entries (#11958)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmArchiveWrite.cxx3
1 files changed, 3 insertions, 0 deletions
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: ";