[Cmake-commits] CMake branch, master, updated. v3.13.3-1092-ga5f7652

[Kitware Robot]

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, master has been updated
       via  a5f7652fb9325c285d2e8a76404120b83fab79ea (commit)
       via  29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e (commit)
       via  646eedcfcb73548b723603626ac276f739ba5d1d (commit)
       via  8f56f22b84b52238dca066cc431c6e82f5380fe4 (commit)
      from  0d8d7a6896c5065c4baa1c4f5489e2424535ce6a (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=a5f7652fb9325c285d2e8a76404120b83fab79ea
commit a5f7652fb9325c285d2e8a76404120b83fab79ea
Merge: 29fbd3c 646eedc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 25 12:50:31 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 25 07:51:25 2019 -0500

    Merge topic 'revert-file-alt-httpauth'
    
    646eedcfcb Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2858


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e
commit 29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e
Merge: 0d8d7a6 8f56f22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 25 12:50:16 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 25 07:50:23 2019 -0500

    Merge topic 'aarch64-no-std-move-function'
    
    8f56f22b84 cmListCommand: Avoid std::function move constructor on aarch64
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2857


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=646eedcfcb73548b723603626ac276f739ba5d1d
commit 646eedcfcb73548b723603626ac276f739ba5d1d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 24 14:13:33 2019 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 24 14:14:40 2019 -0500

    Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"
    
    Revert commit 31301b46a7 (file: Allow DOWNLOAD/UPLOAD using alternate
    authentication methods, 2018-08-28, v3.13.0-rc1~155^2).  It regressed
    support for password-protected redirects.
    
    Fixes: #18691

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 1f76703..5d34b71 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2906,10 +2906,6 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
   ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   check_curl_result(res, "DOWNLOAD cannot set url: ");
 
-  // enable auth
-  res = ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-  check_curl_result(res, "DOWNLOAD cannot set httpauth: ");
-
   // enable HTTP ERROR parsing
   res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
   check_curl_result(res, "DOWNLOAD cannot set http failure option: ");
@@ -3209,10 +3205,6 @@ bool cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
   res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   check_curl_result(res, "UPLOAD cannot set url: ");
 
-  // enable auth
-  res = ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-  check_curl_result(res, "UPLOAD cannot set httpauth: ");
-
   res =
     ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToMemoryCallback);
   check_curl_result(res, "UPLOAD cannot set write function: ");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f56f22b84b52238dca066cc431c6e82f5380fe4
commit 8f56f22b84b52238dca066cc431c6e82f5380fe4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 24 14:01:17 2019 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 24 14:07:05 2019 -0500

    cmListCommand: Avoid std::function move constructor on aarch64
    
    Since commit 5a0784ddea (clang-tidy: Pass by value, 2019-01-21), some of
    the `RunCMake.{list,PositionIndependentCode}` cases have crashed on an
    aarch64 build with GCC 6.  Avoiding use of the `std::function` move
    constructor avoids the crash.  Use a strict preprocessor condition to
    use this workaround only where needed.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 05b22cf..b24c5ba 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -666,7 +666,12 @@ bool cmListCommand::HandleTransformCommand(
     ActionDescriptor(std::string name, int arity, transform_type transform)
       : Name(std::move(name))
       , Arity(arity)
+#if defined(__GNUC__) && __GNUC__ == 6 && defined(__aarch64__)
+      // std::function move constructor miscompiles on this architecture
+      , Transform(transform)
+#else
       , Transform(std::move(transform))
+#endif
     {
     }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFileCommand.cxx | 8 --------
 Source/cmListCommand.cxx | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake