commit 8baccb3b2b71d4445525cc886c0211c9a92124dc Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri May 10 00:55:10 2024 +0100 Update to 1.14.0 sources | 4 ++-- zerotier-one.spec | 28 ++++++++++------------------ zerotier-use-vendor-archive.patch | 29 +++++++++++++++++++---------- 3 files changed, 31 insertions(+), 30 deletions(-) --- diff --git a/sources b/sources index 8e117ce..ac912a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (zerotier-one-1.12.2.tar.gz) = 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73 -SHA512 (vendor-1.12.2.tar.xz) = 359d86b532d1fb25edbf9a6d0a58f56b15c10aa0ea5c9f2d17b1f093cec87a07092fb92321bb0ed967011415d161e458117511e4c7f4f83e5d718253c8a91618 +SHA512 (vendor-1.14.0.tar.xz) = eb642a08dcc8e5b38b4ca5815dd3c745c381b72dde1a3a363295ca69035938740db15ebe639874d568b6651d6b2a89e912cc0b624e19f41d5530f1567c4686da +SHA512 (zerotier-one-1.14.0.tar.gz) = ba268dd9773a07c0b0e2346a6316b69b3ba4c346bb3d36b20f0a491591f711d5ac40383c03b72c39b523c087348956deadde51406dd996c1418e12d996a25f7d diff --git a/zerotier-one.spec b/zerotier-one.spec index 4928279..e9b6842 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -5,8 +5,8 @@ %endif Name: zerotier-one -Version: 1.12.2 -Release: 3%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: Smart Ethernet Switch for Earth # Boost: README.md @@ -41,16 +41,15 @@ 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.xz vendor directory +# make with command: 'cd rustybits and mkdir .cargo +# cargo vendor > .cargo/config.toml' and tar cvf vendor-%{version}.tar.xz vendor/ .cargo/ Source1: vendor-%{version}.tar.xz Source2: zerotier-one-sysusers -# for use vendor directory for build -Patch0: zerotier-use-vendor-archive.patch - BuildRequires: cargo BuildRequires: clang BuildRequires: openssl-devel openssl +BuildRequires: protobuf-devel BuildRequires: systemd-rpm-macros Provides: bundled(http-parser) @@ -83,19 +82,9 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of %prep -%autosetup -p 1 -n ZeroTierOne-%{version} - -## Unbundling (maybe for future, depends on upstream) -# rm -rf ext/http-parser -# rm -rf ext/json - -sed \ - -e 's/RUSTFLAGS=/RUSTFLAGS?=/' \ - -e 's/cargo build $(RUSTFLAGS)/cargo build --release/' \ - -i make-linux.mk +%autosetup -p1 -n ZeroTierOne-%{version} - -pushd zeroidc +pushd rustybits tar -xf %{SOURCE1} popd @@ -135,6 +124,9 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf %changelog +* Thu May 09 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.14.0-1 +- Update to 1.14.0 + * Sun Apr 07 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.12.2-3 - Rebuild against standard openssl diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch index ae2794d..734aeec 100644 --- a/zerotier-use-vendor-archive.patch +++ b/zerotier-use-vendor-archive.patch @@ -1,17 +1,26 @@ ---- a/zeroidc/.cargo/config.toml -+++ b/zeroidc/.cargo/config.toml -@@ -9,3 +9,14 @@ rustflags = ["-C", "target-feature=+crt- - - [target.i686-pc-windows-msvc] - rustflags = ["-C", "target-feature=+crt-static"] -+ +--- a/rustybits/zeroidc/.cargo/config.toml ++++ b/rustybits/zeroidc/.cargo/config.toml +@@ -1,11 +1,14 @@ +-[target.x86_64-apple-darwin] +-rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"] +[source.crates-io] +replace-with = "vendored-sources" -+ + +-[target.aarch64-apple-darwin] +-rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"] +[source."git+https://github.com/glimberg/rust-jwt"] +git = "https://github.com/glimberg/rust-jwt" +replace-with = "vendored-sources" -+ + +-[target.x86_64-pc-windows-msvc] +-rustflags = ["-C", "target-feature=+crt-static"] ++[source."git+https://github.com/temporalio/sdk-core?branch=master"] ++git = "https://github.com/temporalio/sdk-core" ++branch = "master" ++replace-with = "vendored-sources" + +-[target.i686-pc-windows-msvc] +-rustflags = ["-C", "target-feature=+crt-static"] +[source.vendored-sources] +directory = "vendor" -+ +