From 9913f89a2b4396305aa171ec32a8c458374c8fcf Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 15 Feb 2023 19:03:45 +0100
Subject: [PATCH] Update to version 0.23.2

---
 .gitignore                                    |  1 +
 0ac338b.patch                                 | 46 -------------------
 ...etadata.diff => nix-fix-metadata-auto.diff |  9 ++--
 rust-nix0.23.spec                             | 19 +++-----
 sources                                       |  2 +-
 5 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 0ac338b.patch
 rename nix-fix-metadata.diff => nix-fix-metadata-auto.diff (62%)

diff --git a/.gitignore b/.gitignore
index e332984..5e721f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nix-0.23.1.crate
+/nix-0.23.2.crate
diff --git a/0ac338b.patch b/0ac338b.patch
deleted file mode 100644
index 1819769..0000000
--- a/0ac338b.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0ac338b74445bf55ffd70d6bc85f4339d151f6fc Mon Sep 17 00:00:00 2001
-From: Alex Rawson <ajzecrom@gmail.com>
-Date: Tue, 31 May 2022 17:51:45 -0500
-Subject: [PATCH] Ignore doctests for unexported macros
-
-Due to rust-lang/rust#97030, cargo test will fail to doctest macros
-unless they are exported, breaking the examples for libc_bitflags! and
-libc_enum!.
-
-Adds `ignore` to the examples for these macros to stop tests from
-failing.
----
- src/macros.rs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/macros.rs b/src/macros.rs
-index 018534fa67..99e0de8866 100644
---- a/src/macros.rs
-+++ b/src/macros.rs
-@@ -19,7 +19,7 @@ macro_rules! feature {
- /// The `libc` crate must be in scope with the name `libc`.
- ///
- /// # Example
--/// ```
-+/// ```ignore
- /// libc_bitflags!{
- ///     pub struct ProtFlags: libc::c_int {
- ///         PROT_NONE;
-@@ -39,7 +39,7 @@ macro_rules! feature {
- /// various flags have different types, so we cast the broken ones to the right
- /// type.
- ///
--/// ```
-+/// ```ignore
- /// libc_bitflags!{
- ///     pub struct SaFlags: libc::c_ulong {
- ///         SA_NOCLDSTOP as libc::c_ulong;
-@@ -80,7 +80,7 @@ macro_rules! libc_bitflags {
- /// The `libc` crate must be in scope with the name `libc`.
- ///
- /// # Example
--/// ```
-+/// ```ignore
- /// libc_enum!{
- ///     pub enum ProtFlags {
- ///         PROT_NONE,
diff --git a/nix-fix-metadata.diff b/nix-fix-metadata-auto.diff
similarity index 62%
rename from nix-fix-metadata.diff
rename to nix-fix-metadata-auto.diff
index b4d107d..63e91fa 100644
--- a/nix-fix-metadata.diff
+++ b/nix-fix-metadata-auto.diff
@@ -1,10 +1,11 @@
---- nix-0.23.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ nix-0.23.1/Cargo.toml	2022-05-25T11:25:03.820763+00:00
-@@ -77,7 +77,3 @@
- version = "0.5.1"
+--- nix-0.23.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ nix-0.23.2/Cargo.toml	2023-02-15T18:04:00.338660+00:00
+@@ -102,8 +102,3 @@
  [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]
 -version = "0.1"
diff --git a/rust-nix0.23.spec b/rust-nix0.23.spec
index feab67b..9742096 100644
--- a/rust-nix0.23.spec
+++ b/rust-nix0.23.spec
@@ -1,26 +1,19 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate nix
 
-Name:           rust-%{crate}0.23
-Version:        0.23.1
+Name:           rust-nix0.23
+Version:        0.23.2
 Release:        %autorelease
 Summary:        Rust friendly bindings to *nix APIs
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/nix
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop DragonflyBSD/FreeBSD-specific dependencies
-Patch0:         nix-fix-metadata.diff
-
-# * upstream patch to fix doctests with Rust 1.62+
-Patch1:         https://github.com/nix-rust/nix/commit/0ac338b.patch
-
-ExclusiveArch:  %{rust_arches}
+# Automatically generated patch to strip foreign dependencies
+Patch:          nix-fix-metadata-auto.diff
 
 BuildRequires:  rust-packaging >= 21
 
@@ -71,7 +64,7 @@ use the "default" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# skip a test that is not supported in virtualized environments
+# * skip tests that don't work in mock environments
 %cargo_test -- -- --skip sys::test_socket::test_af_alg_cipher
 %endif
 
diff --git a/sources b/sources
index d4e664e..0c7d093 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nix-0.23.1.crate) = 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
+SHA512 (nix-0.23.2.crate) = 8617a5d99c9aa729f35b42b3797ea46e3c1779c234a836c7460cabdc7d4229b79c8772098b1b95f8b444351bcddd2729515a0433f68ea035087ef6a93033ce93