From 9724fe7d7011aab6cf09b9c187bba7c4af02688e Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 11 Feb 2024 14:30:53 -0500
Subject: [PATCH] go back to outdated rocksdb (the fork breaks CI in a weird
 way now)

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.lock | 33 ++++++++++++++++++++++++++-------
 Cargo.toml | 14 ++++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 690d4b50..ef96dde8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -218,16 +218,17 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 1.3.2",
  "cexpr",
  "clang-sys",
- "itertools 0.11.0",
  "lazy_static",
  "lazycell",
+ "peeking_take_while",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
@@ -1282,8 +1283,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.16.0+8.10.0"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
+version = "0.11.0+8.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -1756,6 +1758,12 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "pem"
 version = "3.0.3"
@@ -1895,6 +1903,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "2.0.2"
@@ -2105,7 +2123,8 @@ dependencies = [
 [[package]]
 name = "rocksdb"
 version = "0.21.0"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
 dependencies = [
  "libc",
  "librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 2b4811dc..e85afee3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,12 +106,14 @@ sd-notify = { version = "0.4.1", optional = true }
 
 webpage = { version = "2.0", default-features = false }
 
-[dependencies.rocksdb]
-git = "https://github.com/zaidoon1/rust-rocksdb"
-rev = "8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
-default-features = false
-features = ["multi-threaded-cf", "zstd", "snappy", "lz4"]
-optional = true
+#[dependencies.rocksdb]
+#git = "https://github.com/zaidoon1/rust-rocksdb"
+#rev = "8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
+#default-features = false
+#features = ["multi-threaded-cf", "zstd", "snappy", "lz4"]
+#optional = true
+
+rocksdb = { version = "0.21.0", default-features = false, features = ["multi-threaded-cf", "zstd", "snappy", "lz4"], optional = true }
 
 
 [target.'cfg(unix)'.dependencies]