From 7d5a759bdda3a0ca030bbff28f4884c04adebcdd Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Tue, 18 Jul 2023 22:03:25 -0400
Subject: [PATCH 1/2] fix void builds

---
 packages/void_amd64_tfcli/build.sh    | 6 +++---
 packages/void_amd64_tfclient/build.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/void_amd64_tfcli/build.sh b/packages/void_amd64_tfcli/build.sh
index 4b5684e..51d3fc1 100755
--- a/packages/void_amd64_tfcli/build.sh
+++ b/packages/void_amd64_tfcli/build.sh
@@ -4,8 +4,8 @@ set -e
 cd $1 || exit
 cd tfcli || exit
 
-echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)"
-cargo build --release --target x86_64-unknown-linux-musl
+echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)"
+cargo build --release
 
 cd ../packages/void_amd64_tfcli || exit
 
@@ -17,7 +17,7 @@ mkdir -p work/etc/sv
 
 echo "Copying tfcli binary"
 
-cp ../../target/x86_64-unknown-linux-musl/release/tfcli work/usr/bin/tfcli
+cp ../../target/release/tfcli work/usr/bin/tfcli
 chmod 755 work/usr/bin/tfcli
 
 echo "Building XBPS package"
diff --git a/packages/void_amd64_tfclient/build.sh b/packages/void_amd64_tfclient/build.sh
index cc3aea7..7af9dbf 100755
--- a/packages/void_amd64_tfclient/build.sh
+++ b/packages/void_amd64_tfclient/build.sh
@@ -4,8 +4,8 @@ set -e
 cd $1 || exit
 cd tfclient || exit
 
-echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-musl)"
-cargo build --release --target x86_64-unknown-linux-musl
+echo "Building for release, v$2_$3 (+static) (--target x86_64-unknown-gnu)"
+cargo build --release
 
 cd ../packages/void_amd64_tfclient || exit
 
@@ -17,7 +17,7 @@ mkdir -p work/etc/sv
 
 echo "Copying tfclient binary"
 
-cp ../../target/x86_64-unknown-linux-musl/release/tfclient work/usr/bin/tfclient
+cp ../../target/release/tfclient work/usr/bin/tfclient
 chmod 755 work/usr/bin/tfclient
 cp -r tfclient work/etc/sv
 

From 5bb5b5fe4887dcaface2cda41786ae6c6efcdb75 Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Tue, 18 Jul 2023 22:06:21 -0400
Subject: [PATCH 2/2] bump versions and fix builds

---
 Cargo.lock            | 4 ++--
 nebula-ffi/Cargo.toml | 2 +-
 nebula-ffi/build.rs   | 2 +-
 tfclient/Cargo.toml   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ac1c0e3..c42f176 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2112,7 +2112,7 @@ dependencies = [
 
 [[package]]
 name = "nebula-ffi"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "bindgen",
  "gobuild",
@@ -3516,7 +3516,7 @@ dependencies = [
 
 [[package]]
 name = "tfclient"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "base64 0.21.2",
  "base64-serde",
diff --git a/nebula-ffi/Cargo.toml b/nebula-ffi/Cargo.toml
index 118e73a..e86140a 100644
--- a/nebula-ffi/Cargo.toml
+++ b/nebula-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nebula-ffi"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI."
 license = "GPL-3.0-or-later"
diff --git a/nebula-ffi/build.rs b/nebula-ffi/build.rs
index 4cfff8b..a085aba 100644
--- a/nebula-ffi/build.rs
+++ b/nebula-ffi/build.rs
@@ -15,7 +15,7 @@ fn main() {
         compiler = "go";
     }
 
-    gobuild::Build::new().compiler(compiler).buildmode(BuildMode::CShared).file("main.go").compile("nebulaffi");
+    gobuild::Build::new().compiler(compiler).buildmode(BuildMode::CArchive).file("main.go").compile("nebulaffi");
 
     println!("Go compile success");
 
diff --git a/tfclient/Cargo.toml b/tfclient/Cargo.toml
index b0fb595..e4fc438 100644
--- a/tfclient/Cargo.toml
+++ b/tfclient/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tfclient"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "An open-source reimplementation of a Defined Networking-compatible client"
 license = "GPL-3.0-or-later"