[10/48] rust-chrono:Update to version 0.4.22 required by python3-cryptography

Message ID 20221109185734.3920-10-adolf.belka@ipfire.org
State Accepted
Commit 9745d784b97d975979f0f7b22eced1583ffe4025
Headers
Series [01/48] python3: Update to version 3.10.8 |

Commit Message

Adolf Belka 9 Nov 2022, 6:56 p.m. UTC
  - Updated from version 0.4.19 to 0.4.22
- Update of rootfile
- Update of metadata patch as more windows related entries in Cargo.toml to be excluded
- Changelog
	## 0.4.22
		* Allow wasmbindgen to be optional on `wasm32-unknown-unknown` target [(#771)](https://github.com/chronotope/chrono/pull/771)
		* Fix compile error for `x86_64-fortanix-unknown-sgx` [(#767)](https://github.com/chronotope/chrono/pull/767)
		* Update `iana-time-zone` version to 1.44 [(#773)](https://github.com/chronotope/chrono/pull/773)
	## 0.4.21
		* Fall back to UTC timezone in cases where no timezone is found [(#756)](https://github.com/chronotope/chrono/pull/756)
		* Correctly detect timezone on Android [(#756)](https://github.com/chronotope/chrono/pull/756)
		* Improve documentation for strftime `%Y` specifier [(#760)](https://github.com/chronotope/chrono/pull/760)
	## 0.4.20
		* Add more formatting documentation and examples.
		* Add support for microseconds timestamps serde serialization/deserialization (#304)
		* Fix `DurationRound` is not TZ aware (#495)
		* Implement `DurationRound` for `NaiveDateTime`
		* Implement `std::iter::Sum` for `Duration`
		* Add `DateTime::from_local()` to construct from given local date and time (#572)
		* Add a function that calculates the number of years elapsed between now and a given `Date` or `DateTime` (#557)
		* Correct build for wasm32-unknown-emscripten target (#568)
		* Change `Local::now()` and `Utc::now()` documentation from "current date" to "current date and time" (#647)
		* Fix `duration_round` panic on rounding by `Duration::zero()` (#658)
		* Add optional rkyv support.
		* Add support for microseconds timestamps serde serialization for `NaiveDateTime`.
		* Add support for optional timestamps serde serialization for `NaiveDateTime`.
		* Fix build for wasm32-unknown-emscripten (@yu-re-ka #593)
		* Make `ParseErrorKind` public and available through `ParseError::kind()` (#588)
		* Implement `DoubleEndedIterator` for `NaiveDateDaysIterator` and `NaiveDateWeeksIterator`
		* Fix panicking when parsing a `DateTime` (@botahamec)
		* Add support for getting week bounds based on a specific `NaiveDate` and a `Weekday` (#666)
		* Remove libc dependency from Cargo.toml.
		* Add the `and_local_timezone` method to `NaiveDateTime`
		* Fix the behavior of `Duration::abs()` for negative durations with non-zero nanos
		* Add compatibility with rfc2822 comments (#733)
		* Make `js-sys` and `wasm-bindgen` enabled by default when target is `wasm32-unknown-unknown` for ease of API discovery
		* Add the `Months` struct and associated `Add` and `Sub` impls

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/rust-chrono           | 108 +++++++++++-------
 lfs/rust-chrono                               |   6 +-
 .../rust-chrono-0.4.19-fix-metadata.patch     |  23 ----
 .../rust-chrono-0.4.22-fix-metadata.patch     |  49 ++++++++
 4 files changed, 116 insertions(+), 70 deletions(-)
 delete mode 100644 src/patches/rust-chrono-0.4.19-fix-metadata.patch
 create mode 100644 src/patches/rust-chrono-0.4.22-fix-metadata.patch
  

Patch

diff --git a/config/rootfiles/common/rust-chrono b/config/rootfiles/common/rust-chrono
index f30695b97..bf1e3715b 100644
--- a/config/rootfiles/common/rust-chrono
+++ b/config/rootfiles/common/rust-chrono
@@ -1,44 +1,64 @@ 
-#usr/share/cargo/registry/chrono-0.4.19
-#usr/share/cargo/registry/chrono-0.4.19/.cargo-checksum.json
-#usr/share/cargo/registry/chrono-0.4.19/AUTHORS.txt
-#usr/share/cargo/registry/chrono-0.4.19/CHANGELOG.md
-#usr/share/cargo/registry/chrono-0.4.19/Cargo.toml
-#usr/share/cargo/registry/chrono-0.4.19/Cargo.toml.deps
-#usr/share/cargo/registry/chrono-0.4.19/LICENSE.txt
-#usr/share/cargo/registry/chrono-0.4.19/README.md
-#usr/share/cargo/registry/chrono-0.4.19/benches
-#usr/share/cargo/registry/chrono-0.4.19/benches/chrono.rs
-#usr/share/cargo/registry/chrono-0.4.19/benches/serde.rs
-#usr/share/cargo/registry/chrono-0.4.19/rustfmt.toml
-#usr/share/cargo/registry/chrono-0.4.19/src
-#usr/share/cargo/registry/chrono-0.4.19/src/date.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/datetime.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/div.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format
-#usr/share/cargo/registry/chrono-0.4.19/src/format/locales.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format/mod.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format/parse.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format/parsed.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format/scan.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/format/strftime.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/lib.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/naive
-#usr/share/cargo/registry/chrono-0.4.19/src/naive/date.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/naive/datetime.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/naive/internals.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/naive/isoweek.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/naive/time.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/offset
-#usr/share/cargo/registry/chrono-0.4.19/src/offset/fixed.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/offset/local.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/offset/mod.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/offset/utc.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/oldtime.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/round.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/sys
-#usr/share/cargo/registry/chrono-0.4.19/src/sys.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/sys/stub.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/sys/unix.rs
-#usr/share/cargo/registry/chrono-0.4.19/src/sys/windows.rs
-#usr/share/cargo/registry/chrono-0.4.19/tests
-#usr/share/cargo/registry/chrono-0.4.19/tests/wasm.rs
+#usr/share/cargo/registry/chrono-0.4.22
+#usr/share/cargo/registry/chrono-0.4.22/.cargo-checksum.json
+#usr/share/cargo/registry/chrono-0.4.22/AUTHORS.txt
+#usr/share/cargo/registry/chrono-0.4.22/CHANGELOG.md
+#usr/share/cargo/registry/chrono-0.4.22/Cargo.toml
+#usr/share/cargo/registry/chrono-0.4.22/Cargo.toml.deps
+#usr/share/cargo/registry/chrono-0.4.22/LICENSE.txt
+#usr/share/cargo/registry/chrono-0.4.22/README.md
+#usr/share/cargo/registry/chrono-0.4.22/benches
+#usr/share/cargo/registry/chrono-0.4.22/benches/chrono.rs
+#usr/share/cargo/registry/chrono-0.4.22/benches/serde.rs
+#usr/share/cargo/registry/chrono-0.4.22/clippy.toml
+#usr/share/cargo/registry/chrono-0.4.22/rustfmt.toml
+#usr/share/cargo/registry/chrono-0.4.22/src
+#usr/share/cargo/registry/chrono-0.4.22/src/date.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/datetime
+#usr/share/cargo/registry/chrono-0.4.22/src/datetime/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/datetime/rustc_serialize.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/datetime/serde.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/datetime/tests.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format
+#usr/share/cargo/registry/chrono-0.4.22/src/format/locales.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format/parse.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format/parsed.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format/scan.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/format/strftime.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/lib.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/month.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/date.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/datetime
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/datetime/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/datetime/rustc_serialize.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/datetime/serde.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/datetime/tests.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/internals.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/isoweek.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/time
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/time/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/time/rustc_serialize.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/time/serde.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/naive/time/tests.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/fixed.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/stub.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/tz_info
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/tz_info/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/tz_info/parser.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/tz_info/rule.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/tz_info/timezone.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/unix.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/local/windows.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/mod.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/offset/utc.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/oldtime.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/round.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/traits.rs
+#usr/share/cargo/registry/chrono-0.4.22/src/weekday.rs
+#usr/share/cargo/registry/chrono-0.4.22/tests
+#usr/share/cargo/registry/chrono-0.4.22/tests/wasm.rs
diff --git a/lfs/rust-chrono b/lfs/rust-chrono
index cac6a8033..35ab126a7 100644
--- a/lfs/rust-chrono
+++ b/lfs/rust-chrono
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 0.4.19
+VER        = 0.4.22
 
 THISAPP    = chrono-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54
+$(DL_FILE)_BLAKE2 = 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-chrono-0.4.19-fix-metadata.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-chrono-0.4.22-fix-metadata.patch
 	cd $(DIR_APP) && $(CARGO_PREPARE)
 	cd $(DIR_APP) && $(CARGO_BUILD)
 	cd $(DIR_APP) && $(CARGO_INSTALL)
diff --git a/src/patches/rust-chrono-0.4.19-fix-metadata.patch b/src/patches/rust-chrono-0.4.19-fix-metadata.patch
deleted file mode 100644
index cf6861693..000000000
--- a/src/patches/rust-chrono-0.4.19-fix-metadata.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
---- chrono-0.4.19/Cargo.toml.original	2020-09-30 17:06:24.000000000 +0200
-+++ chrono-0.4.19/Cargo.toml	2022-06-16 17:27:21.440234723 +0200
-@@ -93,7 +93,7 @@
- __doctest = []
- __internal_bench = []
- alloc = []
--clock = ["libc", "std", "winapi"]
-+clock = ["libc", "std"]
- default = ["clock", "std", "oldtime"]
- oldtime = ["time"]
- std = []
-@@ -108,10 +108,7 @@
- optional = true
- [target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
- version = "0.3"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.0"
--features = ["std", "minwinbase", "minwindef", "timezoneapi"]
--optional = true
-+
- [badges.appveyor]
- repository = "chronotope/chrono"
- 
diff --git a/src/patches/rust-chrono-0.4.22-fix-metadata.patch b/src/patches/rust-chrono-0.4.22-fix-metadata.patch
new file mode 100644
index 000000000..366db4495
--- /dev/null
+++ b/src/patches/rust-chrono-0.4.22-fix-metadata.patch
@@ -0,0 +1,49 @@ 
+--- chrono-0.4.22/Cargo.toml.original	1970-01-01 01:00:01.000000000 +0100
++++ chrono-0.4.22/Cargo.toml	2022-10-13 23:41:34.829910648 +0200
+@@ -115,14 +115,12 @@
+ alloc = []
+ clock = [
+     "std",
+-    "winapi",
+     "iana-time-zone",
+ ]
+ default = [
+     "clock",
+     "std",
+     "oldtime",
+-    "wasmbind",
+ ]
+ libc = []
+ oldtime = ["time"]
+@@ -131,31 +129,7 @@
+     "pure-rust-locales",
+     "alloc",
+ ]
+-wasmbind = [
+-    "wasm-bindgen",
+-    "js-sys",
+-]
+-
+-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
+-version = "0.3"
+-optional = true
+-
+-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.wasm-bindgen]
+-version = "0.2"
+-optional = true
+ 
+-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
+-version = "0.3"
+-
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.0"
+-features = [
+-    "std",
+-    "minwinbase",
+-    "minwindef",
+-    "timezoneapi",
+-]
+-optional = true
+ 
+ [badges.appveyor]
+ repository = "chronotope/chrono"