From dcf4596454f679151e21bdf771eea54fd3930aa2 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 10 Dec 2022 21:25:54 +0100
Subject: [PATCH] Update to version 0.8.5; Fixes RHBZ#2137380

---
 .gitignore                 |  1 +
 mio-fix-metadata-auto.diff | 24 ++++++++++++++++++++++++
 mio-fix-metadata.diff      | 23 +++--------------------
 rust-mio.spec              | 16 +++++++---------
 rust2rpm.conf              |  2 ++
 sources                    |  2 +-
 6 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 mio-fix-metadata-auto.diff
 create mode 100644 rust2rpm.conf

diff --git a/.gitignore b/.gitignore
index 25671f4..289045c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /mio-0.8.2.crate
 /mio-0.8.3.crate
 /mio-0.8.4.crate
+/mio-0.8.5.crate
diff --git a/mio-fix-metadata-auto.diff b/mio-fix-metadata-auto.diff
new file mode 100644
index 0000000..68c5aa2
--- /dev/null
+++ b/mio-fix-metadata-auto.diff
@@ -0,0 +1,24 @@
+--- mio-0.8.5/Cargo.toml	1970-01-01T00:00:01+00:00
++++ mio-0.8.5/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -106,21 +106,6 @@
+ ]
+ os-poll = []
+ 
+-[target."cfg(target_os = \"wasi\")".dependencies.libc]
+-version = "0.2.121"
+-
+-[target."cfg(target_os = \"wasi\")".dependencies.wasi]
+-version = "0.11.0"
+-
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.121"
+ 
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.42"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_Networking_WinSock",
+-    "Win32_Storage_FileSystem",
+-    "Win32_System_IO",
+-    "Win32_System_WindowsProgramming",
+-]
diff --git a/mio-fix-metadata.diff b/mio-fix-metadata.diff
index 4368829..4b55207 100644
--- a/mio-fix-metadata.diff
+++ b/mio-fix-metadata.diff
@@ -1,6 +1,6 @@
---- mio-0.8.4/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ mio-0.8.4/Cargo.toml	2022-07-15T11:21:45.038421+00:00
-@@ -99,28 +99,8 @@
+--- mio-0.8.5/Cargo.toml	1970-01-01T00:00:01+00:00
++++ mio-0.8.5/Cargo.toml	2022-12-10T20:24:02.418369+00:00
+@@ -99,11 +99,7 @@
  [features]
  default = []
  net = []
@@ -11,22 +11,5 @@
 -]
 +os-ext = ["os-poll"]
  os-poll = []
--
--[target."cfg(target_os = \"wasi\")".dependencies.libc]
--version = "0.2.121"
--
--[target."cfg(target_os = \"wasi\")".dependencies.wasi]
--version = "0.11.0"
  
  [target."cfg(unix)".dependencies.libc]
- version = "0.2.121"
--
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.36"
--features = [
--    "Win32_Storage_FileSystem",
--    "Win32_Foundation",
--    "Win32_Networking_WinSock",
--    "Win32_System_IO",
--    "Win32_System_WindowsProgramming",
--]
diff --git a/rust-mio.spec b/rust-mio.spec
index d3f3632..2278ff1 100644
--- a/rust-mio.spec
+++ b/rust-mio.spec
@@ -1,23 +1,21 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 23
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate mio
 
-Name:           rust-%{crate}
-Version:        0.8.4
+Name:           rust-mio
+Version:        0.8.5
 Release:        %autorelease
 Summary:        Lightweight non-blocking IO
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/mio
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop WASI- and Windows-specific dependencies
-Patch0:         mio-fix-metadata.diff
-
-ExclusiveArch:  %{rust_arches}
+# Automatically generated patch to strip foreign dependencies
+Patch:          mio-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+Patch:          mio-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
 
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..f626714
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+all-features = true
diff --git a/sources b/sources
index 7a2a14a..5e15693 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mio-0.8.4.crate) = b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
+SHA512 (mio-0.8.5.crate) = e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede