Merge pull request #3616 from canonical/update_3rd_lib_version

Update 3rd party libs, part1
canonical · Oct 3, 2024 · 183583d · 183583d
2 parents 94b4e8f + d79d2c9
commit 183583d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 34 deletions.
diff --git a/3rd-party/fmt b/3rd-party/fmt
diff --git a/3rd-party/libssh/CMakeLists.txt b/3rd-party/libssh/CMakeLists.txt
@@ -59,8 +59,8 @@ file(STRINGS libssh/CMakeLists.txt libssh_VERSION REGEX "^project\\(libssh")
 file(STRINGS libssh/CMakeLists.txt LIBRARY_VERSION REGEX "^set\\(LIBRARY_VERSION")
 file(STRINGS libssh/CMakeLists.txt LIBRARY_SOVERSION REGEX "^set\\(LIBRARY_SOVERSION")
 
-string(REGEX MATCH "^project\\(libssh VERSION ([0-9]+)\\.([0-9]+)\\.([0-9]+) LANGUAGES C\\)$"
-       libssh_VERSION "${libssh_VERSION}")
+string(REGEX MATCH "^project\\(libssh VERSION ([0-9]+)\\.([0-9]+)\\.([0-9]+) LANGUAGES C CXX\\)$"
+  libssh_VERSION "${libssh_VERSION}")
 if (NOT libssh_VERSION)
     message(FATAL_ERROR "unable to find libssh project version")
 endif()

diff --git a/3rd-party/libssh/libssh b/3rd-party/libssh/libssh
diff --git a/3rd-party/submodule_info.md b/3rd-party/submodule_info.md
@@ -12,12 +12,12 @@ Version: 1.52.1 (+[our patches](https://github.com/CanonicalLtd/grpc/compare/v1.
 <https://github.com/grpc/grpc/releases>
 
 ### libssh
-Version: 0.10.5 (+[our patches](https://github.com/canonical/libssh/compare/libssh-0.10.5..843b97db)) |
+Version: 0.11.1 (+[our patches](https://github.com/canonical/libssh/compare/libssh-0.11.1...multipass)) |
 <https://github.com/canonical/libssh.git> |
 <https://www.libssh.org/>
 
 ### fmt
-Version: 10.1.1 |
+Version: 11.0.2 |
 <https://github.com/fmtlib/fmt.git> |
 <https://github.com/fmtlib/fmt/releases>
 
@@ -32,12 +32,12 @@ Version: 1.1.0 (+[our patches](https://github.com/CanonicalLtd/semver/compare/1.
 <https://github.com/zmarko/semver/releases>
 
 ### xz-embedded
-Version: 090e6a0 |
+Version: v20240322 |
 <https://git.tukaani.org/xz-embedded.git> |
 <https://tukaani.org/xz/embedded.html>
 
 ### yaml-cpp
-Version: 0.6.3 (+[our patches](https://github.com/canonical/yaml-cpp/compare/yaml-cpp-0.6.3..a61bca0)) |
+Version: 0.8.0 (+[our patches](https://github.com/canonical/yaml-cpp/compare/0.8.0..multipass)) |
 <https://github.com/canonical/yaml-cpp.git> |
 <https://github.com/jbeder/yaml-cpp/releases>
 
@@ -47,6 +47,6 @@ Version: 1.9.4 |
 <https://github.com/open-source-parsers/jsoncpp/releases>
 
 ### POCO
-Version: 1.12.4 |
+Version: 1.13.3 |
 <https://github.com/pocoproject/poco.git> |
 <https://github.com/pocoproject/poco/releases>
diff --git a/3rd-party/vcpkg-ports/poco/portfile.cmake b/3rd-party/vcpkg-ports/poco/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pocoproject/poco
-    REF 1211613642269b7d53bea58b02de7fcd25ece3b9 # poco-1.12.4-release
-    SHA512 bf390f7c8d7c4f0d7602afa434a933b429274944d12560159761b0f984316c76abfdb49ad422c869e02d88041058a04d66e7b5ae05142819a4f583870cc00f44
-    HEAD_REF master
+    REF "poco-1.13.3-release"
+    SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92
+    HEAD_REF devel
     PATCHES
         # Fix embedded copy of pcre in static linking mode
         0001-static-pcre.patch
@@ -60,24 +60,25 @@ vcpkg_cmake_configure(
         -DPOCO_MT=${POCO_MT}
         -DENABLE_TESTS=OFF
         # Allow enabling and disabling components
-	-DENABLE_NETSSL=OFF
-	-DENABLE_CRYPTO=OFF
-	-DENABLE_JWT=OFF
-	-DENABLE_ENCODINGS=OFF
-	-DENABLE_XML=OFF
-	-DENABLE_JSON=OFF
-	-DENABLE_MONGODB=OFF
-	-DENABLE_DATA_SQLITE=OFF
-	-DENABLE_REDIS=OFF
-	-DENABLE_UTIL=OFF
-	-DENABLE_NET=OFF
+        -DENABLE_NETSSL=OFF
+        -DENABLE_CRYPTO=OFF
+        -DENABLE_JWT=OFF
+        -DENABLE_ENCODINGS=OFF
+        -DENABLE_XML=OFF
+        -DENABLE_JSON=OFF
+        -DENABLE_MONGODB=OFF
+        -DENABLE_DATA_SQLITE=OFF
+        -DENABLE_REDIS=OFF
+        -DENABLE_UTIL=OFF
+        -DENABLE_NET=OFF
         -DENABLE_ZIP=ON
-	-DENABLE_PAGECOMPILER=OFF
-	-DENABLE_PAGECOMPILER_FILE2PAGE=OFF
-	-DENABLE_ACTIVERECORD_COMPILER=OFF
-	-DENABLE_ACTIVERECORD=OFF
-	-DENABLE_DATA=OFF
-	-DENABLE_PROMETHEUS=OFF
+        -DENABLE_PAGECOMPILER=OFF
+        -DENABLE_PAGECOMPILER_FILE2PAGE=OFF
+        -DENABLE_ACTIVERECORD_COMPILER=OFF
+        -DENABLE_ACTIVERECORD=OFF
+        -DENABLE_DATA=OFF
+        -DENABLE_PROMETHEUS=OFF
+        -DENABLE_POCODOC=ON # this is needed for vcpkg_cmake_install to install the some necessary cmake configuration files
         -DENABLE_DATA_MYSQL=${POCO_USE_MYSQL}
     MAYBE_UNUSED_VARIABLES # these are only used when if(MSVC)
         POCO_DISABLE_INTERNAL_OPENSSL
@@ -121,3 +122,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/3rd-party/vcpkg-ports/poco/vcpkg.json b/3rd-party/vcpkg-ports/poco/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "poco",
-  "version": "1.12.4",
+  "version": "1.13.3",
   "port-version": 4,
   "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
   "homepage": "https://github.com/pocoproject/poco",

diff --git a/3rd-party/xz-decoder/xz-embedded b/3rd-party/xz-decoder/xz-embedded
diff --git a/3rd-party/yaml-cpp b/3rd-party/yaml-cpp
diff --git a/include/multipass/format.h b/include/multipass/format.h
@@ -20,8 +20,7 @@
 
 #include <fmt/format.h>
 #include <fmt/ostream.h>
-
-#include <filesystem>
+#include <fmt/ranges.h>
 
 #include <QByteArray>
 #include <QProcess>

diff --git a/src/client/cli/formatter/format_utils.cpp b/src/client/cli/formatter/format_utils.cpp
@@ -22,6 +22,7 @@
 #include <multipass/cli/table_formatter.h>
 #include <multipass/cli/yaml_formatter.h>
 
+#include <iomanip>
 #include <locale>
 #include <sstream>