[libbson/mongo-c-driver] Update to 1.16.1 (#10010)

* [libbson/mongo-c-driver] Update to 1.16.1

* [libbson] Refix static build

* [mongo-c-driver] Re-fix dependency libbson and dynamic build

* [mongo-c-driver] Fix generate cmake file

* [mongo-cxx-driver] Fix find libbson

* [mongo-c-driver] Fix generate cmake file when building static

* [mongo-cxx-driver] Fix dependency mongo-c-driver

* update version info

* [mongo-c-driver] Update patch

* [mongo-c-driver] Re-generate patch.

* [mongo-c-driver] Re-generate patch

1 files changed, 84 insertions, 45 deletions

diff --git a/ports/libbson/fix-uwp.patch b/ports/libbson/fix-uwp.patch
index 8a793aece..9342e81bd 100644
--- a/ports/libbson/fix-uwp.patch
+++ b/ports/libbson/fix-uwp.patch
@@ -1,6 +1,8 @@
+diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
+index 7c479d8..d383424 100644
 --- a/src/libbson/CMakeLists.txt
 +++ b/src/libbson/CMakeLists.txt
-@@ -217,6 +217,9 @@ set (HEADERS_FORWARDING
+@@ -226,6 +226,9 @@ set (HEADERS_FORWARDING
     ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h
  )
  
@@ -9,8 +11,8 @@
 +if (NOT ENABLE_STATIC MATCHES "ON|AUTO")
  add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
  set (CMAKE_CXX_VISIBILITY_PRESET hidden)
- set_target_properties (bson_shared PROPERTIES COMPILE_DEFINITIONS "BSON_COMPILATION;JSONSL_PARSE_NAN")
-@@ -258,16 +261,21 @@ if (WIN32)
+ target_compile_definitions (bson_shared PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN)
+@@ -268,9 +271,13 @@ if (WIN32)
     # must be handled specially since we can't resolve them
     set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32)
  endif ()
@@ -19,12 +21,12 @@
  if (ENABLE_STATIC MATCHES "ON|AUTO")
     add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
 +   set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-    set_target_properties (bson_static PROPERTIES COMPILE_DEFINITIONS "BSON_COMPILATION;BSON_STATIC;JSONSL_PARSE_NAN")
-    set_target_properties (bson_static PROPERTIES VERSION 0.0.0)
-    set_target_properties (bson_static PROPERTIES OUTPUT_NAME "bson-static-${BSON_API_VERSION}")
 +   set(THREADS_PREFER_PTHREAD_FLAG 1)
-+   find_package (Threads REQUIRED)
-    target_link_libraries (bson_static Threads::Threads)
++   find_package(Threads REQUIRED)
+    target_compile_definitions (bson_static
+       PUBLIC BSON_STATIC
+       PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN
+@@ -284,6 +291,7 @@ if (ENABLE_STATIC MATCHES "ON|AUTO")
     if (RT_LIBRARY)
        target_link_libraries (bson_static ${RT_LIBRARY})
     endif ()
@@ -32,7 +34,7 @@
     if (M_LIBRARY)
        target_link_libraries (bson_static ${M_LIBRARY})
     endif ()
-@@ -282,7 +290,7 @@ function (add_example bin src)
+@@ -298,7 +306,7 @@ function (add_example bin src)
     add_executable (${bin} ${BSON_EXAMPLE_SOURCES})
  
     # Link against the shared lib like normal apps
@@ -41,73 +43,106 @@
  
     set (EXAMPLES ${EXAMPLES} ${bin})
  endfunction ()
-@@ -304,6 +312,7 @@ set (BSON_HEADER_INSTALL_DIR
-    "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}"
+@@ -322,7 +330,7 @@ set (BSON_HEADER_INSTALL_DIR
  )
  
-+if (NOT ENABLE_STATIC MATCHES "ON|AUTO")
- install (
-    TARGETS bson_shared ${EXAMPLES}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -311,6 +320,7 @@ install (
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    FRAMEWORK DESTINATION ${CMAKE_INSTALL_BINDIR} 
- )
-+endif ()
  if (ENABLE_STATIC MATCHES "ON|AUTO")
-    install (
-       TARGETS bson_static ${EXAMPLES}
+-   set (TARGETS_TO_INSTALL bson_shared bson_static)
++   set (TARGETS_TO_INSTALL bson_static)
+ else ()
+    set (TARGETS_TO_INSTALL bson_shared)
+ endif ()
+@@ -337,6 +345,7 @@ install (
+ )
+ 
+ if (MSVC)
++   if (NOT ENABLE_STATIC MATCHES "ON|AUTO")
+    add_custom_command (
+       TARGET bson_shared
+       POST_BUILD
+@@ -348,6 +357,7 @@ if (MSVC)
+       FILES $<TARGET_LINKER_FILE_DIR:bson_shared>/lib$<TARGET_LINKER_FILE_NAME:bson_shared>
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
++   else()
+    if (TARGET bson_static)
+       add_custom_command (
+          TARGET bson_static
+@@ -361,6 +371,7 @@ if (MSVC)
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       )
+    endif ()
++   endif()
+ endif ()
+ 
+ install (
+diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
+index 0f9e50c..85eb429 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -609,6 +609,7 @@ if (WIN32)
+@@ -694,6 +694,7 @@ if (WIN32)
     set (LIBRARIES ${LIBRARIES} ws2_32)
  endif ()
  
 +if (NOT MONGOC_ENABLE_STATIC)
  add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
  set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
- target_link_libraries (mongoc_shared ${LIBRARIES} ${BSON_LIBRARIES})
-@@ -617,6 +618,7 @@ target_compile_definitions (mongoc_shared PUBLIC MONGOC_COMPILATION ${BSON_DEFIN
+ target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
+@@ -704,6 +705,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION)
  
  set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
- set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "mongoc-${MONGOC_API_VERSION}" PREFIX "lib")
+ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}")
 +endif ()
  
  if (MONGOC_ENABLE_STATIC)
     add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
-@@ -639,7 +641,11 @@ if (ENABLE_APPLE_FRAMEWORK)
+@@ -731,7 +733,11 @@ if (ENABLE_APPLE_FRAMEWORK)
  endif ()
  
  add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c)
 +if (MONGOC_ENABLE_STATIC)
 +target_link_libraries (mongoc-stat mongoc_static)
 +else ()
- target_link_libraries (mongoc-stat mongoc_shared)
+ target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES})
 +endif ()
  
  # mongoc-stat works if shared memory performance counters are enabled.
  if (ENABLE_SHM_COUNTERS STREQUAL "ON")
-@@ -870,6 +876,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/json DESTINATION ${PROJECT_BINARY_DIR}/te
- file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR}/tests)
+@@ -977,7 +983,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR}
  file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests)
  
-+if (NOT MONGOC_ENABLE_STATIC)
- install (
-    TARGETS mongoc_shared ${EXAMPLES}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -877,10 +884,11 @@ install (
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    FRAMEWORK DESTINATION ${CMAKE_INSTALL_BINDIR} 
+ if (MONGOC_ENABLE_STATIC)
+-   set (TARGETS_TO_INSTALL mongoc_shared mongoc_static)
++   set (TARGETS_TO_INSTALL mongoc_static)
+ else ()
+    set (TARGETS_TO_INSTALL mongoc_shared)
+ endif ()
+@@ -997,6 +1003,7 @@ install (
  )
-+endif ()
  
- if (MONGOC_ENABLE_STATIC)
-    install (
--      TARGETS mongoc_shared mongoc_static ${EXAMPLES}
-+      TARGETS mongoc_static ${EXAMPLES}
-       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ if (MSVC)
++   if (NOT ENABLE_STATIC MATCHES "ON|AUTO")
+    add_custom_command (
+       TARGET mongoc_shared
+       POST_BUILD
+@@ -1008,6 +1015,7 @@ if (MSVC)
+       FILES $<TARGET_LINKER_FILE_DIR:mongoc_shared>/lib$<TARGET_LINKER_FILE_NAME:mongoc_shared>
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
++   else()
+    if (TARGET mongoc_static)
+       add_custom_command (
+          TARGET mongoc_static
+@@ -1021,6 +1029,7 @@ if (MSVC)
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       )
+    endif ()
++   endif()
+ endif ()
+ 
+ install (
+diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
+index 0690b86..98721df 100644
 --- a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
 +++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
 @@ -765,7 +765,7 @@ _mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file)
@@ -119,6 +154,8 @@
     const char *key;
     bson_iter_t iter;
     int64_t existing_chunks;
+diff --git a/src/libmongoc/src/mongoc/mongoc-handshake.c b/src/libmongoc/src/mongoc/mongoc-handshake.c
+index 8374af2..5491595 100644
 --- a/src/libmongoc/src/mongoc/mongoc-handshake.c
 +++ b/src/libmongoc/src/mongoc/mongoc-handshake.c
 @@ -286,7 +286,8 @@ _get_os_version (void)
@@ -131,6 +168,8 @@
     OSVERSIONINFO osvi;
     ZeroMemory (&osvi, sizeof (OSVERSIONINFO));
     osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+diff --git a/src/libmongoc/src/mongoc/mongoc-util.c b/src/libmongoc/src/mongoc/mongoc-util.c
+index 99939ff..3c25e19 100644
 --- a/src/libmongoc/src/mongoc/mongoc-util.c
 +++ b/src/libmongoc/src/mongoc/mongoc-util.c
 @@ -84,7 +84,11 @@ _mongoc_hex_md5 (const char *input)