kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,679 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

10 Commits

Author SHA1 Message Date
Brad King e9bc469b2a Merge branch 'upstream-LibArchive' into update-libarchive 
Resolve conflicts in C code by taking their side.  Resolve conflicts in
CMake code by integrating the changes.
 2016-05-02 10:48:48 -04:00
Brad King 932848f420 Merge branch 'libarchive-upstream' into update-libarchive 
Resolve conflicts by integrating changes from both sides.
 2015-10-21 10:18:52 -04:00
Tim Kientzle 1f33b45d5d libarchive: Fix string concatentation in Windows mktemp implementation 
Port upstream LibArchive commit "compute string pointers after
concatenation" (2014-09-25) and commit "Move variables to top of
function for non-C99 compilers" (2014-11-15) to our CMake copy.
Otherwise we may compute a pointer to memory that is about to be freed
and then compute a bad size to give to CryptGenRandom.

Inspired-by: Tim Kientzle <kientzle@gmail.com>
 2015-04-09 14:08:43 -04:00
Daniel Pfeifer 8436d18115 CMake: Enable use of liblzma in libarchive (#14504) 
Build liblzma as part of CMake or find one on the system.  Modify our
port of libarchive to use the liblzma configured for use with CMake.
 2014-07-29 08:45:36 -04:00
Brad King b0a9807f39 libarchive: Update archive_util.c to use CMake zlib and bzip2 headers 2014-04-03 15:20:53 -04:00
Brad King 2f1978632b Merge branch 'libarchive-upstream' into update-libarchive 
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
 2014-04-03 15:02:49 -04:00
Brad King 102071f80c Merge branch 'libarchive-upstream' into update-libarchive 
Conflicts:
	Utilities/cmlibarchive/CMakeLists.txt
	Utilities/cmlibarchive/libarchive/archive.h
	Utilities/cmlibarchive/libarchive/archive_entry.h
	Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
	Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
	Utilities/cmlibarchive/libarchive/archive_windows.h
	Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
 2013-07-31 08:19:13 -04:00
Brad King 3e5a80f063 Merge branch 'libarchive-upstream' into update-libarchive 
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
 2011-12-20 11:54:25 -05:00
Brad King f6ac86d70e libarchive: Remove our copy to make room for new import 2011-12-20 11:47:27 -05:00
Bill Hoffman fb51d98562 Switch to using libarchive from libtar for cpack and cmake -E tar 
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers.  The cmake -E tar xf should be
able to handle all compression types now as well.
 2009-10-30 13:10:56 -04:00