From ebd2b3b57f0206814925b9e986ccf19633eaa9a0 Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Sun, 13 Mar 2022 10:18:05 +0100
Subject: [PATCH] Upgrades RocksDB to 7.0

---
 Cargo.lock            | 24 ++++++++++++------------
 deny.toml             |  3 +--
 oxrocksdb-sys/rocksdb |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e8c1b19c..3cea63b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,9 +39,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.55"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd"
+checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
 
 [[package]]
 name = "atty"
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.1.5"
+version = "3.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312"
+checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123"
 dependencies = [
  "atty",
  "bitflags",
@@ -740,9 +740,9 @@ dependencies = [
 
 [[package]]
 name = "num_threads"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15"
+checksum = "c539a50b93a303167eded6e8dff5220cd39447409fb659f4cd24b1f72fe4f133"
 dependencies = [
  "libc",
 ]
@@ -836,7 +836,7 @@ dependencies = [
 name = "oxigraph_server"
 version = "0.3.0-beta.4"
 dependencies = [
- "clap 3.1.5",
+ "clap 3.1.6",
  "flate2",
  "oxhttp",
  "oxigraph",
@@ -851,7 +851,7 @@ name = "oxigraph_testsuite"
 version = "0.3.0-beta.4"
 dependencies = [
  "anyhow",
- "clap 3.1.5",
+ "clap 3.1.6",
  "criterion",
  "oxigraph",
  "text-diff",
@@ -1171,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1428,9 +1428,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "siphasher"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
 name = "smallvec"
diff --git a/deny.toml b/deny.toml
index 4194e4a9..23d46734 100644
--- a/deny.toml
+++ b/deny.toml
@@ -3,8 +3,7 @@ unlicensed = "deny"
 allow = [
     "MIT",
     "Apache-2.0",
-    "Apache-2.0 WITH LLVM-exception",
-    "CECILL-B"
+    "Apache-2.0 WITH LLVM-exception"
 ]
 allow-osi-fsf-free = "either"
 default = "deny"
diff --git a/oxrocksdb-sys/rocksdb b/oxrocksdb-sys/rocksdb
index ee959006..bbae679c 160000
--- a/oxrocksdb-sys/rocksdb
+++ b/oxrocksdb-sys/rocksdb
@@ -1 +1 @@
-Subproject commit ee9590068026386f13fee9530ad2a40acc774907
+Subproject commit bbae679ce7bd53d267ac8310f60fa86491716666