Update to version 0.12.3; Fixes RHBZ#1921589

2022-07-27 15:25:02 +02:00 · 2022-07-27 15:25:02 +02:00 · 07ab551e66
parent 75f8164045
commit 07ab551e66
6 changed files with 173 additions and 55 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@
 /procs-0.10.3.crate
 /procs-0.10.5.crate
 /procs-0.10.10.crate
+/procs-0.12.3.crate
--- a/LICENSE.dependencies
+++ b/LICENSE.dependencies
@ -0,0 +1,99 @@
+0BSD or MIT or ASL 2.0: rust-adler 1.0.2
+ASL 2.0 or MIT: rust-async-channel 1.6.1
+ASL 2.0 or MIT: rust-async-executor 1.4.1
+ASL 2.0 or MIT: rust-async-global-executor 2.2.0
+ASL 2.0 or MIT: rust-async-io 1.7.0
+ASL 2.0 or MIT: rust-async-lock 2.5.0
+ASL 2.0 or MIT: rust-async-std 1.12.0
+ASL 2.0 or MIT: rust-async-task 4.3.0
+ASL 2.0 or MIT: rust-atomic-waker 1.0.0
+ASL 2.0 or MIT: rust-autocfg 1.1.0
+ASL 2.0 or MIT: rust-blocking 1.2.0
+ASL 2.0 or MIT: rust-cache-padded 1.2.0
+ASL 2.0 or MIT: rust-concurrent-queue 1.2.3
+ASL 2.0 or MIT: rust-ctor 0.1.22
+ASL 2.0 or MIT: rust-event-listener 2.5.2
+ASL 2.0 or MIT: rust-fastrand 1.7.0
+ASL 2.0 or MIT: rust-futures-lite 1.12.0
+ASL 2.0 or MIT: rust-indexmap 1.9.1
+ASL 2.0 or MIT: rust-pager 0.16.0
+ASL 2.0 or MIT: rust-parking 2.0.0
+ASL 2.0 or MIT: rust-parking_lot0.11 0.11.2
+ASL 2.0 or MIT: rust-parking_lot_core0.8 0.8.5
+ASL 2.0 or MIT: rust-pin-project-lite 0.2.9
+ASL 2.0 or MIT: rust-polling 2.2.0
+ASL 2.0 or MIT: rust-signal-hook-registry 1.4.0
+ASL 2.0 or MIT: rust-signal-hook0.1 0.1.17
+ASL 2.0 or MIT: rust-value-bag 1.0.0~alpha.9
+ASL 2.0 or MIT: rust-waker-fn 1.1.0
+Apache-2.0: rust-getch 0.3.1
+BSD: rust-instant 0.1.12
+MIT OR Apache-2.0: rust-clap 3.2.12
+MIT OR Apache-2.0: rust-clap_complete 3.2.3
+MIT OR Apache-2.0: rust-clap_derive 3.2.7
+MIT OR Apache-2.0: rust-clap_lex 0.2.4
+MIT OR Apache-2.0: rust-procfs 0.12.0
+MIT or ASL 2.0: rust-anyhow 1.0.58
+MIT or ASL 2.0: rust-bitflags 1.3.2
+MIT or ASL 2.0: rust-cfg-if 1.0.0
+MIT or ASL 2.0: rust-chrono 0.4.19
+MIT or ASL 2.0: rust-crc32fast 1.3.2
+MIT or ASL 2.0: rust-crossbeam-utils 0.8.10
+MIT or ASL 2.0: rust-directories 4.0.1
+MIT or ASL 2.0: rust-dirs-sys 0.3.7
+MIT or ASL 2.0: rust-either 1.7.0
+MIT or ASL 2.0: rust-errno 0.2.8
+MIT or ASL 2.0: rust-flate2 1.0.22
+MIT or ASL 2.0: rust-futures-core 0.3.21
+MIT or ASL 2.0: rust-futures-io 0.3.21
+MIT or ASL 2.0: rust-hashbrown 0.12.3
+MIT or ASL 2.0: rust-heck 0.4.0
+MIT or ASL 2.0: rust-hex 0.4.3
+MIT or ASL 2.0: rust-kv-log-macro 1.0.7
+MIT or ASL 2.0: rust-lazy_static 1.4.0
+MIT or ASL 2.0: rust-libc 0.2.126
+MIT or ASL 2.0: rust-lock_api 0.4.7
+MIT or ASL 2.0: rust-log 0.4.17
+MIT or ASL 2.0: rust-num-integer 0.1.45
+MIT or ASL 2.0: rust-num-traits 0.2.15
+MIT or ASL 2.0: rust-num_cpus 1.13.1
+MIT or ASL 2.0: rust-once_cell 1.13.0
+MIT or ASL 2.0: rust-os_str_bytes 6.1.0
+MIT or ASL 2.0: rust-pin-utils 0.1.0
+MIT or ASL 2.0: rust-proc-macro-error 1.0.4
+MIT or ASL 2.0: rust-proc-macro-error-attr 1.0.4
+MIT or ASL 2.0: rust-proc-macro2 1.0.40
+MIT or ASL 2.0: rust-quote 1.0.20
+MIT or ASL 2.0: rust-regex 1.6.0
+MIT or ASL 2.0: rust-regex-syntax 0.6.27
+MIT or ASL 2.0: rust-scopeguard 1.1.0
+MIT or ASL 2.0: rust-serde 1.0.139
+MIT or ASL 2.0: rust-serde_derive 1.0.139
+MIT or ASL 2.0: rust-smallvec 1.9.0
+MIT or ASL 2.0: rust-socket2 0.4.4
+MIT or ASL 2.0: rust-syn 1.0.98
+MIT or ASL 2.0: rust-termbg 0.4.1
+MIT or ASL 2.0: rust-terminal_size 0.1.17
+MIT or ASL 2.0: rust-thiserror 1.0.31
+MIT or ASL 2.0: rust-thiserror-impl 1.0.31
+MIT or ASL 2.0: rust-time0.1 0.1.44
+MIT or ASL 2.0: rust-toml 0.5.9
+MIT or ASL 2.0: rust-unicode-ident 1.0.1
+MIT or ASL 2.0: rust-unicode-width 0.1.9
+MIT or ASL 2.0: rust-version_check 0.9.4
+MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4
+MIT: rust-atty 0.2.14
+MIT: rust-byte-unit 4.0.14
+MIT: rust-console 0.15.0
+MIT: rust-crossterm0.19 0.19.0
+MIT: rust-mio0.7 0.7.14
+MIT: rust-slab 0.4.7
+MIT: rust-strsim 0.10.0
+MIT: rust-termios 0.3.3
+MIT: rust-textwrap 0.15.0
+MIT: rust-users 0.11.0
+MIT: rust-utf8-width 0.1.6
+MIT: rust-which 4.2.5
+Unlicense or MIT: rust-byteorder 1.4.3
+Unlicense or MIT: rust-memchr 2.5.0
+Unlicense or MIT: rust-termcolor 1.1.3
--- a/procs-fix-metadata-auto.diff
+++ b/procs-fix-metadata-auto.diff
@ -0,0 +1,36 @@
+--- procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
+++ procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -146,33 +146,6 @@
+ [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.which]
+ version = "4"
+ 
+-[target."cfg(target_os = \"macos\")".dependencies.errno]
+-version = "0.2"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.libproc]
+-version = "0.12"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.pager]
+-version = "0.16"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.users]
+-version = "0.11"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.which]
+-version = "4"
+-
+-[target."cfg(target_os = \"windows\")".dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "handleapi",
+-    "minwindef",
+-    "psapi",
+-    "securitybaseapi",
+-    "tlhelp32",
+-    "winbase",
+-    "winnt",
+-]
+-
+ [badges.codecov]
+ branch = "master"
+ repository = "dalance/procs"
--- a/procs-fix-metadata.diff
+++ b/procs-fix-metadata.diff
@ -1,47 +1,23 @@
--- procs-0.10.10/Cargo.toml	2020-11-26T01:18:03+00:00
-+++ procs-0.10.10/Cargo.toml	2020-12-15T20:47:21.423279+00:00
-@@ -81,10 +81,6 @@
+--- procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
+++ procs-0.12.3/Cargo.toml	2022-07-27T11:22:26.812654+00:00
+@@ -102,10 +102,6 @@
 [dependencies.directories]
- version = "3"
+ version = "4.0.1"
 
 -[dependencies.dockworker]
-version = "0.0.19"
+-version = "0.0.23"
 -optional = true
 -
 [dependencies.getch]
- version = "0.2"
+ version = "0.3.1"
 
-@@ -109,9 +105,6 @@
- [dependencies.unicode-width]
+@@ -131,8 +127,7 @@
 version = "0.1"
 
-[features]
+ [features]
 -default = ["docker"]
 -docker = ["dockworker"]
- [target."cfg(target_os = \"linux\")".dependencies.pager]
+default = []
+ 
+ [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.pager]
 version = "0.16"
- 
-@@ -123,23 +116,7 @@
- 
- [target."cfg(target_os = \"linux\")".dependencies.which]
- version = "4"
-[target."cfg(target_os = \"macos\")".dependencies.errno]
-version = "0.2"
- 
-[target."cfg(target_os = \"macos\")".dependencies.libproc]
-version = "0.9"
-
-[target."cfg(target_os = \"macos\")".dependencies.pager]
-version = "0.16"
-
-[target."cfg(target_os = \"macos\")".dependencies.users]
-version = "0.11"
-
-[target."cfg(target_os = \"macos\")".dependencies.which]
-version = "4"
-[target."cfg(target_os = \"windows\")".dependencies.winapi]
-version = "0.3"
-features = ["handleapi", "minwindef", "psapi", "securitybaseapi", "tlhelp32", "winbase", "winnt"]
- [badges.codecov]
- branch = "master"
- repository = "dalance/procs"
--- a/rust-procs.spec
+++ b/rust-procs.spec
@ -1,26 +1,26 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 22
 %bcond_without check
-%global __cargo_skip_build 0

 %global crate procs

-Name:           rust-%{crate}
-Version:        0.10.10
+Name:           rust-procs
+Version:        0.12.3
 Release:        %autorelease
 Summary:        Modern replacement for ps

-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/procs
-Source:         %{crates_source}
-# Initial patched metadata
-# * No windows/macos
-# * Remove docker feature
-Patch0:         procs-fix-metadata.diff
+Source0:        %{crates_source}
+Source1:        LICENSE.dependencies
+# Automatically generated patch to strip foreign dependencies
+Patch:          procs-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+# * remove docker feature / dockworker dependency
+Patch:          procs-fix-metadata.diff

 ExclusiveArch:  %{rust_arches}

-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21

 %global _description %{expand:
 Modern replacement for ps.}
@ -29,23 +29,29 @@ Modern replacement for ps.}

 %package     -n %{crate}
 Summary:        %{summary}
-# * ASL 2.0
-# * ASL 2.0 or MIT
-# * MIT
-# * MIT or ASL 2.0
-# * Unlicense or MIT
-# * zlib
-License:        MIT and ASL 2.0 and zlib
+# 0BSD or MIT or ASL 2.0
+# ASL 2.0 or MIT
+# ASL 2.0
+# BSD
+# MIT
+# MIT or ASL 2.0
+# MIT or zlib or ASL 2.0
+# Unlicense or MIT
+License:        MIT and ASL 2.0 and BSD
+# LICENSE.dependencies contains a full license breakdown

 %description -n %{crate} %{_description}

 %files       -n %{crate}
 %license LICENSE
-%doc README.md CHANGELOG.md
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc README.md
 %{_bindir}/procs

 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+cp %{SOURCE1} .
 %cargo_prep

 %generate_buildrequires
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (procs-0.10.10.crate) = fd821e43473e10842337172dac0a6b0886d7e6d7c8d9e25da0425157da2e36b16414c987c3bcb7ea34ff931244210ce6b996309aa1592acd383e19f7fd21d66b
+SHA512 (procs-0.12.3.crate) = fe5c476c4f0d2fc1c86e2c3beb740db20330579ea34521866766d2b87e8188f5f65ffb944f3598413da58bc06ec0804c557b28e5c14ce0f2982681f06cc893e4