From 3e601f72f4be173b227d195f17fd1041f9fa5d68 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Fri, 29 Dec 2023 14:55:48 -0600
Subject: [PATCH] Update to 0.22.0

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 .gitignore                           | 1 +
 libbpf-rs-fix-metadata.diff          | 6 +++---
 libbpf-rs-restrict-probe-arches.diff | 4 ++--
 rust-libbpf-rs.spec                  | 8 ++++----
 sources                              | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac63443..1193783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /libbpf-rs-0.16.0.crate
 /libbpf-rs-0.19.1.crate
 /libbpf-rs-0.21.2.crate
+/libbpf-rs-0.22.0.crate
diff --git a/libbpf-rs-fix-metadata.diff b/libbpf-rs-fix-metadata.diff
index e339935..dada278 100644
--- a/libbpf-rs-fix-metadata.diff
+++ b/libbpf-rs-fix-metadata.diff
@@ -1,6 +1,6 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -78,8 +78,8 @@ version = "0.1.1"
+--- libbpf-rs-0.22.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ libbpf-rs-0.22.0/Cargo.toml	2023-12-29T20:52:37.035784+00:00
+@@ -78,8 +78,8 @@
  [dev-dependencies.plain]
  version = "0.2.3"
  
diff --git a/libbpf-rs-restrict-probe-arches.diff b/libbpf-rs-restrict-probe-arches.diff
index 09fce01..e155da6 100644
--- a/libbpf-rs-restrict-probe-arches.diff
+++ b/libbpf-rs-restrict-probe-arches.diff
@@ -8,7 +8,7 @@
  use probe::probe;
  use scopeguard::defer;
  use std::ptr;
-@@ -1136,6 +1137,7 @@ fn test_sudo_object_map_handle_clone() {
+@@ -1237,6 +1238,7 @@ fn test_sudo_object_map_handle_clone() {
  }
  
  #[test]
@@ -16,7 +16,7 @@
  fn test_sudo_object_usdt() {
      bump_rlimit_mlock();
  
-@@ -1165,6 +1167,7 @@ fn test_sudo_object_usdt() {
+@@ -1266,6 +1268,7 @@ fn test_sudo_object_usdt() {
  }
  
  #[test]
diff --git a/rust-libbpf-rs.spec b/rust-libbpf-rs.spec
index b41e1b0..afcdaa3 100644
--- a/rust-libbpf-rs.spec
+++ b/rust-libbpf-rs.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate libbpf-rs
 
 Name:           rust-libbpf-rs
-Version:        0.21.2
+Version:        0.22.0
 Release:        %autorelease
 Summary:        Safe, idiomatic, and opinionated wrapper around libbpf-sys
 
@@ -19,7 +19,7 @@ Patch:          libbpf-rs-fix-metadata.diff
 # * restrict probe tests to architectures that support inline assembly
 Patch:          libbpf-rs-restrict-probe-arches.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Libbpf-rs is a safe, idiomatic, and opinionated wrapper around libbpf-
@@ -81,7 +81,7 @@ use the "static" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
diff --git a/sources b/sources
index 90a9647..ca9946b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libbpf-rs-0.21.2.crate) = d1f5f5fbfbd1b1674b47799de5dcfd24208b0c9b79dc772e8e6a26f89071d586bb99fb20d3b0d4f1f9f48928d9bcba9889982c8845533e98183eda56c2949ce8
+SHA512 (libbpf-rs-0.22.0.crate) = 6eeef04eb2131d0f497837b09f814272c150c08b243e113274d0391dccf1b68895735f2d7dc15a06bbafd81f53bb705e0046f56bb74d3d99dafb73157c609521