From 9f682ef2db05052bf7384c467e40fd856bdff7eb Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Thu, 11 Nov 2021 07:37:35 -0800
Subject: [PATCH] Update to 0.14.0; Fixes: RHBZ#2022163

---
 .gitignore                           |  1 +
 libbpf-rs-downgrade-libbpf-sys.patch | 12 +++++++-----
 libbpf-rs-fix-metadata.diff          |  4 ++--
 rust-libbpf-rs.spec                  |  2 +-
 sources                              |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 792f9cd..ec9dee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /libbpf-rs-0.11.1.crate
 /libbpf-rs-0.11.2.crate
 /libbpf-rs-0.13.0.crate
+/libbpf-rs-0.14.0.crate
diff --git a/libbpf-rs-downgrade-libbpf-sys.patch b/libbpf-rs-downgrade-libbpf-sys.patch
index 99ee96b..65ac57d 100644
--- a/libbpf-rs-downgrade-libbpf-sys.patch
+++ b/libbpf-rs-downgrade-libbpf-sys.patch
@@ -1,23 +1,25 @@
 diff -Naur a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml	2021-10-24 12:22:44.163859672 -0700
-+++ b/Cargo.toml	2021-10-24 12:21:45.897083132 -0700
+--- a/Cargo.toml	2021-11-11 07:42:21.207106426 -0800
++++ b/Cargo.toml	2021-11-11 07:42:30.520155695 -0800
 @@ -24,7 +24,7 @@
  version = "1.3"
  
  [dependencies.libbpf-sys]
--version = "0.5.0-1"
+-version = "0.5.0-2"
 +version = "0.4.0-2"
  
  [dependencies.nix]
  version = "0.22"
 diff -Naur a/src/object.rs b/src/object.rs
 --- a/src/object.rs	1973-11-29 13:33:09.000000000 -0800
-+++ b/src/object.rs	2021-10-24 12:21:56.128219497 -0700
-@@ -67,7 +67,6 @@
++++ b/src/object.rs	2021-11-11 07:42:35.465181855 -0800
+@@ -67,9 +67,6 @@
              pin_root_path: ptr::null(),
              attach_prog_fd: 0,
              kconfig: ptr::null(),
 -            btf_custom_path: ptr::null(),
+-            __bindgen_padding_0: <[u8; 6]>::default(),
+-            __bindgen_padding_1: <[u8; 4]>::default(),
          }
      }
  
diff --git a/libbpf-rs-fix-metadata.diff b/libbpf-rs-fix-metadata.diff
index aa61a6e..cc12c7a 100644
--- a/libbpf-rs-fix-metadata.diff
+++ b/libbpf-rs-fix-metadata.diff
@@ -1,5 +1,5 @@
---- libbpf-rs-0.13.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ libbpf-rs-0.13.0/Cargo.toml	2021-10-14T20:12:29.992478+00:00
+--- libbpf-rs-0.14.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ libbpf-rs-0.14.0/Cargo.toml	2021-11-11T15:36:19.239207+00:00
 @@ -50,6 +50,7 @@
  version = "1.1"
  
diff --git a/rust-libbpf-rs.spec b/rust-libbpf-rs.spec
index 695c3c6..d65d358 100644
--- a/rust-libbpf-rs.spec
+++ b/rust-libbpf-rs.spec
@@ -6,7 +6,7 @@
 %global crate libbpf-rs
 
 Name:           rust-%{crate}
-Version:        0.13.0
+Version:        0.14.0
 Release:        %autorelease
 Summary:        Safe, idiomatic, and opinionated wrapper around libbpf-sys
 
diff --git a/sources b/sources
index de7e3a9..70245d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libbpf-rs-0.13.0.crate) = b537342e95b5e3427784ee9a9b8042670cf5491b586c31c23645881ee9646c6015590e270bdb49524939ffd280d076789c42409fa6eebfaf51ef54fb869e3d26
+SHA512 (libbpf-rs-0.14.0.crate) = a1400f76939c17a608396ddd3bd9c565df16e0515fc397f1b7e6f72c6145eae7b239bd3b06c0e3803ee815666f9ad546ff53ca718892fc25132ec87292df0358