From 3f58b1d8d683bfbe3059daa6d9f8e02e642b4a1d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 10 Jan 2022 16:07:45 +0100 Subject: [PATCH 1/7] Update to version 0.9.6; Fixes RHBZ#2038605 --- .gitignore | 1 + crossbeam-epoch-fix-metadata.diff | 6 +++--- rust-crossbeam-epoch.spec | 21 +++++++++------------ sources | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index b1b1211..57a5e15 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /crossbeam-epoch-0.9.3.crate /crossbeam-epoch-0.9.4.crate /crossbeam-epoch-0.9.5.crate +/crossbeam-epoch-0.9.6.crate diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff index e7e7d5f..2d0baca 100644 --- a/crossbeam-epoch-fix-metadata.diff +++ b/crossbeam-epoch-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.5/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ crossbeam-epoch-0.9.5/Cargo.toml 2021-06-02T10:38:03.846851+00:00 -@@ -49,10 +49,5 @@ +--- crossbeam-epoch-0.9.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.6/Cargo.toml 2022-01-10T14:59:03.455090+00:00 +@@ -47,10 +47,5 @@ [features] alloc = [] default = ["std"] diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index 56613ba..fe06826 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch Name: rust-%{crate} -Version: 0.9.5 +Version: 0.9.6 Release: %autorelease Summary: Epoch-based garbage collection @@ -18,9 +18,6 @@ Source: %{crates_source} Patch0: crossbeam-epoch-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,7 +33,7 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel %license LICENSE-APACHE LICENSE-MIT @@ -50,7 +47,7 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages which -use "the default" feature of the "%{crate}" crate. +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -62,7 +59,7 @@ BuildArch: noarch %description -n %{name}+alloc-devel %{_description} This package contains library source intended for building other packages which -use "the alloc" feature of the "%{crate}" crate. +use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -74,7 +71,7 @@ BuildArch: noarch %description -n %{name}+const_fn-devel %{_description} This package contains library source intended for building other packages which -use "the const_fn" feature of the "%{crate}" crate. +use the "const_fn" feature of the "%{crate}" crate. %files -n %{name}+const_fn-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -86,7 +83,7 @@ BuildArch: noarch %description -n %{name}+lazy_static-devel %{_description} This package contains library source intended for building other packages which -use "the lazy_static" feature of the "%{crate}" crate. +use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -98,7 +95,7 @@ BuildArch: noarch %description -n %{name}+nightly-devel %{_description} This package contains library source intended for building other packages which -use "the nightly" feature of the "%{crate}" crate. +use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -110,7 +107,7 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} This package contains library source intended for building other packages which -use "the std" feature of the "%{crate}" crate. +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 2bbe40c..77d5e7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.5.crate) = ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064 +SHA512 (crossbeam-epoch-0.9.6.crate) = 5a91cc7ab84b802b9b2d74760b548da9c07e13a1926b9c772c3fb0e8003a27e4d7043c400106175b5009b93aaeaff4ce758a758aa6866d6c60c4c67813481e04 From df9fb8625008d00de8aba4cea15f5b1c3b8a3bb2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 8 Feb 2022 00:51:05 +0100 Subject: [PATCH 3/7] Update to version 0.9.7; Fixes RHBZ#2050975 --- .gitignore | 1 + crossbeam-epoch-fix-metadata.diff | 21 +++++++++++++++------ rust-crossbeam-epoch.spec | 2 +- sources | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 57a5e15..ab00017 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /crossbeam-epoch-0.9.4.crate /crossbeam-epoch-0.9.5.crate /crossbeam-epoch-0.9.6.crate +/crossbeam-epoch-0.9.7.crate diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff index 2d0baca..5f5dd74 100644 --- a/crossbeam-epoch-fix-metadata.diff +++ b/crossbeam-epoch-fix-metadata.diff @@ -1,12 +1,21 @@ ---- crossbeam-epoch-0.9.6/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.6/Cargo.toml 2022-01-10T14:59:03.455090+00:00 -@@ -47,10 +47,5 @@ +--- crossbeam-epoch-0.9.7/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.7/Cargo.toml 2022-02-07T23:47:08.269932+00:00 +@@ -58,10 +58,6 @@ [features] alloc = [] default = ["std"] --loom = ["loom-crate", "crossbeam-utils/loom"] - nightly = ["crossbeam-utils/nightly", "const_fn"] - std = ["alloc", "crossbeam-utils/std", "lazy_static"] +-loom = [ +- "loom-crate", +- "crossbeam-utils/loom", +-] + nightly = [ + "crossbeam-utils/nightly", + "const_fn", +@@ -71,8 +67,3 @@ + "crossbeam-utils/std", + "lazy_static", + ] +- -[target."cfg(crossbeam_loom)".dependencies.loom-crate] -version = "0.5" -optional = true diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index fe06826..b3bb050 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -5,7 +5,7 @@ %global crate crossbeam-epoch Name: rust-%{crate} -Version: 0.9.6 +Version: 0.9.7 Release: %autorelease Summary: Epoch-based garbage collection diff --git a/sources b/sources index 77d5e7c..4ed0581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.6.crate) = 5a91cc7ab84b802b9b2d74760b548da9c07e13a1926b9c772c3fb0e8003a27e4d7043c400106175b5009b93aaeaff4ce758a758aa6866d6c60c4c67813481e04 +SHA512 (crossbeam-epoch-0.9.7.crate) = f6afc55b8624fd3d4f8b0fa5f949360b7e205f7f5be92c248acc102d761e8cd1facac0e40be2f507379c824ce2bfefbf6aea6e8a87eb2ba1c20f928bb9dcc0a9 From 046821ea929588ab8f05bad4ed036d237a67f08e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 29 Mar 2022 13:03:17 +0200 Subject: [PATCH 4/7] Update to version 0.9.8; Fixes RHBZ#2064278 --- .gitignore | 1 + crossbeam-epoch-fix-metadata.diff | 13 ++++++----- rust-crossbeam-epoch.spec | 36 +++++++++++-------------------- sources | 2 +- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index ab00017..fff07e7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /crossbeam-epoch-0.9.5.crate /crossbeam-epoch-0.9.6.crate /crossbeam-epoch-0.9.7.crate +/crossbeam-epoch-0.9.8.crate diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff index 5f5dd74..6e1115a 100644 --- a/crossbeam-epoch-fix-metadata.diff +++ b/crossbeam-epoch-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.7/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.7/Cargo.toml 2022-02-07T23:47:08.269932+00:00 -@@ -58,10 +58,6 @@ +--- crossbeam-epoch-0.9.8/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.8/Cargo.toml 2022-03-29T11:01:54.567202+00:00 +@@ -60,18 +60,9 @@ [features] alloc = [] default = ["std"] @@ -8,10 +8,9 @@ - "loom-crate", - "crossbeam-utils/loom", -] - nightly = [ - "crossbeam-utils/nightly", - "const_fn", -@@ -71,8 +67,3 @@ + nightly = ["crossbeam-utils/nightly"] + std = [ + "alloc", "crossbeam-utils/std", "lazy_static", ] diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index b3bb050..bc14293 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch Name: rust-%{crate} -Version: 0.9.7 +Version: 0.9.8 Release: %autorelease Summary: Epoch-based garbage collection @@ -19,7 +19,7 @@ Patch0: crossbeam-epoch-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Epoch-based garbage collection.} @@ -36,9 +36,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +52,7 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+alloc-devel Summary: %{summary} @@ -62,19 +64,7 @@ This package contains library source intended for building other packages which use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+const_fn-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+const_fn-devel %{_description} - -This package contains library source intended for building other packages which -use the "const_fn" feature of the "%{crate}" crate. - -%files -n %{name}+const_fn-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+lazy_static-devel Summary: %{summary} @@ -86,7 +76,7 @@ This package contains library source intended for building other packages which use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -98,7 +88,7 @@ This package contains library source intended for building other packages which use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -110,7 +100,7 @@ This package contains library source intended for building other packages which use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 4ed0581..45624a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.7.crate) = f6afc55b8624fd3d4f8b0fa5f949360b7e205f7f5be92c248acc102d761e8cd1facac0e40be2f507379c824ce2bfefbf6aea6e8a87eb2ba1c20f928bb9dcc0a9 +SHA512 (crossbeam-epoch-0.9.8.crate) = c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624 From c5a2894c4299c07334a26788e1f68659408f1f56 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 15 Jul 2022 14:00:38 +0200 Subject: [PATCH 5/7] Update to version 0.9.9; Fixes RHBZ#2097834 --- .gitignore | 1 + crossbeam-epoch-fix-metadata.diff | 8 ++++---- rust-crossbeam-epoch.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index fff07e7..0953828 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /crossbeam-epoch-0.9.6.crate /crossbeam-epoch-0.9.7.crate /crossbeam-epoch-0.9.8.crate +/crossbeam-epoch-0.9.9.crate diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff index 6e1115a..c27b962 100644 --- a/crossbeam-epoch-fix-metadata.diff +++ b/crossbeam-epoch-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.8/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.8/Cargo.toml 2022-03-29T11:01:54.567202+00:00 -@@ -60,18 +60,9 @@ +--- crossbeam-epoch-0.9.9/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.9/Cargo.toml 2022-07-15T11:58:09.304321+00:00 +@@ -61,18 +61,9 @@ [features] alloc = [] default = ["std"] @@ -12,7 +12,7 @@ std = [ "alloc", "crossbeam-utils/std", - "lazy_static", + "once_cell", ] - -[target."cfg(crossbeam_loom)".dependencies.loom-crate] diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index bc14293..89bebff 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -5,7 +5,7 @@ %global crate crossbeam-epoch Name: rust-%{crate} -Version: 0.9.8 +Version: 0.9.9 Release: %autorelease Summary: Epoch-based garbage collection @@ -66,28 +66,28 @@ use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+lazy_static-devel +%package -n %{name}+nightly-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+lazy_static-devel %{_description} +%description -n %{name}+nightly-devel %{_description} This package contains library source intended for building other packages which -use the "lazy_static" feature of the "%{crate}" crate. +use the "nightly" feature of the "%{crate}" crate. -%files -n %{name}+lazy_static-devel +%files -n %{name}+nightly-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+nightly-devel +%package -n %{name}+once_cell-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+nightly-devel %{_description} +%description -n %{name}+once_cell-devel %{_description} This package contains library source intended for building other packages which -use the "nightly" feature of the "%{crate}" crate. +use the "once_cell" feature of the "%{crate}" crate. -%files -n %{name}+nightly-devel +%files -n %{name}+once_cell-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel diff --git a/sources b/sources index 45624a4..a42b38e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.8.crate) = c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624 +SHA512 (crossbeam-epoch-0.9.9.crate) = d32003cf7bac8690c3d8a2cd9393bf06f2a5da8b6371aff68de28be379a86b5b183b67fa6cf397b1a164379e0b095f4c9e6bc7803e229b3867d2c69cdc235085 From 7188a9e98a64b19b0128bfc47ec0099504bb278b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 27 Jul 2022 21:54:20 +0200 Subject: [PATCH 7/7] Update to version 0.9.10; Fixes RHBZ#2110073 --- .gitignore | 1 + crossbeam-epoch-fix-metadata-auto.diff | 18 ++++++++++++++++++ crossbeam-epoch-fix-metadata.diff | 21 --------------------- rust-crossbeam-epoch.spec | 14 ++++++-------- rust2rpm.conf | 3 +++ sources | 2 +- 6 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 crossbeam-epoch-fix-metadata-auto.diff delete mode 100644 crossbeam-epoch-fix-metadata.diff create mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 0953828..7eb1033 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /crossbeam-epoch-0.9.7.crate /crossbeam-epoch-0.9.8.crate /crossbeam-epoch-0.9.9.crate +/crossbeam-epoch-0.9.10.crate diff --git a/crossbeam-epoch-fix-metadata-auto.diff b/crossbeam-epoch-fix-metadata-auto.diff new file mode 100644 index 0000000..8ad3ec9 --- /dev/null +++ b/crossbeam-epoch-fix-metadata-auto.diff @@ -0,0 +1,18 @@ +--- crossbeam-epoch-0.9.10/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.10/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -62,7 +62,6 @@ + alloc = [] + default = ["std"] + loom = [ +- "loom-crate", + "crossbeam-utils/loom", + ] + nightly = ["crossbeam-utils/nightly"] +@@ -72,7 +71,3 @@ + "once_cell", + ] + +-[target."cfg(crossbeam_loom)".dependencies.loom-crate] +-version = "0.5" +-optional = true +-package = "loom" diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff deleted file mode 100644 index c27b962..0000000 --- a/crossbeam-epoch-fix-metadata.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- crossbeam-epoch-0.9.9/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.9/Cargo.toml 2022-07-15T11:58:09.304321+00:00 -@@ -61,18 +61,9 @@ - [features] - alloc = [] - default = ["std"] --loom = [ -- "loom-crate", -- "crossbeam-utils/loom", --] - nightly = ["crossbeam-utils/nightly"] - std = [ - "alloc", - "crossbeam-utils/std", - "once_cell", - ] -- --[target."cfg(crossbeam_loom)".dependencies.loom-crate] --version = "0.5" --optional = true --package = "loom" diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index 89bebff..3842489 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,21 +1,19 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch -Name: rust-%{crate} -Version: 0.9.9 +Name: rust-crossbeam-epoch +Version: 0.9.10 Release: %autorelease Summary: Epoch-based garbage collection -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/crossbeam-epoch Source: %{crates_source} -# Initial patched metadata -# * drop unused loom dev-dependency -Patch0: crossbeam-epoch-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: crossbeam-epoch-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} diff --git a/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..8b9e845 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,3 @@ +[DEFAULT] +unwanted-features = + loom diff --git a/sources b/sources index a42b38e..c5d534e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.9.crate) = d32003cf7bac8690c3d8a2cd9393bf06f2a5da8b6371aff68de28be379a86b5b183b67fa6cf397b1a164379e0b095f4c9e6bc7803e229b3867d2c69cdc235085 +SHA512 (crossbeam-epoch-0.9.10.crate) = c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03