commit f0f43d629bfd9a2a446aff557c507219f190aefe Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Jun 12 22:24:50 2022 +0100 chore(update): 1.8.10 .gitignore | 2 ++ sources | 3 ++- zerotier-one.spec | 17 +++++++++++++++-- zerotier-use-vendor-archive.patch | 13 +++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index 667da7a..4f9d640 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /zerotier-one-1.8.3.tar.gz /zerotier-one-1.8.4.tar.gz /zerotier-one-1.8.5.tar.gz +/zerotier-one-1.8.10.tar.gz +/vendor.tar.xz diff --git a/sources b/sources index 302458f..aa3d514 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (zerotier-one-1.8.5.tar.gz) = 2ac69d50cbf6d04d3eae223ec2e5c6c48218a132623f9070a6608866c174f0be14364817d90f30280ee22bca9b173d7f6e4a78457c1f00b0ab79c394b474b9d5 +SHA512 (zerotier-one-1.8.10.tar.gz) = 56311f95681050f998bb67112efee78e66821850d9544ab57b0284ef032f5b098455dee80acbffa8e71c48b6bc9eaaf20e935e087f096f533dd0305cf0338cfe +SHA512 (vendor.tar.xz) = d05d96bada236e10c85ff44eaf48c6dfe4f9a89c794e8c5a7cd37144f76a8884d1206330e0710b62485e05e5d44684d22a56f41b16c1fb1a86fff3ceb360a5c2 diff --git a/zerotier-one.spec b/zerotier-one.spec index 329c6c3..ed42363 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.8.5 +Version: 1.8.10 Release: 1%{?dist} Summary: Smart Ethernet Switch for Earth @@ -35,12 +35,19 @@ Summary: Smart Ethernet Switch for Earth License: BSL and Boost and ASL and ASL 2.0 and MIT URL: https://zerotier.com Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers... +# make with command: 'cd zeroidc && cargo vendor' and tar.gz vendor directory +Source1: vendor.tar.xz +# for use vendor directory for build +Patch0: zerotier-use-vendor-archive.patch + +BuildRequires: cargo BuildRequires: gcc-c++ BuildRequires: go-md2man BuildRequires: http-parser-devel BuildRequires: json-devel BuildRequires: libnatpmp-devel +BuildRequires: openssl-devel BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(liblz4) @@ -72,12 +79,15 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of %prep -%autosetup -n ZeroTierOne-%{version} +%autosetup -p 1 -n ZeroTierOne-%{version} ## Unbundling (maybe for future, depends on upstream) # rm -rf ext/http-parser # rm -rf ext/json +pushd zeroidc +tar -xf %{SOURCE1} +popd %build %set_build_flags @@ -110,6 +120,9 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service %changelog +* Sun Jun 12 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.8.10-1 +- chore(update): 1.8.10 + * Fri Mar 04 2022 Artem Polishchuk <ego.cordatus(a)gmail.com&gt; - 1.8.5-1 - chore(update): 1.8.5 diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch new file mode 100644 index 0000000..98acbbd --- /dev/null +++ b/zerotier-use-vendor-archive.patch @@ -0,0 +1,13 @@ +diff -ruN a/zeroidc/.cargo/config.toml b/zeroidc/.cargo/config.toml +--- a/zeroidc/.cargo/config.toml 2022-05-11 02:45:12.000000000 +0900 ++++ b/zeroidc/.cargo/config.toml 2022-05-16 08:28:37.836443191 +0900 +@@ -9,3 +9,9 @@ + + [target.i686-pc-windows-msvc] + rustflags = ["-C", "target-feature=+crt-static"] ++ ++[source.crates-io] ++replace-with = "vendored-sources" ++ ++[source.vendored-sources] ++directory = "vendor"