| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-19 (100ee75a)
|
|
|
|
|
|
|
| |
Add private forwarding headers for `openssl/{evp,hmac}.h` to give us a
central place to add adaptation code to work across multiple
incompatible OpenSSL versions. Provide compatibility implementations of
some OpenSSL 1.1 APIs when using older OpenSSL versions.
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
|
|
|
|
| |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
CMake needs only a single static libarchive library and not a shared
one. Call it cmlibarchive to avoid confusion.
|
|
|
|
|
|
| |
Remove add_subdirectory() calls for directories not included in the
reduced libarchive snapshot. Remove options that configure settings in
the missing directories.
|
|
|
|
|
| |
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|
| |
|
| |
|
|
|
|
| |
warnings
|
|
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.
|