[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-873-g41256e0
Brad King
brad.king at kitware.com
Thu Oct 22 10:18:43 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 41256e03c170a8395bc5cd59fbe55bec27f4e19d (commit)
via cdd8c25052c9812b4845113d7d4dab747cdfd4ea (commit)
via 2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1 (commit)
via ccdc5dd7f82fa96d2b466a1de438e7216229337f (commit)
via bedffcf4df1253dd86a6fa4ee9dbee3f78d71971 (commit)
via 85e0bb84f5eca2f77f070bce9f83024854096307 (commit)
via c70491d671b363b50a41d707d5fe82b02fe29424 (commit)
via 1bbba477c747581d318b4fe5a1f3ede36301eed7 (commit)
via 64bdf0b7469437b101bb0f1cf641956e0b5d1bb0 (commit)
via 8f837fc9a9fc335f87613e0c113050e1533d9efd (commit)
via 61a0251e824559b27e751ce7ff0be72b9bb8ec69 (commit)
from 6e0a8ca07576308cde48d6554d7e5bacfef1451b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41256e03c170a8395bc5cd59fbe55bec27f4e19d
commit 41256e03c170a8395bc5cd59fbe55bec27f4e19d
Merge: 6e0a8ca cdd8c25
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:18:42 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 10:18:42 2015 -0400
Merge topic 'update-libarchive' into next
cdd8c250 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
2bf5bb2d cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
ccdc5dd7 Update libarchive configuration within CMake
bedffcf4 libarchive: Update README-CMake.txt for new snapshot
85e0bb84 libarchive: Avoid using 'uint8_t' as bitfield type
c70491d6 libarchive: Avoid using name 'hz'
1bbba477 libarchive: Drop outdated CMake portability snprintf
64bdf0b7 libarchive: Avoid non-portable u_int8_t
8f837fc9 libarchive: Use CommonCrypto APIs on OS X only when available
61a0251e libarchive: Define O_CLOEXEC when missing
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd8c25052c9812b4845113d7d4dab747cdfd4ea
commit cdd8c25052c9812b4845113d7d4dab747cdfd4ea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:56:09 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:28 2015 -0400
cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2c5aa8a..b2827dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -29,6 +29,9 @@
# include "cmArchiveWrite.h"
# include "cmLocale.h"
# include <cm_libarchive.h>
+# ifndef __LA_INT64_T
+# define __LA_INT64_T la_int64_t
+# endif
#endif
#include <cmsys/FStream.hxx>
#include <cmsys/Terminal.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1
commit 2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:37:14 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:28 2015 -0400
cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..e62a2ed 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,10 @@
#include <cm_libarchive.h>
#include "cm_get_date.h"
+#ifndef __LA_SSIZE_T
+# define __LA_SSIZE_T la_ssize_t
+#endif
+
//----------------------------------------------------------------------------
static std::string cm_archive_error_string(struct archive* a)
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccdc5dd7f82fa96d2b466a1de438e7216229337f
commit ccdc5dd7f82fa96d2b466a1de438e7216229337f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:08:30 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400
Update libarchive configuration within CMake
Hard-code libarchive build options to the way CMake needs them. Set
them as internal cache entries so users do not see them when building
CMake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f68b..ebee14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,12 +372,14 @@ macro (CMAKE_BUILD_UTILITIES)
set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
+ set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
+ set(ENABLE_CNG OFF CACHE INTERNAL "Enable the use of CNG(Crypto Next Generation)")
add_subdirectory(Utilities/cmlibarchive)
CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bedffcf4df1253dd86a6fa4ee9dbee3f78d71971
commit bedffcf4df1253dd86a6fa4ee9dbee3f78d71971
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:21:39 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400
libarchive: Update README-CMake.txt for new snapshot
diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 8f3b29b..0a3e34a 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
Update libarchive from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
- git branch libarchive-upstream 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
Use a temporary directory to checkout the branch:
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) libarchive content in this directory. See
instructions shown by
- git log 37f225b7
+ git log 1a8c7bc2
for help extracting the content from the upstream svn repo. Then run
the following commands to commit the new version. Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
GIT_AUTHOR_NAME='LibArchive Upstream' \
GIT_AUTHOR_EMAIL='libarchive-discuss at googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85e0bb84f5eca2f77f070bce9f83024854096307
commit 85e0bb84f5eca2f77f070bce9f83024854096307
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:09:24 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400
libarchive: Avoid using 'uint8_t' as bitfield type
The IBM XL compiler does not like it. Use plain 'unsigned' instead.
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
index 87b3f55..e23e5e9 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
@@ -54,14 +54,14 @@ __FBSDID("$FreeBSD$");
struct private_data {
int compression_level;
- uint8_t header_written:1;
- uint8_t version_number:1;
- uint8_t block_independence:1;
- uint8_t block_checksum:1;
- uint8_t stream_size:1;
- uint8_t stream_checksum:1;
- uint8_t preset_dictionary:1;
- uint8_t block_maximum_size:3;
+ unsigned header_written:1;
+ unsigned version_number:1;
+ unsigned block_independence:1;
+ unsigned block_checksum:1;
+ unsigned stream_size:1;
+ unsigned stream_checksum:1;
+ unsigned preset_dictionary:1;
+ unsigned block_maximum_size:3;
#if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
int64_t total_in;
char *out;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c70491d671b363b50a41d707d5fe82b02fe29424
commit c70491d671b363b50a41d707d5fe82b02fe29424
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:58:25 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400
libarchive: Avoid using name 'hz'
AIX system headers define the symbol 'hz' as a preprocessor macro.
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 6bd15f6..57534f3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -418,9 +418,9 @@ deconst(const void *c)
}
static char*
-xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
+xmemmem(const char *hay, const size_t hz_, const char *ndl, const size_t nz)
{
- const char *const eoh = hay + hz;
+ const char *const eoh = hay + hz_;
const char *const eon = ndl + nz;
const char *hp;
const char *np;
@@ -435,7 +435,7 @@ xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
* that happens to begin with *NEEDLE) */
if (nz == 0UL) {
return deconst(hay);
- } else if ((hay = memchr(hay, *ndl, hz)) == NULL) {
+ } else if ((hay = memchr(hay, *ndl, hz_)) == NULL) {
/* trivial */
return NULL;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bbba477c747581d318b4fe5a1f3ede36301eed7
commit 1bbba477c747581d318b4fe5a1f3ede36301eed7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:45:07 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400
libarchive: Drop outdated CMake portability snprintf
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
index 8065ec3..62bf5e3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
@@ -67,10 +67,6 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
#include "archive_crc32.h"
#endif
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define snprintf _snprintf
-#endif
-
struct zip_entry {
struct archive_rb_node node;
struct zip_entry *next;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64bdf0b7469437b101bb0f1cf641956e0b5d1bb0
commit 64bdf0b7469437b101bb0f1cf641956e0b5d1bb0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:39:06 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400
libarchive: Avoid non-portable u_int8_t
Use uint8_t that we prepare in config.h instead.
diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 7891077..f4d4254 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -137,9 +137,9 @@ archive_random(void *buf, size_t nbytes)
#endif /* !__GNUC__ */
struct arc4_stream {
- u_int8_t i;
- u_int8_t j;
- u_int8_t s[256];
+ uint8_t i;
+ uint8_t j;
+ uint8_t s[256];
};
static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -159,7 +159,7 @@ static struct arc4_stream rs;
static pid_t arc4_stir_pid;
static int arc4_count;
-static inline u_int8_t arc4_getbyte(void);
+static inline uint8_t arc4_getbyte(void);
static void arc4_stir(void);
static inline void
@@ -177,7 +177,7 @@ static inline void
arc4_addrandom(u_char *dat, int datlen)
{
int n;
- u_int8_t si;
+ uint8_t si;
rs.i--;
for (n = 0; n < 256; n++) {
@@ -239,10 +239,10 @@ arc4_stir_if_needed(void)
}
}
-static inline u_int8_t
+static inline uint8_t
arc4_getbyte(void)
{
- u_int8_t si, sj;
+ uint8_t si, sj;
rs.i = (rs.i + 1);
si = rs.s[rs.i];
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f837fc9a9fc335f87613e0c113050e1533d9efd
commit 8f837fc9a9fc335f87613e0c113050e1533d9efd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:30:16 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400
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.
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..efd350d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -31,7 +31,7 @@
#include "archive.h"
#include "archive_cryptor_private.h"
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
static int
pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
@@ -114,7 +114,10 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
#endif
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+# define kCCAlgorithmAES kCCAlgorithmAES128
+# endif
static int
aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index b62ec0c..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -31,6 +31,13 @@
#define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
#ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
#include <CommonCrypto/CommonCryptor.h>
#include <CommonCrypto/CommonKeyDerivation.h>
#define AES_BLOCK_SIZE 16
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c
index 898853b..36e3e1c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
@@ -31,7 +31,7 @@
#include "archive.h"
#include "archive_hmac_private.h"
-#ifdef __APPLE__
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
static int
__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 6a8bbf2..a9fb8ec 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -31,6 +31,13 @@
#define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
#ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+# define ARCHIVE_HMAC_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
#include <CommonCrypto/CommonHMAC.h>
typedef CCHmacContext archive_hmac_sha1_ctx;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61a0251e824559b27e751ce7ff0be72b9bb8ec69
commit 61a0251e824559b27e751ce7ff0be72b9bb8ec69
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:14:54 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400
libarchive: Define O_CLOEXEC when missing
Do this in archive_random.c as we do in several other sources already.
diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 57c49d5..7891077 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -62,6 +62,10 @@ static void arc4random_buf(void *, size_t);
#include <wincrypt.h>
#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+
/*
* Random number generator function.
* This simply calls arc4random_buf function if the platform provides it.
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list