From 123eb761d4be64e7e78b9ce2f19e39fec9b69ce1 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 26 Nov 2021 00:27:30 +0100
Subject: [PATCH] Update to version 0.20.2

---
 .gitignore            |  1 +
 nix-fix-metadata.diff | 19 ++++++++++++++-----
 rust-nix0.20.spec     |  6 +++---
 sources               |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b400b4..26934e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nix-0.20.0.crate
+/nix-0.20.2.crate
diff --git a/nix-fix-metadata.diff b/nix-fix-metadata.diff
index 166411d..e81f700 100644
--- a/nix-fix-metadata.diff
+++ b/nix-fix-metadata.diff
@@ -1,9 +1,18 @@
---- nix-0.20.0/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ nix-0.20.0/Cargo.toml	2021-07-29T16:16:03.834607+00:00
-@@ -72,7 +72,3 @@
- version = "3.0.5"
- [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dev-dependencies.caps]
+--- nix-0.20.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ nix-0.20.2/Cargo.toml	2021-11-25T23:25:25.148820+00:00
+@@ -47,7 +47,7 @@
+ name = "test-ptymaster-drop"
+ path = "test/test_ptymaster_drop.rs"
+ [dependencies.bitflags]
+-version = ">= 1.1.0, < 1.3.0"
++version = "1.1.0"
+ 
+ [dependencies.cfg-if]
+ version = "1.0"
+@@ -73,7 +73,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-nix0.20.spec b/rust-nix0.20.spec
index f9c6bdf..4fabbcf 100644
--- a/rust-nix0.20.spec
+++ b/rust-nix0.20.spec
@@ -6,7 +6,7 @@
 %global crate nix
 
 Name:           rust-%{crate}0.20
-Version:        0.20.0
+Version:        0.20.2
 Release:        %autorelease
 Summary:        Rust friendly bindings to *nix APIs
 
@@ -15,6 +15,7 @@ License:        MIT
 URL:            https://crates.io/crates/nix
 Source:         %{crates_source}
 # Initial patched metadata
+# * relax bitflags dependency (compatibility with Rust < 1.46 is not required)
 # * drop DragonflyBSD/FreeBSD-specific dependencies
 Patch0:         nix-fix-metadata.diff
 
@@ -71,8 +72,7 @@ which use "default" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# skip a test that does not work in systemd-nspawn containers
-%cargo_test -- -- --skip sys::test_socket::test_vsock
+%cargo_test
 %endif
 
 %changelog
diff --git a/sources b/sources
index eaca245..709fbc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nix-0.20.0.crate) = 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
+SHA512 (nix-0.20.2.crate) = 585d78d51f000b88bdc2cf4433fd7135ac3103fa85d0e7b314871ade3c36ddf481622a7524e1ad69cfae5ff3c062feff2580271bf9944fb3b0e2bca73f5e8aa1