Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi

3 files changed, 14 insertions, 12 deletions

diff --git a/ports/nmap/CONTROL b/ports/nmap/CONTROL
index 3ce86d4a9..1ed9ae5da 100644
--- a/ports/nmap/CONTROL
+++ b/ports/nmap/CONTROL
@@ -1,4 +1,4 @@
 Source: nmap
-Version: 7.70-1
+Version: 7.70-3
 Build-Depends: winpcap (windows), libpcap (!windows), lua, openssl, python2 (windows), libssh2, zlib, pcre
 Description: A library for scanning network ports.
diff --git a/ports/nmap/fix-msvc-prj.patch b/ports/nmap/fix-msvc-prj.patch
index cfb9d52ff..25893f137 100644
--- a/ports/nmap/fix-msvc-prj.patch
+++ b/ports/nmap/fix-msvc-prj.patch
@@ -807,7 +807,7 @@ index a3abbc6..d5e1977 100644
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
-+      <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
        <OutputFile>.\Debug\nmap.exe</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -853,7 +853,7 @@ index a3abbc6..d5e1977 100644
 +      <ShowIncludes>false</ShowIncludes>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
 +      <OutputFile>.\Debug\nmap.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua\x64\Debug;..\libpcre\x64\Debug;..\nsock\x64\Debug;..\nbase\x64\Debug;..\libdnet-stripped\x64\Debug;..\libnetutil\x64\Debug;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Debug;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -876,7 +876,7 @@ index a3abbc6..d5e1977 100644
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
-+      <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
        <OutputFile>.\Release/nmap.exe</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -912,7 +912,7 @@ index a3abbc6..d5e1977 100644
 +      <CompileAs>CompileAsCpp</CompileAs>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
 +      <OutputFile>.\Release/nmap.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua\x64\Release;..\libpcre;..\nsock\x64\Release;..\nbase\x64\Release;..\libdnet-stripped\x64\Release;..\libnetutil\x64\Release;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Release;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -1401,7 +1401,7 @@ index fc44dfa..e066b29 100644
 +      </ResourceOutputFileName>
 +    </ResourceCompile>
 +    <Link>
-+      <AdditionalDependencies>nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;nsock.lib;advapi32.lib;libeay32.lib;ssleay32.lib;liblua.lib</AdditionalDependencies>
++      <AdditionalDependencies>nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;nsock.lib;advapi32.lib;libcrypto.lib;libssl.lib;liblua.lib</AdditionalDependencies>
 +      <OutputFile>.\Debug\ncat.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblua;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -1449,7 +1449,7 @@ index fc44dfa..e066b29 100644
 +      <CompileAs>CompileAsCpp</CompileAs>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;advapi32.lib;libeay32.lib;ssleay32.lib</AdditionalDependencies>
++      <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;advapi32.lib;libcrypto.lib;libssl.lib</AdditionalDependencies>
 +      <OutputFile>.\Release/ncat.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -1496,7 +1496,7 @@ index fc44dfa..e066b29 100644
 +      <CompileAs>CompileAsCpp</CompileAs>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;advapi32.lib;libeay32.lib;ssleay32.lib;user32.lib;gdi32.lib</AdditionalDependencies>
++      <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;advapi32.lib;libssl.lib;libcrypto.lib;user32.lib;gdi32.lib</AdditionalDependencies>
 +      <OutputFile>.\Release/ncat.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -1654,7 +1654,7 @@ index 57bd4ed..fa7a604 100644
 +      <CompileAs>CompileAsCpp</CompileAs>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
 +      <OutputFile>.\Debug\nping.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -1701,7 +1701,7 @@ index 57bd4ed..fa7a604 100644
 +      <CompileAs>CompileAsCpp</CompileAs>
 +    </ClCompile>
 +    <Link>
-+      <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
++      <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies>
 +      <OutputFile>.\Release/nping.exe</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake
index 3554fb9ad..8a8d5f843 100644
--- a/ports/nmap/portfile.cmake
+++ b/ports/nmap/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 # nmap is a tools, so ignor POST_CHECK
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
@@ -59,11 +57,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
                      DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
     endif()
 else()
+    set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread")
     foreach(BUILD_TYPE rel dbg)
         file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
         file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
         # Since nmap makefile has strong relationshop with codes, copy codes to obj path
         vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
+
     endforeach()
     set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR})
     message(STATUS "Building Options: ${OPTIONS}")
@@ -71,6 +71,7 @@ else()
     if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL Release)
         message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
         set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/nmap-7.70)
+
         vcpkg_execute_required_process(
             COMMAND "./configure" ${OPTIONS}
             WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
@@ -91,6 +92,7 @@ else()
     if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL Debug)
         message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
         set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/nmap-7.70)
+
         vcpkg_execute_required_process(
             COMMAND "./configure" ${OPTIONS}
             WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}