NONJAVACLI-3460: update dependencies (#4706)

* update third party dependencies * update lz4 version in the header file * update libraries for the windows build * reverting the version bump in the headers * use the latest version of curl * Update OpenSSL and add CHANGELOG.md * downgade curl version to one available via vcpkg * downgrade zlib to last available version in vcpkg * downgrade zstd to the latest available * Include CPPFLAGS within make for libcurl * Update mklove/modules/configure.libcurl * Update CHANGELOG.md --------- Co-authored-by: Milind L <[email protected]> Co-authored-by: Emanuele Sabellico <[email protected]>
confluentinc · Jun 14, 2024 · c526073 · c526073
1 parent 6db3c03
commit c526073
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,11 @@ librdkafka v2.4.0 is a feature release:
  * Fix for an undesired partition migration with stale leader epoch (#4680).
  * Fix hang in cooperative consumer mode if an assignment is processed
    while closing the consumer (#4528).
+ * Upgrade OpenSSL to v3.0.13 (while building from source) with various security fixes,
+   check the [release notes](https://www.openssl.org/news/cl30.txt)
+   (@janjwerner-confluent, #4690).
+ * Upgrade zstd to v1.5.6, zlib to v1.3.1, and curl to v8.8.0 (@janjwerner-confluent, #4690).
+
 
 
 ## Upgrade considerations

diff --git a/mklove/modules/configure.libcurl b/mklove/modules/configure.libcurl
@@ -45,8 +45,8 @@ void foo (void) {
 function install_source {
     local name=$1
     local destdir=$2
-    local ver=7.86.0
-    local checksum="3dfdd39ba95e18847965cd3051ea6d22586609d9011d91df7bc5521288987a82"
+    local ver=8.8.0
+    local checksum="77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d"
 
     echo "### Installing $name $ver from source to $destdir"
     if [[ ! -f Makefile ]]; then
@@ -87,7 +87,7 @@ function install_source {
 	--disable-ldap{,s} \
 	--disable-libcurl-option \
         --without-{librtmp,libidn2,winidn,nghttp2,nghttp3,ngtcp2,quiche,brotli} &&
-	time make -j &&
+	time make CPPFLAGS="$CPPFLAGS" -j &&
 	make DESTDIR="${destdir}" prefix=/usr install
     local ret=$?
 

diff --git a/mklove/modules/configure.libssl b/mklove/modules/configure.libssl
@@ -91,8 +91,8 @@ function manual_checks {
 function libcrypto_install_source {
     local name=$1
     local destdir=$2
-    local ver=3.0.12
-    local checksum="f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61"
+    local ver=3.0.13
+    local checksum="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313"
     local url=https://www.openssl.org/source/openssl-${ver}.tar.gz
 
     local conf_args="--prefix=/usr --openssldir=/usr/lib/ssl no-shared no-zlib"

diff --git a/mklove/modules/configure.libzstd b/mklove/modules/configure.libzstd
@@ -42,8 +42,8 @@ void foo (void) {
 function install_source {
     local name=$1
     local destdir=$2
-    local ver=1.5.2
-    local checksum="7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0"
+    local ver=1.5.6
+    local checksum="8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1"
 
     echo "### Installing $name $ver from source to $destdir"
     if [[ ! -f Makefile ]]; then

diff --git a/mklove/modules/configure.zlib b/mklove/modules/configure.zlib
@@ -42,8 +42,8 @@ void foo (void) {
 function install_source {
     local name=$1
     local destdir=$2
-    local ver=1.2.13
-    local checksum="b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
+    local ver=1.3.1
+    local checksum="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
 
     echo "### Installing $name $ver from source to $destdir"
     if [[ ! -f Makefile ]]; then

diff --git a/vcpkg.json b/vcpkg.json
@@ -4,19 +4,19 @@
     "dependencies": [
         {
             "name": "zstd",
-            "version>=": "1.5.2"
+            "version>=": "1.5.5#2"
         },
         {
             "name": "zlib",
-            "version>=": "1.2.13"
+            "version>=": "1.3"
         },
         {
             "name": "openssl",
             "version>=": "3.0.8"
         },
         {
             "name": "curl",
-            "version>=": "7.86.0"
+            "version>=": "8.4.0"
         }
     ],
     "builtin-baseline": "56765209ec0e92c58a5fd91aa09c46a16d660026"