From ec8a5c893f8b99df59067db0befcd5da1db27121 Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Wed, 6 Mar 2024 19:32:32 -0500
Subject: [PATCH] prepare for stagex bindgen

---
 .gitignore                           |  1 +
 Cargo.lock                           | 36 ----------------------------
 Containerfile                        |  2 +-
 crates/keyfork/Cargo.toml            |  7 ------
 vendor/nettle-sys-2.3.0/Cargo.toml   |  4 ----
 vendor/v4l2-sys-mit-0.3.0/Cargo.toml |  4 ----
 6 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54fc25f..9db61d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 target
 testing_data
+out
diff --git a/Cargo.lock b/Cargo.lock
index 3c65f88..a0242b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -356,27 +356,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.65.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.68.1"
@@ -1680,7 +1659,6 @@ dependencies = [
 name = "keyfork"
 version = "0.1.0"
 dependencies = [
- "bindgen 0.68.1",
  "card-backend-pcsc",
  "clap",
  "clap_complete",
@@ -2141,7 +2119,6 @@ dependencies = [
 name = "nettle-sys"
 version = "2.3.0"
 dependencies = [
- "bindgen 0.65.1",
  "cc",
  "libc",
  "pkg-config",
@@ -2593,16 +2570,6 @@ 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 = "primeorder"
 version = "0.13.6"
@@ -3509,9 +3476,6 @@ dependencies = [
 [[package]]
 name = "v4l2-sys-mit"
 version = "0.3.0"
-dependencies = [
- "bindgen 0.68.1",
-]
 
 [[package]]
 name = "valuable"
diff --git a/Containerfile b/Containerfile
index 3f8bfb4..5b66f41 100644
--- a/Containerfile
+++ b/Containerfile
@@ -54,4 +54,4 @@ RUN --network=none \
 		--bin keyfork
 
 FROM scratch AS package
-COPY --from=build keyfork/target/release/keyfork /keyfork
+COPY --from=build /src/target/x86_64-unknown-linux-musl/release/keyfork /keyfork
diff --git a/crates/keyfork/Cargo.toml b/crates/keyfork/Cargo.toml
index 78797c7..bc3bda2 100644
--- a/crates/keyfork/Cargo.toml
+++ b/crates/keyfork/Cargo.toml
@@ -9,12 +9,8 @@ default = [
 	"completion",
 	"qrcode-decode-backend-rqrr",
  	"sequoia-crypto-backend-nettle",
-	"link-static",
 ]
 
-link-static = ["bindgen/static"]
-link-runtime = ["bindgen/runtime"]
-
 completion = ["dep:clap_complete"]
 
 qrcode-decode-backend-rqrr = ["keyfork-qrcode/decode-backend-rqrr"]
@@ -48,6 +44,3 @@ openpgp-card-sequoia = { version = "0.2.0", default-features = false }
 openpgp-card = "0.4.1"
 clap_complete = { version = "4.4.6", optional = true }
 sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] }
-
-# necessary for enabling downstream feature flags
-bindgen = { version = "0.68.1", default-features = false }
diff --git a/vendor/nettle-sys-2.3.0/Cargo.toml b/vendor/nettle-sys-2.3.0/Cargo.toml
index 7c81f82..b44f2bf 100644
--- a/vendor/nettle-sys-2.3.0/Cargo.toml
+++ b/vendor/nettle-sys-2.3.0/Cargo.toml
@@ -41,10 +41,6 @@ dependencies = [
 [dependencies.libc]
 version = "0.2"
 
-[build-dependencies.bindgen]
-version = ">= 0.58.0, < 0.69.0"
-default-features = false
-
 [build-dependencies.cc]
 version = "1"
 
diff --git a/vendor/v4l2-sys-mit-0.3.0/Cargo.toml b/vendor/v4l2-sys-mit-0.3.0/Cargo.toml
index d8d39dc..568fde2 100644
--- a/vendor/v4l2-sys-mit-0.3.0/Cargo.toml
+++ b/vendor/v4l2-sys-mit-0.3.0/Cargo.toml
@@ -17,7 +17,3 @@ authors = ["Christopher N. Hesse <raymanfx@gmail.com>"]
 build = "build.rs"
 description = "Raw v4l2 bindings (MIT licensed)"
 license = "MIT"
-
-[build-dependencies.bindgen]
-version = "0.68.1"
-default-features = false