From 00bd4fed04a60a5ac4638045db1abe1614c335b6 Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Thu, 1 Aug 2024 12:29:16 -0600
Subject: [PATCH] Update NuRaft for fix:
 https://github.com/eBay/NuRaft/pull/526

---
 .github/workflows/build_dependencies.yml | 2 +-
 3rd_party/nuraft/conandata.yml           | 7 +++++++
 conanfile.py                             | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
index 8a8cf84..f0f20a5 100644
--- a/.github/workflows/build_dependencies.yml
+++ b/.github/workflows/build_dependencies.yml
@@ -130,7 +130,7 @@ jobs:
     - name: Export Recipes
       run: |
         conan export import/sisl oss/master
-        conan export 3rd_party/nuraft nuraft/2.4.1@
+        conan export 3rd_party/nuraft nuraft/2.4.2@
         cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/package | sed 's,.*data/,,' | cut -d'/' -f1,2 | paste -sd',' - -)
         echo "::info:: Pre-cached: ${cached_pkgs}"
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
diff --git a/3rd_party/nuraft/conandata.yml b/3rd_party/nuraft/conandata.yml
index a06a83d..d608da2 100644
--- a/3rd_party/nuraft/conandata.yml
+++ b/3rd_party/nuraft/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.4.2":
+    url: "https://github.com/eBay/nuraft/archive/a4029e132560c06445918bd84471863cb1537a3c.tar.gz"
+    sha256: "f719f89b41175ec3e110d230b788d7a0ab74a691b0a03687f801d1f7af9fe91b"
   "2.4.1":
     url: "https://github.com/eBay/nuraft/archive/f4c8e057080419cc9c845cfb7df95d7c9b2193c4.tar.gz"
     sha256: "ba380efe7e9f432a5b48a0bc3426a33128a791d6f7dbcd30ffcad4634fdde5b0"
@@ -8,6 +11,10 @@ sources:
   "2.3.0":
     url: "https://github.com/eBay/nuraft/archive/f42b12c3ec9f20a085de61e1294e8167fa747c7d.tar.gz"
 patches:
+  "2.4.2":
+    - patch_file: "patches/2-4-0.patch"
+      patch_description: "Dependency discovery"
+      patch_type: "conan"
   "2.4.1":
     - patch_file: "patches/2-4-0.patch"
       patch_description: "Dependency discovery"
diff --git a/conanfile.py b/conanfile.py
index 0c4d9ca..7de9784 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -10,7 +10,7 @@
 
 class NuRaftMesgConan(ConanFile):
     name = "nuraft_mesg"
-    version = "3.5.8"
+    version = "3.5.9"
 
     homepage = "https://github.com/eBay/nuraft_mesg"
     description = "A gRPC service for NuRAFT"
@@ -67,7 +67,7 @@ def build_requirements(self):
     def requirements(self):
         self.requires("boost/1.83.0", transitive_headers=True)
         self.requires("sisl/[^12.2]@oss/master", transitive_headers=True)
-        self.requires("nuraft/2.4.1", transitive_headers=True)
+        self.requires("nuraft/2.4.2", transitive_headers=True)
 
     def layout(self):
         cmake_layout(self)