From eeb7b00576329eaee7ccfb5e254cb749c7529d0a Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 14 Jan 2022 11:49:50 +0100
Subject: [PATCH] Update to version 0.23.1; Fixes RHBZ#2033511

---
 .gitignore            |  1 +
 nix-fix-metadata.diff | 15 +++------------
 rust-nix.spec         | 22 +++++++++-------------
 sources               |  2 +-
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 66fed41..aae70f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /nix-0.22.0.crate
 /nix-0.22.1.crate
 /nix-0.22.2.crate
+/nix-0.23.1.crate
diff --git a/nix-fix-metadata.diff b/nix-fix-metadata.diff
index f201cf2..b3b0207 100644
--- a/nix-fix-metadata.diff
+++ b/nix-fix-metadata.diff
@@ -1,15 +1,6 @@
---- nix-0.22.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ nix-0.22.2/Cargo.toml	2021-11-25T23:20:05.828064+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 @@
+--- nix-0.23.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ nix-0.23.1/Cargo.toml	2022-01-11T11:19:42.208257+00:00
+@@ -77,7 +77,3 @@
  version = "0.5.1"
  [target."cfg(not(target_os = \"redox\"))".dependencies.memoffset]
  version = "0.6.3"
diff --git a/rust-nix.spec b/rust-nix.spec
index e2831e9..c273aac 100644
--- a/rust-nix.spec
+++ b/rust-nix.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 20
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate nix
 
 Name:           rust-%{crate}
-Version:        0.22.2
+Version:        0.23.1
 Release:        %autorelease
 Summary:        Rust friendly bindings to *nix APIs
 
@@ -14,14 +14,10 @@ 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
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
 BuildRequires:  rust-packaging
 
@@ -36,12 +32,12 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
 %license LICENSE
-%doc README.md CONVENTIONS.md CONTRIBUTING.md CHANGELOG.md
+%doc CHANGELOG.md README.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
 
 %package     -n %{name}+default-devel
@@ -50,8 +46,8 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
@@ -71,8 +67,8 @@ which use "default" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# skip a test that tends to hang in systemd-nspawn environments
-%cargo_test -- -- --skip sys::test_socket::test_af_alg_aead
+# skip a test that is not supported in virtualized environments
+%cargo_test -- -- --skip sys::test_socket::test_af_alg_cipher
 %endif
 
 %changelog
diff --git a/sources b/sources
index b001b9a..d4e664e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nix-0.22.2.crate) = 860c6cfe77117c28ea54fc5587a125e8ab14acec2dcf77f70d3e43ea574f5272ebb05999b266142616bd92aa613f8c2f60b026b95e758975601df9345a2dbf71
+SHA512 (nix-0.23.1.crate) = 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6