Zlib version bump 1.2.13 -> 1.3

cmake/StaticBuild.cmake

@@ -55,11 +55,11 @@ set(LIBUV_SOURCE libuv-v${LIBUV_VERSION}.tar.gz)
 set(LIBUV_HASH SHA512=91197ff9303112567bbb915bbb88058050e2ad1c048815a3b57c054635d5dc7df458b956089d785475290132236cb0edcfae830f5d749de29a9a3213eeaf0b20
     CACHE STRING "libuv source hash")
 
-set(ZLIB_VERSION 1.2.13 CACHE STRING "zlib version")
+set(ZLIB_VERSION 1.3 CACHE STRING "zlib version")
 set(ZLIB_MIRROR ${LOCAL_MIRROR} https://zlib.net
     CACHE STRING "zlib mirror(s)")
 set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.xz)
-set(ZLIB_HASH SHA256=d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
+set(ZLIB_HASH SHA256=8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
   CACHE STRING "zlib source hash")
 
 set(CURL_VERSION 7.86.0 CACHE STRING "curl version")

external/CMakeLists.txt

@@ -24,16 +24,15 @@ if(SUBMODULE_CHECK)
     endfunction ()
 
     message(STATUS "Checking submodules")
+    check_submodule(CLI11)
+    check_submodule(cpr)
     check_submodule(nlohmann)
-#    check_submodule(ghc-filesystem)
-#    check_submodule(oxen-logging fmt spdlog)
+    check_submodule(oxen-libquic)
+    check_submodule(oxen-mq)
     check_submodule(pybind11)
+    check_submodule(span-lite)
     check_submodule(sqlite_orm)
-    check_submodule(oxen-mq)
     check_submodule(uvw)
-    check_submodule(cpr)
-    check_submodule(oxen-libquic)
-    check_submodule(CLI11)
   endif()
 endif()
 
@@ -65,12 +64,6 @@ set(JSON_BuildTests OFF CACHE INTERNAL "")
 set(JSON_Install OFF CACHE INTERNAL "")
 system_or_submodule(NLOHMANN nlohmann_json nlohmann_json>=3.7.0 nlohmann)
 
-#if (STATIC OR FORCE_SPDLOG_SUBMODULE OR FORCE_FMT_SUBMODULE)
-#    set(OXEN_LOGGING_FORCE_SUBMODULES ON CACHE INTERNAL "")
-#endif()
-#set(OXEN_LOGGING_SOURCE_ROOT "${PROJECT_SOURCE_DIR}" CACHE INTERNAL "")
-#add_subdirectory(oxen-logging)
-
 if(WITH_HIVE)
   add_subdirectory(pybind11 EXCLUDE_FROM_ALL)
 endif()
@@ -92,12 +85,10 @@ add_library(uvw INTERFACE)
 target_include_directories(uvw INTERFACE uvw/src)
 target_link_libraries(uvw INTERFACE libuv)
 
-# ngtcp2 needs some massaging to build nicely:
-#include(ngtcp2_lib)
-#add_ngtcp2_lib()
-
 add_subdirectory(oxen-libquic)
 
+add_subdirectory(span-lite)
+
 # cpr configuration.  Ideally we'd just do this via add_subdirectory, but cpr's cmake requires
 # 3.15+, and we target lower than that (and this is fairly simple to build).
 if(WITH_BOOTSTRAP)