romenskiy2012/zerotier-one
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Arseniy Romenskiy 2026-02-20 17:05:58 +03:00
parent 5ab0ecf9c7
commit 1814edd7bd
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zerotier-one.spec
View file

@ -54,13 +54,13 @@ directory = "../vendor"
EOF
#==
cp -a vendor/time-0.3.25 vendor/time-0.3.25-patched
cp -a vendor/time vendor/time-patched
perl -0777 -pi -e 's/let items = format_items\s*\n\s*\.map\(\|res\|\s*res\.map\(Into::into\)\)\s*\n\s*\.collect::<Result<Box<_>, _>>\(\)\?\s*;/let items = format_items.collect::<Result<Box<_>, _>>()?;/s' \
vendor/time-0.3.25-patched/src/format_description/parse/mod.rs
vendor/time-patched/src/format_description/parse/mod.rs
###
grep zeroidc/Cargo.toml 'time-0.3.25-patched' || cat >> zeroidc/Cargo.toml <<EOF
grep zeroidc/Cargo.toml 'time-patched' || cat >> zeroidc/Cargo.toml <<EOF
[patch.crates-io]
time = { path = "../vendor/time-0.3.25-patched" }
time = { path = "../vendor/time-patched" }
EOF
#==

11
zerotier-one.spec~
View file

@ -53,6 +53,17 @@ replace-with = "vendored-sources"
directory = "../vendor"
EOF
#==
cp -a vendor/time-0.3.25 vendor/time-0.3.25-patched
perl -0777 -pi -e 's/let items = format_items\s*\n\s*\.map\(\|res\|\s*res\.map\(Into::into\)\)\s*\n\s*\.collect::<Result<Box<_>, _>>\(\)\?\s*;/let items = format_items.collect::<Result<Box<_>, _>>()?;/s' \
vendor/time-0.3.25-patched/src/format_description/parse/mod.rs
###
grep zeroidc/Cargo.toml 'time-0.3.25-patched' || cat >> zeroidc/Cargo.toml <<EOF
[patch.crates-io]
time = { path = "../vendor/time-0.3.25-patched" }
EOF
#==
%build
%make_build ZT_USE_MINIUPNPC=1 one