From 09a968ef09e8b9d96e11b3b4c6fc6a674902a29d Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Tue, 7 Jun 2022 14:00:25 +0800
Subject: [PATCH] remove debug-here dependency

this contains a dependency to `failure` two levels down that has a critical
vulnerability. Unfortunately no new versions of debug-here have been
published in a while. It's no longer used, so just stripping it out
altogether.
---
 Cargo.lock                    | 77 -----------------------------------
 kernel/Cargo.toml             |  1 -
 kernel/src/main.rs            |  2 +-
 services/shellchat/Cargo.toml |  3 --
 4 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5292d33a..46db1befa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -127,21 +118,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "ball"
 version = "0.1.0"
@@ -856,17 +832,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "debug-here"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7791f83f55f330aa6406d71cc29d6d785ea1e2cf326001d7b2b45a5065efb1"
-dependencies = [
- "lazy_static",
- "which",
- "winapi",
-]
-
 [[package]]
 name = "delegate"
 version = "0.6.2"
@@ -1117,15 +1082,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
-]
-
 [[package]]
 name = "fastrand"
 version = "1.7.0"
@@ -1445,12 +1401,6 @@ dependencies = [
  "xous-names",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -1779,7 +1729,6 @@ version = "0.8.2"
 dependencies = [
  "bitflags",
  "crossbeam-channel",
- "debug-here",
  "gdbstub",
  "gdbstub_arch",
  "hex",
@@ -2244,15 +2193,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "object"
-version = "0.28.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.12.0"
@@ -2839,12 +2779,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
 [[package]]
 name = "rustc-std-workspace-alloc"
 version = "1.0.0"
@@ -3099,7 +3033,6 @@ dependencies = [
  "com_rs-ref",
  "content-plugin-api",
  "curve25519-dalek",
- "debug-here",
  "digest 0.9.0",
  "dns",
  "ed25519-dalek",
@@ -4051,16 +3984,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "which"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
-dependencies = [
- "failure",
- "libc",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index 4daa1566d..21a1b8736 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -40,7 +40,6 @@ default = ["print-panics", "gdbserver"]
 
 [target.'cfg(any(windows, unix))'.dependencies]
 crossbeam-channel = "0.5"
-debug-here = "0.2.2"
 hex = "0.4"
 lazy_static = "1.4"
 rand = "0.7.3"
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
index 226690ba5..60db7711d 100644
--- a/kernel/src/main.rs
+++ b/kernel/src/main.rs
@@ -155,7 +155,7 @@ pub extern "C" fn kmain() {
         use std::panic;
         panic::set_hook(Box::new(|arg| {
             println!("Panic Details: {:?}", arg);
-            debug_here::debug_here!();
+            // debug_here::debug_here!();
         }));
     }
 
diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml
index 893d1700f..d54441fbe 100644
--- a/services/shellchat/Cargo.toml
+++ b/services/shellchat/Cargo.toml
@@ -93,6 +93,3 @@ aestests = [] # adds AES tests
 tts = [] # adds text to speech plugin
 pddbtest = []
 default = [] # "debugprint"
-
-[target.'cfg(any(windows,unix))'.dependencies]
-debug-here = "*"