From 896df0bb977fefed1422d276f76ec71bc71c7e6f Mon Sep 17 00:00:00 2001
From: John Smith <jsmithveilid@protonmail.com>
Date: Sun, 3 Sep 2023 10:08:04 -0400
Subject: [PATCH] more forking

---
 Cargo.lock               | 28 +++++++++-------------------
 veilid-cli/Cargo.toml    |  2 +-
 veilid-core/Cargo.toml   |  2 +-
 veilid-server/Cargo.toml |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b41d4bf9..f24f0672 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -797,22 +797,6 @@ dependencies = [
  "cmake",
 ]
 
-[[package]]
-name = "bugsalot"
-version = "0.2.2"
-source = "git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615#336a7053faadf990b9362edf5752ef34fa1f9615"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "bugsalot"
-version = "0.2.2"
-source = "git+https://github.com/crioux/bugsalot.git#336a7053faadf990b9362edf5752ef34fa1f9615"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.13.0"
@@ -5533,6 +5517,12 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "veilid-bugsalot"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3"
+
 [[package]]
 name = "veilid-cli"
 version = "0.2.0"
@@ -5540,7 +5530,6 @@ dependencies = [
  "arboard",
  "async-std",
  "async-tungstenite 0.8.0",
- "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615)",
  "cfg-if 1.0.0",
  "clap 4.4.2",
  "config",
@@ -5566,6 +5555,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-util",
+ "veilid-bugsalot",
  "veilid-tools",
 ]
 
@@ -5583,7 +5573,6 @@ dependencies = [
  "async_executors",
  "backtrace",
  "blake3",
- "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615)",
  "capnp",
  "capnpc",
  "cfg-if 1.0.0",
@@ -5655,6 +5644,7 @@ dependencies = [
  "tracing-subscriber",
  "tracing-wasm",
  "trust-dns-resolver",
+ "veilid-bugsalot",
  "veilid-hashlink",
  "veilid-tools",
  "wasm-bindgen",
@@ -5720,7 +5710,6 @@ dependencies = [
  "async-std",
  "async-tungstenite 0.23.0",
  "backtrace",
- "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git)",
  "cfg-if 1.0.0",
  "clap 4.4.2",
  "color-eyre",
@@ -5757,6 +5746,7 @@ dependencies = [
  "tracing-opentelemetry",
  "tracing-subscriber",
  "url",
+ "veilid-bugsalot",
  "veilid-core",
  "wg",
  "windows-service",
diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml
index 58eae0b2..598bc839 100644
--- a/veilid-cli/Cargo.toml
+++ b/veilid-cli/Cargo.toml
@@ -49,7 +49,7 @@ serde_derive = "^1"
 parking_lot = "^0"
 cfg-if = "^1"
 config = { version = "^0", features = ["yaml"] }
-bugsalot = { version = "0.2.2", git = "https://github.com/crioux/bugsalot.git", rev = "336a7053faadf990b9362edf5752ef34fa1f9615" }
+bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
 flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] }
 thiserror = "^1"
 crossbeam-channel = "^0"
diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml
index b95b708c..0a1fcc74 100644
--- a/veilid-core/Cargo.toml
+++ b/veilid-core/Cargo.toml
@@ -147,7 +147,7 @@ lz4_flex = { version = "0.11.1", default-features = false, features = [
 
 # Tools
 config = { version = "0.13.3", features = ["yaml"] }
-bugsalot = { version = "0.2.2", git = "https://github.com/crioux/bugsalot.git", rev = "336a7053faadf990b9362edf5752ef34fa1f9615" }
+bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
 chrono = "0.4.26"
 libc = "0.2.147"
 nix = "0.26.2"
diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml
index a4c3425b..e3502ee3 100644
--- a/veilid-server/Cargo.toml
+++ b/veilid-server/Cargo.toml
@@ -67,7 +67,7 @@ futures-util = { version = "^0", default_features = false, features = [
 url = "^2"
 ctrlc = "^3"
 lazy_static = "^1"
-bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
+bugsalot = { package = "veilid-bugsalot", version = "0.1.0" }
 flume = { version = "^0", features = ["async"] }
 rpassword = "^6"
 hostname = "^0"