| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
|
| |
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-25 (d6b1bb9f)
|
| |
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-19 (100ee75a)
|
| |
|
|
|
| |
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 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
|
| | |
|
| |
|
|
|
| |
Use the same pattern already used elsewhere in archive_read_disk_posix.c
for ST_NOATIME to use MNT_NOATIME only when defined.
|
| |
|
|
|
|
| |
Configure the result as definition HAVE_STRUCT_STATVFS_F_IOSIZE and use
the member only if it exists. At least one platform (IRIX) provides
struct statvfs without this member.
|
| |
|
|
|
| |
Use the same pattern already used elsewhere in archive_read_disk_posix.c
to use ST_NOATIME only when defined.
|
|
|
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|
