[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-816-gedf57f3

[Brad King]

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  edf57f39262a38c17ba78501ebda5ac7eb23fe4e (commit)
       via  bae0e9c394efd50193f468f5bfd9e66744d8dbc3 (commit)
       via  000f68c3e015fffdab01f3e9768fa4d9f28f4df2 (commit)
      from  8ab1833c2ad99fa882b7aa85ac87ded78c580576 (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=edf57f39262a38c17ba78501ebda5ac7eb23fe4e
commit edf57f39262a38c17ba78501ebda5ac7eb23fe4e
Merge: 8ab1833 bae0e9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:35:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 14:35:17 2015 -0400

    Merge topic 'update-libarchive' into next
    
    bae0e9c3 libarchive: Use CommonCrypto on OS X only when available
    000f68c3 libarchive: Define O_CLOEXEC when missing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bae0e9c394efd50193f468f5bfd9e66744d8dbc3
commit bae0e9c394efd50193f468f5bfd9e66744d8dbc3
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: Wed Oct 21 14:31:34 2015 -0400

    libarchive: Use CommonCrypto on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..fb7307e 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,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 
 #endif
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 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..690dfcc 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 >= 1060
+#  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=000f68c3e015fffdab01f3e9768fa4d9f28f4df2
commit 000f68c3e015fffdab01f3e9768fa4d9f28f4df2
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: Wed Oct 21 14:14:54 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:
 Utilities/cmlibarchive/libarchive/archive_cryptor.c         |    4 ++--
 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h |    7 +++++++
 Utilities/cmlibarchive/libarchive/archive_hmac.c            |    2 +-
 Utilities/cmlibarchive/libarchive/archive_hmac_private.h    |    7 +++++++
 Utilities/cmlibarchive/libarchive/archive_random.c          |    4 ++++
 5 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake