[Pkg-cmake-commits] [cmake] 02/05: Merge tag 'upstream/3.6.2'

Felix Geyer fgeyer at moszumanska.debian.org
Sun Sep 11 18:17:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository cmake.

commit 6b0e8dc9bde272b73554c5f82283c79e5f907faa
Merge: 7f85701 dc0a468
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Sep 11 17:22:42 2016 +0200

    Merge tag 'upstream/3.6.2'
    
    Upstream version 3.6.2
    
    # gpg: Signature made So 11 Sep 2016 17:22:40 CEST
    # gpg:                using RSA key 0xFE22C6FD83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>" [ultimate]
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>" [ultimate]
    # Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45

 Modules/Compiler/CrayPrgEnv.cmake                  |    2 +
 Modules/Compiler/Intel-C.cmake                     |    8 +-
 Modules/FindHDF5.cmake                             |   72 +-
 Modules/FindProtobuf.cmake                         |    8 +
 Modules/GetPrerequisites.cmake                     |    8 +-
 Modules/Platform/CrayLinuxEnvironment.cmake        |   16 +-
 Source/CMakeVersion.cmake                          |    2 +-
 Source/cmDependsFortran.cxx                        |    6 +
 Source/cmVisualStudio10TargetGenerator.cxx         |   22 +-
 Utilities/Scripts/update-curl.bash                 |   38 +
 Utilities/cmcurl/CMake/CurlTests.c                 |    2 +-
 Utilities/cmcurl/CMake/OtherTests.cmake            |    2 +-
 Utilities/cmcurl/CMakeLists.txt                    |  182 +--
 Utilities/cmcurl/COPYING                           |    3 +-
 Utilities/cmcurl/README-CMake.txt                  |   66 -
 Utilities/cmcurl/include/curl/curl.h               |  243 ++--
 Utilities/cmcurl/include/curl/curlbuild.h.cmake    |    4 +-
 Utilities/cmcurl/include/curl/curlrules.h          |    4 +-
 Utilities/cmcurl/include/curl/curlver.h            |   14 +-
 Utilities/cmcurl/include/curl/easy.h               |    2 +-
 Utilities/cmcurl/include/curl/mprintf.h            |   30 +-
 Utilities/cmcurl/include/curl/multi.h              |    8 +-
 Utilities/cmcurl/include/curl/stdcheaders.h        |    2 +-
 Utilities/cmcurl/include/curl/typecheck-gcc.h      |  124 +-
 Utilities/cmcurl/lib/Makefile.inc                  |   41 +-
 Utilities/cmcurl/lib/amigaos.c                     |    6 +-
 Utilities/cmcurl/lib/amigaos.h                     |    2 +-
 Utilities/cmcurl/lib/arpa_telnet.h                 |    2 +-
 Utilities/cmcurl/lib/asyn-ares.c                   |   24 +-
 Utilities/cmcurl/lib/asyn-thread.c                 |   31 +-
 Utilities/cmcurl/lib/asyn.h                        |    4 +-
 Utilities/cmcurl/lib/base64.c                      |   44 +-
 Utilities/cmcurl/lib/conncache.c                   |   24 +-
 Utilities/cmcurl/lib/conncache.h                   |    2 +-
 Utilities/cmcurl/lib/connect.c                     |  133 +-
 Utilities/cmcurl/lib/connect.h                     |   14 +-
 Utilities/cmcurl/lib/content_encoding.c            |    6 +-
 Utilities/cmcurl/lib/content_encoding.h            |    2 +-
 Utilities/cmcurl/lib/cookie.c                      |  122 +-
 Utilities/cmcurl/lib/cookie.h                      |   14 +-
 Utilities/cmcurl/lib/curl_addrinfo.c               |   44 +-
 Utilities/cmcurl/lib/curl_addrinfo.h               |   15 +-
 Utilities/cmcurl/lib/curl_base64.h                 |    6 +-
 Utilities/cmcurl/lib/curl_config.h.cmake           |   27 +
 Utilities/cmcurl/lib/curl_des.c                    |    6 +-
 Utilities/cmcurl/lib/curl_des.h                    |    6 +-
 Utilities/cmcurl/lib/curl_endian.c                 |    2 +-
 Utilities/cmcurl/lib/curl_endian.h                 |    2 +-
 Utilities/cmcurl/lib/curl_fnmatch.c                |    6 +-
 Utilities/cmcurl/lib/curl_fnmatch.h                |    2 +-
 Utilities/cmcurl/lib/curl_gethostname.c            |    2 +-
 Utilities/cmcurl/lib/curl_gethostname.h            |    2 +-
 Utilities/cmcurl/lib/curl_gssapi.c                 |   65 +-
 Utilities/cmcurl/lib/curl_gssapi.h                 |    8 +-
 Utilities/cmcurl/lib/curl_hmac.h                   |    2 +-
 Utilities/cmcurl/lib/curl_ldap.h                   |    2 +-
 Utilities/cmcurl/lib/curl_md4.h                    |    2 +-
 Utilities/cmcurl/lib/curl_md5.h                    |    2 +-
 Utilities/cmcurl/lib/curl_memory.h                 |   19 +-
 Utilities/cmcurl/lib/curl_memrchr.c                |    7 +-
 Utilities/cmcurl/lib/curl_memrchr.h                |    2 +-
 Utilities/cmcurl/lib/curl_multibyte.c              |    4 +-
 Utilities/cmcurl/lib/curl_multibyte.h              |    2 +-
 Utilities/cmcurl/lib/curl_ntlm_core.c              |   34 +-
 Utilities/cmcurl/lib/curl_ntlm_core.h              |    6 +-
 Utilities/cmcurl/lib/curl_ntlm_wb.c                |   15 +-
 Utilities/cmcurl/lib/curl_ntlm_wb.h                |    2 +-
 Utilities/cmcurl/lib/curl_printf.h                 |    2 +-
 Utilities/cmcurl/lib/curl_rtmp.c                   |    4 +-
 Utilities/cmcurl/lib/curl_rtmp.h                   |    2 +-
 Utilities/cmcurl/lib/curl_sasl.c                   | 1332 ++----------------
 Utilities/cmcurl/lib/curl_sasl.h                   |  143 +-
 Utilities/cmcurl/lib/curl_sasl_sspi.c              | 1281 -----------------
 Utilities/cmcurl/lib/curl_sec.h                    |    2 +-
 Utilities/cmcurl/lib/curl_setup.h                  |   49 +-
 Utilities/cmcurl/lib/curl_setup_once.h             |    2 +-
 Utilities/cmcurl/lib/curl_sspi.c                   |   52 +-
 Utilities/cmcurl/lib/curl_sspi.h                   |    6 +-
 Utilities/cmcurl/lib/curl_threads.c                |    6 +-
 Utilities/cmcurl/lib/curl_threads.h                |    2 +-
 Utilities/cmcurl/lib/curlx.h                       |    2 +-
 Utilities/cmcurl/lib/dict.c                        |    6 +-
 Utilities/cmcurl/lib/dict.h                        |    2 +-
 Utilities/cmcurl/lib/dotdot.c                      |   17 +-
 Utilities/cmcurl/lib/dotdot.h                      |    2 +-
 Utilities/cmcurl/lib/easy.c                        |  181 +--
 Utilities/cmcurl/lib/easyif.h                      |    6 +-
 Utilities/cmcurl/lib/escape.c                      |   24 +-
 Utilities/cmcurl/lib/escape.h                      |    4 +-
 Utilities/cmcurl/lib/file.c                        |   93 +-
 Utilities/cmcurl/lib/file.h                        |    2 +-
 Utilities/cmcurl/lib/fileinfo.c                    |    2 +-
 Utilities/cmcurl/lib/fileinfo.h                    |    2 +-
 Utilities/cmcurl/lib/formdata.c                    |  121 +-
 Utilities/cmcurl/lib/formdata.h                    |   12 +-
 Utilities/cmcurl/lib/ftp.c                         |  181 +--
 Utilities/cmcurl/lib/ftp.h                         |    6 +-
 Utilities/cmcurl/lib/ftplistparser.c               |   36 +-
 Utilities/cmcurl/lib/ftplistparser.h               |    2 +-
 Utilities/cmcurl/lib/getenv.c                      |    2 +-
 Utilities/cmcurl/lib/getinfo.c                     |  128 +-
 Utilities/cmcurl/lib/getinfo.h                     |    6 +-
 Utilities/cmcurl/lib/gopher.c                      |   12 +-
 Utilities/cmcurl/lib/gopher.h                      |    2 +-
 Utilities/cmcurl/lib/hash.c                        |   30 +-
 Utilities/cmcurl/lib/hash.h                        |    2 +-
 Utilities/cmcurl/lib/hmac.c                        |    7 +-
 Utilities/cmcurl/lib/hostasyn.c                    |    4 +-
 Utilities/cmcurl/lib/hostcheck.c                   |    4 +-
 Utilities/cmcurl/lib/hostcheck.h                   |    2 +-
 Utilities/cmcurl/lib/hostip.c                      |   29 +-
 Utilities/cmcurl/lib/hostip.h                      |   24 +-
 Utilities/cmcurl/lib/hostip4.c                     |    6 +-
 Utilities/cmcurl/lib/hostip6.c                     |   31 +-
 Utilities/cmcurl/lib/hostsyn.c                     |   10 +-
 Utilities/cmcurl/lib/http.c                        |  361 ++---
 Utilities/cmcurl/lib/http.h                        |   12 +-
 Utilities/cmcurl/lib/http2.c                       |  800 ++++++++---
 Utilities/cmcurl/lib/http2.h                       |   10 +-
 Utilities/cmcurl/lib/http_chunks.c                 |    8 +-
 Utilities/cmcurl/lib/http_chunks.h                 |    2 +-
 Utilities/cmcurl/lib/http_digest.c                 |   25 +-
 Utilities/cmcurl/lib/http_digest.h                 |    4 +-
 Utilities/cmcurl/lib/http_negotiate.c              |  193 +--
 Utilities/cmcurl/lib/http_negotiate.h              |    8 +-
 Utilities/cmcurl/lib/http_negotiate_sspi.c         |  300 ----
 Utilities/cmcurl/lib/{curl_ntlm.c => http_ntlm.c}  |   27 +-
 Utilities/cmcurl/lib/{curl_ntlm.h => http_ntlm.h}  |    2 +-
 Utilities/cmcurl/lib/http_proxy.c                  |   45 +-
 Utilities/cmcurl/lib/http_proxy.h                  |    2 +-
 Utilities/cmcurl/lib/idn_win32.c                   |   63 +-
 Utilities/cmcurl/lib/if2ip.c                       |   19 +-
 Utilities/cmcurl/lib/if2ip.h                       |    2 +-
 Utilities/cmcurl/lib/imap.c                        |  148 +-
 Utilities/cmcurl/lib/imap.h                        |    6 +-
 Utilities/cmcurl/lib/inet_ntop.c                   |   11 +-
 Utilities/cmcurl/lib/inet_ntop.h                   |    2 +-
 Utilities/cmcurl/lib/inet_pton.c                   |    8 +-
 Utilities/cmcurl/lib/inet_pton.h                   |    2 +-
 Utilities/cmcurl/lib/krb5.c                        |   28 +-
 Utilities/cmcurl/lib/ldap.c                        |   13 +-
 Utilities/cmcurl/lib/libcurl.rc                    |    6 +-
 Utilities/cmcurl/lib/llist.c                       |    6 +-
 Utilities/cmcurl/lib/llist.h                       |    2 +-
 Utilities/cmcurl/lib/md5.c                         |    6 +-
 Utilities/cmcurl/lib/memdebug.c                    |   15 +-
 Utilities/cmcurl/lib/memdebug.h                    |   17 +-
 Utilities/cmcurl/lib/mprintf.c                     |  184 +--
 Utilities/cmcurl/lib/multi.c                       |  709 +++++++---
 Utilities/cmcurl/lib/multihandle.h                 |   10 +-
 Utilities/cmcurl/lib/multiif.h                     |   14 +-
 Utilities/cmcurl/lib/netrc.c                       |    8 +-
 Utilities/cmcurl/lib/netrc.h                       |    2 +-
 Utilities/cmcurl/lib/non-ascii.c                   |   24 +-
 Utilities/cmcurl/lib/non-ascii.h                   |   18 +-
 Utilities/cmcurl/lib/nonblock.c                    |    6 +-
 Utilities/cmcurl/lib/nonblock.h                    |    2 +-
 Utilities/cmcurl/lib/nwlib.c                       |   50 +-
 Utilities/cmcurl/lib/nwos.c                        |   12 +-
 Utilities/cmcurl/lib/openldap.c                    |  109 +-
 Utilities/cmcurl/lib/parsedate.c                   |    2 +-
 Utilities/cmcurl/lib/parsedate.h                   |    2 +-
 Utilities/cmcurl/lib/pingpong.c                    |   18 +-
 Utilities/cmcurl/lib/pingpong.h                    |    2 +-
 Utilities/cmcurl/lib/pipeline.c                    |   46 +-
 Utilities/cmcurl/lib/pipeline.h                    |   20 +-
 Utilities/cmcurl/lib/pop3.c                        |   74 +-
 Utilities/cmcurl/lib/pop3.h                        |    6 +-
 Utilities/cmcurl/lib/progress.c                    |   20 +-
 Utilities/cmcurl/lib/progress.h                    |   16 +-
 Utilities/cmcurl/lib/rawstr.c                      |   12 +-
 Utilities/cmcurl/lib/rawstr.h                      |    2 +-
 Utilities/cmcurl/lib/rtsp.c                        |   48 +-
 Utilities/cmcurl/lib/rtsp.h                        |    2 +-
 Utilities/cmcurl/lib/security.c                    |    2 +-
 Utilities/cmcurl/lib/select.c                      |   22 +-
 Utilities/cmcurl/lib/select.h                      |    2 +-
 Utilities/cmcurl/lib/sendf.c                       |  154 ++-
 Utilities/cmcurl/lib/sendf.h                       |    8 +-
 Utilities/cmcurl/lib/setup-os400.h                 |    2 +-
 Utilities/cmcurl/lib/setup-vms.h                   |    2 +-
 Utilities/cmcurl/lib/share.c                       |   23 +-
 Utilities/cmcurl/lib/share.h                       |    6 +-
 Utilities/cmcurl/lib/sigpipe.h                     |    6 +-
 Utilities/cmcurl/lib/slist.c                       |    6 +-
 Utilities/cmcurl/lib/slist.h                       |    2 +-
 Utilities/cmcurl/lib/smb.c                         |   13 +-
 Utilities/cmcurl/lib/smb.h                         |    2 +-
 Utilities/cmcurl/lib/smtp.c                        |   85 +-
 Utilities/cmcurl/lib/smtp.h                        |    6 +-
 Utilities/cmcurl/lib/sockaddr.h                    |    2 +-
 Utilities/cmcurl/lib/socks.c                       |   44 +-
 Utilities/cmcurl/lib/socks.h                       |    2 +-
 Utilities/cmcurl/lib/socks_gssapi.c                |   14 +-
 Utilities/cmcurl/lib/socks_sspi.c                  |   17 +-
 Utilities/cmcurl/lib/speedcheck.c                  |    6 +-
 Utilities/cmcurl/lib/speedcheck.h                  |    6 +-
 Utilities/cmcurl/lib/splay.c                       |    2 +-
 Utilities/cmcurl/lib/splay.h                       |    6 +-
 Utilities/cmcurl/lib/ssh.c                         |  173 ++-
 Utilities/cmcurl/lib/ssh.h                         |    7 +-
 Utilities/cmcurl/lib/strdup.c                      |    8 +-
 Utilities/cmcurl/lib/strdup.h                      |    2 +-
 Utilities/cmcurl/lib/strequal.c                    |    2 +-
 Utilities/cmcurl/lib/strequal.h                    |    2 +-
 Utilities/cmcurl/lib/strerror.c                    |   20 +-
 Utilities/cmcurl/lib/strerror.h                    |    2 +-
 Utilities/cmcurl/lib/strtok.c                      |    2 +-
 Utilities/cmcurl/lib/strtok.h                      |    2 +-
 Utilities/cmcurl/lib/strtoofft.c                   |    2 +-
 Utilities/cmcurl/lib/strtoofft.h                   |    2 +-
 Utilities/cmcurl/lib/system_win32.c                |  294 ++++
 Utilities/cmcurl/lib/system_win32.h                |   61 +
 Utilities/cmcurl/lib/telnet.c                      |   46 +-
 Utilities/cmcurl/lib/telnet.h                      |    2 +-
 Utilities/cmcurl/lib/tftp.c                        |   99 +-
 Utilities/cmcurl/lib/tftp.h                        |    2 +-
 Utilities/cmcurl/lib/timeval.c                     |   14 +-
 Utilities/cmcurl/lib/timeval.h                     |    2 +-
 Utilities/cmcurl/lib/transfer.c                    |  219 ++-
 Utilities/cmcurl/lib/transfer.h                    |   17 +-
 Utilities/cmcurl/lib/url.c                         | 1449 ++++++++++++--------
 Utilities/cmcurl/lib/url.h                         |   40 +-
 Utilities/cmcurl/lib/urldata.h                     |  187 ++-
 Utilities/cmcurl/lib/vauth/cleartext.c             |  157 +++
 Utilities/cmcurl/lib/vauth/cram.c                  |  138 ++
 Utilities/cmcurl/lib/vauth/digest.c                |  883 ++++++++++++
 .../cmcurl/lib/{hostcheck.h => vauth/digest.h}     |   27 +-
 Utilities/cmcurl/lib/vauth/digest_sspi.c           |  533 +++++++
 .../{curl_sasl_gssapi.c => vauth/krb5_gssapi.c}    |  175 ++-
 Utilities/cmcurl/lib/vauth/krb5_sspi.c             |  496 +++++++
 .../cmcurl/lib/{curl_ntlm_msgs.c => vauth/ntlm.c}  |   65 +-
 .../cmcurl/lib/{curl_ntlm_msgs.h => vauth/ntlm.h}  |   10 +-
 Utilities/cmcurl/lib/vauth/ntlm_sspi.c             |  314 +++++
 Utilities/cmcurl/lib/vauth/oauth2.c                |   86 ++
 Utilities/cmcurl/lib/vauth/spnego_gssapi.c         |  260 ++++
 Utilities/cmcurl/lib/vauth/spnego_sspi.c           |  297 ++++
 Utilities/cmcurl/lib/vauth/vauth.c                 |  106 ++
 Utilities/cmcurl/lib/vauth/vauth.h                 |  189 +++
 Utilities/cmcurl/lib/version.c                     |   40 +-
 Utilities/cmcurl/lib/vtls/axtls.c                  |   58 +-
 Utilities/cmcurl/lib/vtls/axtls.h                  |    4 +-
 Utilities/cmcurl/lib/vtls/cyassl.c                 |  203 ++-
 Utilities/cmcurl/lib/vtls/cyassl.h                 |   23 +-
 Utilities/cmcurl/lib/vtls/darwinssl.c              |  111 +-
 Utilities/cmcurl/lib/vtls/darwinssl.h              |    2 +-
 Utilities/cmcurl/lib/vtls/gskit.c                  |   36 +-
 Utilities/cmcurl/lib/vtls/gskit.h                  |    2 +-
 Utilities/cmcurl/lib/vtls/gtls.c                   |  116 +-
 Utilities/cmcurl/lib/vtls/gtls.h                   |    9 +-
 Utilities/cmcurl/lib/vtls/mbedtls.c                |  871 ++++++++++++
 Utilities/cmcurl/lib/vtls/mbedtls.h                |   80 ++
 Utilities/cmcurl/lib/vtls/nss.c                    |  121 +-
 Utilities/cmcurl/lib/vtls/nssg.h                   |   13 +-
 Utilities/cmcurl/lib/vtls/openssl.c                |  998 +++++++-------
 Utilities/cmcurl/lib/vtls/openssl.h                |   21 +-
 Utilities/cmcurl/lib/vtls/polarssl.c               |  191 ++-
 Utilities/cmcurl/lib/vtls/polarssl.h               |   18 +-
 Utilities/cmcurl/lib/vtls/polarssl_threadlock.c    |   16 +-
 Utilities/cmcurl/lib/vtls/polarssl_threadlock.h    |   22 +-
 Utilities/cmcurl/lib/vtls/schannel.c               |  297 ++--
 Utilities/cmcurl/lib/vtls/schannel.h               |    5 +-
 Utilities/cmcurl/lib/vtls/vtls.c                   |  168 ++-
 Utilities/cmcurl/lib/vtls/vtls.h                   |   73 +-
 Utilities/cmcurl/lib/warnless.c                    |   61 +-
 Utilities/cmcurl/lib/warnless.h                    |   10 +-
 Utilities/cmcurl/lib/wildcard.c                    |    6 +-
 Utilities/cmcurl/lib/wildcard.h                    |    4 +-
 Utilities/cmcurl/lib/x509asn1.c                    |   31 +-
 Utilities/cmcurl/lib/x509asn1.h                    |    6 +-
 270 files changed, 12013 insertions(+), 7520 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git



More information about the Pkg-cmake-commits mailing list