summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-1/+1
|\ | | | | | | | | c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
| * libarchive: Fix compilation on Tru64 with F_SETTIMESBrad King2014-06-091-1/+1
| | | | | | | | | | The parent commit left a typo in the conditional code path for Tru64. Add the missing '.'.
* | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-12/+14
|\ \ | |/ | | | | | | 478b1c8b libarchive: fix compilation on newer HP-UX versions
| * libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| | | | | | | | | | | | | | 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>
* | Merge topic 'update-libarchive'Brad King2014-04-1711-146/+197
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | libarchive: Use _snprintf on Windows, not snprintfBrad King2014-04-151-0/+4
| | |
| * | libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need itBrad King2014-04-151-6/+0
| | |
| * | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-151-4/+4
| | |
| * | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-159-139/+192
| | | | | | | | | | | | | | | Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.
| * | libarchive: Disable all whitespace checks in third-party codeBrad King2014-04-151-1/+1
| | |
| * | libarchive: Avoid left-shift overflow of signed integerBrad King2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)Mike Crowe2014-04-141-1/+5
|/ /
* | libarchive: Avoid using name 'u_long'Brad King2014-04-112-29/+28
| | | | | | | | | | The system headers on some platforms define a 'u_long' type so we cannot use the name. Spell out 'unsigned long' instead.
* | libarchive: Do not require includers to have windows.hBrad King2014-04-031-1/+1
| | | | | | | | | | | | 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>.
* | libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LLBrad King2014-04-031-16/+16
| |
* | libarchive: Update archive_util.c to use CMake zlib and bzip2 headersBrad King2014-04-031-2/+2
| |
* | libarchive: Drop options not present in reduced versionBrad King2014-04-031-6/+0
| | | | | | | | | | | | 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.
* | libarchive: Do not generate a pkg-config fileBrad King2014-04-031-3/+0
| | | | | | | | | | CMake does not install the headers or libraries so skip the .pc file too.
* | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-031-4/+4
| |
* | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-0354-1946/+4006
| | | | | | | | | | | | 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.
* | libarchive: Disable more whitespace checks in third-party codeBrad King2014-04-031-2/+1
| |
* | libarchive: Fix compliation with Open WatcomJiri Malak2014-03-093-3/+8
|/
* Fix wording of "the the" typos throughout textRuslan Baratov2014-01-031-1/+1
|
* libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffixBrad King2013-12-091-1/+1
| | | | | The macro maps to an implementation that works on older compilers when necessary.
* libarchive: Port upstream issue 320 second fixBrad King2013-12-091-20/+48
| | | | | | | Port upstream commit 6cf33c93 (Issue 320: Rewrite (again) to avoid the left shift that CLang dislikes so much, 2013-12-07) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* libarchive: Port upstream issue 320 fixBrad King2013-11-251-11/+7
| | | | | | | Port upstream commit 533e8fda (Rework the sign-extension to avoid left-shift of an explicit negative number, 2013-06-29) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* Drop use of configure_file IMMEDIATE optionDaniele E. Domenichelli2013-11-131-1/+1
| | | | | | Since commit 7d47c693 (Drop compatibility with CMake < 2.4, 2013-10-08) we no longer need to use the configure_file IMMEDIATE option to support compatibility modes less than 2.0.
* Clang: Add separate "AppleClang" compiler idBrad King2013-10-081-1/+1
| | | | | | | | | | | | Apple distributes their own Clang build with their own version numbers that differ from upstream Clang. Use the __apple_build_version__ symbol to identify the Apple Clang compiler and report the Apple Build Version as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules that simply include the upstream equivalents. Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own source and tests to account for AppleClang.
* Clean up install rules of CMake itself (#14371)Brad King2013-08-261-1/+1
| | | | | | | | | | | Ensure CMAKE_DATA_DIR, CMAKE_DOC_DIR, and CMAKE_MAN_DIR are always relative paths in CMake code, and set defaults accordingly. Use the install() command instead of install_files() and install_targets(). This is more modern and also avoids stripping of the first character from user-specified destinations. While at it, fix the default destinations reported in the bootstrap help.
* libarchive: Backport to CMake 2.8.2Brad King2013-07-313-223/+12
| | | | | | | Avoid requiring CMake 2.8.6 for CMakePushCheckState or CMake 2.8.8 for CMakeExpandImportedTargets. Drop the custom versions of CMake modules CheckCSource(Compiles|Runs) because we do not use the SAFESEH option anyway.
* libarchive: Remove build options not used by CMakeBrad King2013-07-311-122/+0
| | | | | Drop options POSIX_REGEX_LIB and ENABLE_SAFESEH that we do not want for the CMake build of libarchive.
* libarchive: Avoid struct init with variableBrad King2013-07-311-1/+3
| | | | | Compilers such as Borland and MIPSpro do not like struct initialization with variables. Initialize using assignment instead.
* libarchive: Silence API deprecation warningsBrad King2013-07-311-5/+2
| | | | CMake uses old libarchive APIs for now.
* libarchive: Include cm_zlib.h to get zlib used by CMakeBrad King2013-07-312-2/+2
| | | | | | Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to get zlib used by CMake, 2011-12-20) for new includes of zlib.h in updated libarchive.
* libarchive: Update README-CMake.txt for new snapshotBrad King2013-07-311-4/+4
|
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2013-07-31153-4135/+18543
| | | | | | | | | | | 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
* libarchive: Fix free() order to avoid accessing freed memoryÖmer Fadıl USTA2013-07-151-1/+1
| | | | | | | | | The archive_string_conv type sc variable already freed via free(sc) on the other hand in second line we are tyring to free its subset via free(sc->from_charset) this will cause a problem because we couldn't reach sc after first release. Reviewed-by: Igor Murzov <e-mail@date.by>
* Fix spelling and typos (non-binary)Andreas Mohr2013-05-071-1/+1
|
* Fix spelling and typos (affecting binary data / module messages)Andreas Mohr2013-05-072-4/+4
|
* libarchive: fixed undefined left shift with signed intsSean McBride2012-11-301-4/+32
| | | | | | | | caught by clang's -fsanitize=shift. A small unsigned int was promoted, according to C's regular promotion rules, to a signed int, it was then left shifted. This sometimes pushed a 1 into the sign bit, which is undefined behaviour. Fixed by using unsigned temporaries.
* Fix typo direcotry -> directory (and similar) [#13444]Rolf Eike Beer2012-07-302-2/+2
|
* libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)Brad King2012-06-071-0/+3
| | | | Suggested-by: Daniel R. Gomez <gomez@teragram.com>
* Require CMake 2.8.2 or higher to build CMakeBrad King2012-04-261-1/+1
| | | | | | | | | Update the requirement specified in the top-level CMakeLists.txt file. Drop the special-case minimum required version of 2.8.0 because the new minimum subsumes it. Revert commit 6c611c6b (libarchive: Restore CMake 2.6.3 as minimum version, 2012-01-05) since our requirement now subsumes libarchive's.
* libarchive: Avoid 'inline' keyword on XL C v6 (#13148)Brad King2012-04-191-0/+3
|
* libarchive: Avoid trailing , in enum for XL v6 (#13148)Jim Hague2012-04-191-5/+5
| | | | IBM xlc v6 cannot cope with a trailing ',' in enum definitions.
* libarchive: Workaround mbsnrtowcs assertion failure on old glibcBrad King2012-02-101-0/+5
| | | | | | | | | | | | The CMake TarTest fails with the error mbsnrtowcs.c:116: __mbsnrtowcs: Assertion `status == GCONV_OK || status != GCONV_EMPTY_INPUT || status == GCONV_ILLEGAL_INPUT || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT' failed. on very old glibc versions. Work around the problem by pretending that mbsnrtowcs does not exist. Libarchive will fall back to mbrtowc.
* Include bzlib.h consistently across CMake build (#10950)Brad King2012-01-136-6/+6
| | | | | | | | | Use the approach originally used in commit f91b3c1d (Add options to build with system utility libraries, 2006-10-19) for all other third-party libraries. Create a "cm_bzlib.h" header wrapper that robustly includes the header from the bzip2 library chosen for the CMake build (either builtin or system version). Include the header wrapper anywhere we need the API provided by <bzlib.h>.
* libarchive: Restore CMake 2.6.3 as minimum versionBrad King2012-01-051-1/+1
| | | | | | Upstream libarchive now requires CMake 2.8 to get the newer add_test functionality. Since we do not build libarchive's tests we do not need the requirement.
* libarchive: Update README-CMake.txt for new snapshotBrad King2012-01-051-4/+4
|
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2012-01-0553-842/+814
| | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c