From a73625469ebf0b5bbd50afa69f9dac7d705eae12 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 29 Jul 2021 18:58:38 +0200
Subject: [PATCH] Update to version 0.22.0; Fixes RHBZ#1966238

---
 .gitignore            |  1 +
 nix-fix-metadata.diff | 10 +++++-----
 rust-nix.spec         | 12 ++++++------
 sources               |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5afe346..ac740bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /nix-0.18.0.crate
 /nix-0.19.1.crate
 /nix-0.20.0.crate
+/nix-0.22.0.crate
diff --git a/nix-fix-metadata.diff b/nix-fix-metadata.diff
index 2f607bf..62b5de7 100644
--- a/nix-fix-metadata.diff
+++ b/nix-fix-metadata.diff
@@ -1,9 +1,9 @@
---- nix-0.20.0/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ nix-0.20.0/Cargo.toml	2021-02-25T15:51:23.494252+00:00
-@@ -72,7 +72,3 @@
- version = "3.0.5"
- [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dev-dependencies.caps]
+--- nix-0.22.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ nix-0.22.0/Cargo.toml	2021-07-29T11:04:40.286153+00:00
+@@ -74,7 +74,3 @@
  version = "0.5.1"
+ [target."cfg(not(target_os = \"redox\"))".dependencies.memoffset]
+ version = "0.6.3"
 -[target."cfg(target_os = \"dragonfly\")".build-dependencies.cc]
 -version = "1"
 -[target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl]
diff --git a/rust-nix.spec b/rust-nix.spec
index 0969918..327f6c6 100644
--- a/rust-nix.spec
+++ b/rust-nix.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 18
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate nix
 
 Name:           rust-%{crate}
-Version:        0.20.0
+Version:        0.22.0
 Release:        %autorelease
 Summary:        Rust friendly bindings to *nix APIs
 
@@ -14,7 +14,7 @@ License:        MIT
 URL:            https://crates.io/crates/nix
 Source:         %{crates_source}
 # Initial patched metadata
-# * No dragonfly/freebsd
+# * drop DragonflyBSD/FreeBSD-specific dependencies
 Patch0:         nix-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
@@ -40,7 +40,7 @@ which use "%{crate}" crate.
 
 %files          devel
 %license LICENSE
-%doc CHANGELOG.md CONTRIBUTING.md CONVENTIONS.md README.md
+%doc README.md CONVENTIONS.md CONTRIBUTING.md CHANGELOG.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
 
 %package     -n %{name}+default-devel
@@ -70,8 +70,8 @@ which use "default" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# Testing parts are not distributed
-%cargo_test -- --doc
+# skip a test that tends to hang in systemd-nspawn environments
+%cargo_test -- -- --skip sys::test_socket::test_af_alg_aead
 %endif
 
 %changelog
diff --git a/sources b/sources
index eaca245..cc58301 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nix-0.20.0.crate) = 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
+SHA512 (nix-0.22.0.crate) = 73e18e87814dc98bb77f99705c45537afeadb04790c3db54a55688b3e925d3df5e7911282e997244316e310d5286ac10880b00487f706f9c7babde9225a4a14f