From 851ac904dbbc093cba97b2779d84480fc7b0ac8a Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Thu, 25 Jan 2024 14:40:52 +0100
Subject: [PATCH] update to nftables release 0.3 from crates.io

This allows us to publish on crates.io as well.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 Cargo.lock        | 15 ++++++++-------
 Cargo.toml        |  2 +-
 DISTRO_PACKAGE.md |  5 -----
 rpm/netavark.spec |  5 -----
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 980264a05..0676d3001 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1454,8 +1454,9 @@ dependencies = [
 
 [[package]]
 name = "nftables"
-version = "0.2.4"
-source = "git+https://github.com/namib-project/nftables-rs.git?rev=1b0c60b#1b0c60ba287cbfc65546d86fbf07d6f26dbeba24"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d11bb5c74ea03d97b6eaed2a30a81657d9884152c661d28d44b4d22616b652"
 dependencies = [
  "serde",
  "serde_json",
@@ -2043,21 +2044,21 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strum"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
 [[package]]
 name = "strum_macros"
-version = "0.24.3"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.109",
+ "syn 2.0.46",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7446ee35f..4758164a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ sha2 = "0.10.8"
 netlink-packet-utils = "0.5.2"
 netlink-packet-route = "0.18.1"
 netlink-packet-core = "0.7.0"
-nftables = { git = "https://github.com/namib-project/nftables-rs.git", rev = "1b0c60b" }
+nftables = "0.3"
 fs2 = "0.4.3"
 netlink-sys = "0.8.5"
 tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "signal", "fs"] }
diff --git a/DISTRO_PACKAGE.md b/DISTRO_PACKAGE.md
index 91111091b..662803af1 100644
--- a/DISTRO_PACKAGE.md
+++ b/DISTRO_PACKAGE.md
@@ -47,11 +47,6 @@ And then create a cargo config file to point it to the vendor dir.
 tar xvf %{SOURCE}
 mkdir -p .cargo
 cat >.cargo/config << EOF
-[source."git+https://github.com/namib-project/nftables-rs.git?rev=1b0c60b"]
-git = "https://github.com/namib-project/nftables-rs.git"
-rev = "1b0c60b"
-replace-with = "vendored-sources"
-
 [source.crates-io]
 replace-with = "vendored-sources"
 
diff --git a/rpm/netavark.spec b/rpm/netavark.spec
index 176ee820d..8593b88be 100644
--- a/rpm/netavark.spec
+++ b/rpm/netavark.spec
@@ -88,11 +88,6 @@ tar fx %{SOURCE1}
 mkdir -p .cargo
 
 cat >.cargo/config << EOF
-[source."git+https://github.com/namib-project/nftables-rs.git?rev=1b0c60b"]
-git = "https://github.com/namib-project/nftables-rs.git"
-rev = "1b0c60b"
-replace-with = "vendored-sources"
-
 [source.crates-io]
 replace-with = "vendored-sources"