From c18a56b0bfd17a1e80631471c1aa8f93792c0601 Mon Sep 17 00:00:00 2001
From: "Victor M. Alvarez" <vmalvarez@virustotal.com>
Date: Thu, 5 Sep 2024 11:18:22 +0200
Subject: [PATCH] chore: use my own fixed version of  the `protobuf` crate.

The fixes were sent for review to the original repository:

https://github.com/stepancheg/rust-protobuf/pull/740

Until these fixes are merged and published in a new release, we'll depend on my own version.
---
 Cargo.lock | 27 +++++++++++----------------
 Cargo.toml | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 870b5deb7..6af0cf673 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2706,9 +2706,8 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6"
+version = "4.0.0-alpha.0"
+source = "git+https://github.com/plusvic/rust-protobuf?rev=53091cb35870e8fea17971326b7d1f84e2d832a2#53091cb35870e8fea17971326b7d1f84e2d832a2"
 dependencies = [
  "once_cell",
  "protobuf-support",
@@ -2717,9 +2716,8 @@ dependencies = [
 
 [[package]]
 name = "protobuf-codegen"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189"
+version = "4.0.0-alpha.0"
+source = "git+https://github.com/plusvic/rust-protobuf?rev=53091cb35870e8fea17971326b7d1f84e2d832a2#53091cb35870e8fea17971326b7d1f84e2d832a2"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -2732,9 +2730,8 @@ dependencies = [
 
 [[package]]
 name = "protobuf-json-mapping"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07993d14c66dfb74c639dc1b90381773b85cff66ef47bff35bad0778150a3aa"
+version = "4.0.0-alpha.0"
+source = "git+https://github.com/plusvic/rust-protobuf?rev=53091cb35870e8fea17971326b7d1f84e2d832a2#53091cb35870e8fea17971326b7d1f84e2d832a2"
 dependencies = [
  "protobuf",
  "protobuf-support",
@@ -2743,9 +2740,8 @@ dependencies = [
 
 [[package]]
 name = "protobuf-parse"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76"
+version = "4.0.0-alpha.0"
+source = "git+https://github.com/plusvic/rust-protobuf?rev=53091cb35870e8fea17971326b7d1f84e2d832a2#53091cb35870e8fea17971326b7d1f84e2d832a2"
 dependencies = [
  "anyhow",
  "indexmap 2.4.0",
@@ -2759,9 +2755,8 @@ dependencies = [
 
 [[package]]
 name = "protobuf-support"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9"
+version = "4.0.0-alpha.0"
+source = "git+https://github.com/plusvic/rust-protobuf?rev=53091cb35870e8fea17971326b7d1f84e2d832a2#53091cb35870e8fea17971326b7d1f84e2d832a2"
 dependencies = [
  "thiserror",
 ]
@@ -4290,7 +4285,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index a0b3bb6ee..81e4d8b29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,16 +75,16 @@ num-derive = "0.4.2"
 p256 = "0.13.2"
 p384 = "0.13.0"
 pretty_assertions = "1.4.0"
-#protobuf = { path = "../rust-protobuf/protobuf" }
-#protobuf-codegen = { path = "../rust-protobuf/protobuf-codegen" }
-#protobuf-json-mapping = { path = "../rust-protobuf/protobuf-json-mapping" }
-#protobuf-parse = { path = "../rust-protobuf/protobuf-parse" }
-#protobuf-support = { path = "../rust-protobuf/protobuf-support" }
-protobuf = "3.5.0"
-protobuf-codegen = "3.5.0"
-protobuf-json-mapping = "3.5.0"
-protobuf-parse = "3.5.0"
-protobuf-support = "3.5.0"
+# protobuf = "3.5.0"
+# protobuf-codegen = "3.5.0"
+# protobuf-json-mapping = "3.5.0"
+# protobuf-parse = "3.5.0"
+# protobuf-support = "3.5.0"
+protobuf = { git = "https://github.com/plusvic/rust-protobuf", rev = "53091cb35870e8fea17971326b7d1f84e2d832a2" }
+protobuf-codegen = { git = "https://github.com/plusvic/rust-protobuf", rev = "53091cb35870e8fea17971326b7d1f84e2d832a2" }
+protobuf-json-mapping = { git = "https://github.com/plusvic/rust-protobuf", rev = "53091cb35870e8fea17971326b7d1f84e2d832a2" }
+protobuf-parse = { git = "https://github.com/plusvic/rust-protobuf", rev = "53091cb35870e8fea17971326b7d1f84e2d832a2" }
+protobuf-support = { git = "https://github.com/plusvic/rust-protobuf", rev = "53091cb35870e8fea17971326b7d1f84e2d832a2" }
 rayon = "1.10.0"
 regex-syntax = "0.8.4"
 regex-automata = "0.4.7"