From bc93ad6a80f09a57d2b135a1551f679ed89d5927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <deso@posteo.net>
Date: Fri, 27 Jan 2023 09:31:12 -0800
Subject: [PATCH] Update goblin dependency to 0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are using an outdated version of the goblin dependency and that in
turn is causing some dependencies to be pulled in in duplicate versions.
Let's use the most recent release, 0.6.

Signed-off-by: Daniel Müller <deso@posteo.net>
---
 Cargo.lock              | 29 ++++++-----------------------
 libbpf-cargo/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3cbc2195..de6839be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,13 +155,13 @@ dependencies = [
 
 [[package]]
 name = "goblin"
-version = "0.4.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926"
+checksum = "572564d6cba7d09775202c8e7eebc4d534d5ae36578ab402fb21e182a0ac9505"
 dependencies = [
  "log",
  "plain",
- "scroll 0.10.2",
+ "scroll",
 ]
 
 [[package]]
@@ -229,8 +229,8 @@ dependencies = [
  "memmap2",
  "num_enum",
  "regex",
- "scroll 0.11.0",
- "scroll_derive 0.11.0",
+ "scroll",
+ "scroll_derive",
  "semver",
  "serde",
  "serde_json",
@@ -634,30 +634,13 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "scroll"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
-dependencies = [
- "scroll_derive 0.10.5",
-]
-
 [[package]]
 name = "scroll"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
-
-[[package]]
-name = "scroll_derive"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "scroll_derive",
 ]
 
 [[package]]
diff --git a/libbpf-cargo/Cargo.toml b/libbpf-cargo/Cargo.toml
index 53f0a6ce..b30240ac 100644
--- a/libbpf-cargo/Cargo.toml
+++ b/libbpf-cargo/Cargo.toml
@@ -47,4 +47,4 @@ thiserror = "1.0"
 clap = { version = "3.1", default-features = false, features = ["std", "derive"] }
 
 [dev-dependencies]
-goblin = "0.4"
+goblin = "0.6"