| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
We need to include `archive_platform.h` before any system headers in
order to ensure that `_WIN32_WINNT` is defined early enough.
|
|\
| |
| |
| |
| |
| | |
52f58267 Merge branch 'upstream-LibArchive' into update-libarchive
2b94d71d LibArchive 2016-06-19 (139d0576)
|
| |
| |
| |
| |
| | |
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
|
|/
|
|
|
|
|
|
|
|
| |
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
library, 2016-05-03) we accidentally dropped the include directory for
OpenSSL as well as the library. Without that, it works only
accidentally when CHECK_CRYPTO happens to choose the OpenSSL
implementation and add the include directory.
Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
|
|
|
|
|
|
|
|
| |
We already add the crypto library after the ssl library when using
OpenSSL. Do not add it to the list of libraries individually or we may
end up with the wrong order later. Further investigation will be needed
to see how this change can be reconciled with the upstream need for the
original line.
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
|
|
| |
We will now manage the libarchive source tree updates using
the `Utilities/Scripts/update-libarchive.bash` script. Drop
the README that covered the old method.
|
|
|
|
|
| |
The Debian package checker tool (lintian) detected several typos in
CMake.
|
| |
|
|
|
|
| |
CMake does not use threads so we do not need this in our libarchive.
|
| |
|
|
|
|
| |
The __builtin_bswap16 builtin is not available on Clang 2.1.
|
|
|
|
| |
The IBM XL compiler does not like it. Use plain 'unsigned' instead.
|
|
|
|
| |
AIX system headers define the symbol 'hz' as a preprocessor macro.
|
|
|
|
|
| |
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
|
|
|
|
| |
Use uint8_t that we prepare in config.h instead.
|
|
|
|
|
| |
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
|
|
|
|
| |
Do this in archive_random.c as we do in several other sources already.
|
|
|
|
|
| |
This version of the MS C runtime library forgets to export
_byteswap_ushort.
|
| |
|
|
|
|
| |
We no longer build CMake with the Borland compiler.
|
| |
|
|
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
|\
| |
| |
| |
| | |
1f33b45d 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>
|
|/ |
|
|
|
|
|
| |
The caller of this API already re-declares it as const, so update the
implementation accordingly.
|
|\
| |
| |
| |
| | |
29c3edb8 Avoid if() quoted auto-dereference
|
| |
| |
| |
| |
| |
| |
| | |
When testing CMAKE_<LANG>_COMPILER_ID values, do not explicitly
dereference or quote the variable. We want if() to auto-dereference the
variable and not its value. Also replace MATCHES with STREQUAL where
equivalent.
|
|/
|
|
|
| |
CMake 3.0 is the last release to require to be able to build with
Borland.
|
| |
|
| |
|
|
|
|
|
| |
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.
|
|\
| |
| |
| |
| | |
c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
|
| |
| |
| |
| |
| | |
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
|
|\ \
| |/
| |
| |
| | |
478b1c8b libarchive: fix compilation on newer HP-UX versions
|
| |
| |
| |
| |
| |
| |
| | |
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different
struct for the timing information.
Suggested-by: Eric Berge <ericmberge@gmail.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf
fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it
61a649d9 libarchive: Update README-CMake.txt for new snapshot
4533560c Merge branch 'libarchive-upstream' into update-libarchive
44d6b82f libarchive: Disable all whitespace checks in third-party code
37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced)
6ab7c326 libarchive: Avoid left-shift overflow of signed integer
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In libarchive/archive_write_set_format_zip.c there are two calls to
archive_le32enc whose second argument is of the form
archive_entry_mode(zip->entry) << 16
However, the return type from archive_entry_mode may be a signed integer
so the shift may overflow. Since the second argument of archive_le32enc
expects uint32_t anyway, simply cast to that prior to shifting.
|
|/ / |
|
| |
| |
| |
| |
| | |
The system headers on some platforms define a 'u_long' type so we cannot
use the name. Spell out 'unsigned long' instead.
|
| |
| |
| |
| |
| |
| | |
In archive_entry.h refer to "BY_HANDLE_FILE_INFORMATION *" using
"struct _BY_HANDLE_FILE_INFORMATION *" to avoid requiring the
includer to already have <windows.h>.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Drop ENABLE_TAR and ENABLE_CPIO related options because we do not build
these command-line tools. Drop ENABLE_TEST and ENABLE_COVERAGE options
because we do not build the tests.
|