commit:     6cdb266d4d4ed862cc16b39c94f0d08a87b0a431
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Aug 19 18:01:19 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 11:50:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb266d

net-misc/zerotier: update time crate

Closes: https://bugs.gentoo.org/938204
Closes: https://github.com/gentoo/gentoo/pull/38208
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-misc/zerotier/Manifest                         |  4 +--
 .../files/zerotier-1.14.0-update-time.patch        | 33 ++++++++++++++++++++++
 net-misc/zerotier/zerotier-1.14.0.ebuild           |  5 ++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 6a0ecfa84dd3..84fa484d63e2 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -268,9 +268,9 @@ DIST textwrap-0.11.0.crate 17322 BLAKE2B 
257428908342774593bbd3528fcdae710712ff5
 DIST thiserror-1.0.58.crate 21025 BLAKE2B 
2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0
 SHA512 
3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 
9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1
 SHA512 
9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thread_local-1.1.8.crate 13962 BLAKE2B 
fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f
 SHA512 
6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-DIST time-0.3.34.crate 118430 BLAKE2B 
6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc
 SHA512 
3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+DIST time-0.3.36.crate 119805 BLAKE2B 
d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf
 SHA512 
83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B 
c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9
 SHA512 
3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 
5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14
 SHA512 
c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 
09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7
 SHA512 
557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B 
e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9
 SHA512 
e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 
2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484
 SHA512 
10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tokio-1.36.0.crate 757286 BLAKE2B 
be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8
 SHA512 
0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848

diff --git a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch 
b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
new file mode 100644
index 000000000000..8fe8b173225e
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/938204
+https://github.com/time-rs/time/issues/681
+https://github.com/time-rs/time/pull/671
+
+diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock
+index 1b01a0df3..09d9ced0c 100644
+--- a/rustybits/Cargo.lock
++++ b/rustybits/Cargo.lock
+@@ -2855,9 +2855,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -2876,9 +2876,9 @@ checksum = 
"ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
+

diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild 
b/net-misc/zerotier/zerotier-1.14.0.ebuild
index 933ff2176ec9..9b3f00cf92ca 100644
--- a/net-misc/zerotier/zerotier-1.14.0.ebuild
+++ b/net-misc/zerotier/zerotier-1.14.0.ebuild
@@ -275,8 +275,8 @@ CRATES="
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
@@ -399,6 +399,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.14.0-respect-ldflags.patch
        "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
        "${FILESDIR}"/${PN}-1.12.2-noexecstack.patch
+       "${FILESDIR}"/${PN}-1.14.0-update-time.patch
 )
 
 DOCS=( README.md AUTHORS.md )

Reply via email to