mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
67,829 Commits 2 Branches 401 Tags
9d2aa76bb7cdb789551e2cc62cd48dbab1a5a4bb
Commit Graph

11 Commits

Author SHA1 Message Date
Brad King ddb72eb3e6 Merge branch 'upstream-LibArchive' into update-libarchive 
# By LibArchive Upstream
* upstream-LibArchive:
  LibArchive 2024-10-13 (b439d586)
 2024-11-18 14:17:22 -05:00
Brad King fe3f0d469f Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2024-09-13 (12ecf841)
 2024-09-17 13:03:03 -04:00
Brad King b3644e460f Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2022-02-09 (9147def1)
 2022-02-15 13:03:49 -05:00
Brad King 107df8e650 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-12-26 (227a4b97)
 2021-08-24 10:13:10 -04:00
Brad King 5d8b3aec0c Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-02-11 (3288ebb0)

Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks.  Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
 2020-02-13 12:57:52 -05:00
Brad King 6a4b1006f9 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2018-09-03 (5fe69dd0)
 2018-09-26 09:53:15 -04:00
Brad King a59a7ee956 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2017-02-19 (100ee75a)
 2017-02-20 08:04:00 -05:00
Brad King 6f23daea43 libarchive: Add support for building with OpenSSL 1.1 
OpenSSL 1.1 made some CTX structures opaque.  Port our code to use the
structures only through pointers via OpenSSL 1.1 APIs.  Use our adaption
layer to make this work with OpenSSL 1.0 and below.

Patch-by: Tomas Mraz <tmraz@redhat.com>
Patch-from: https://bugzilla.redhat.com/1383744
 2016-11-28 14:55:42 -05:00
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 8f837fc9a9 libarchive: Use CommonCrypto APIs on OS X only when available 
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
 2015-10-22 10:18:26 -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