[zerotier-one] chore(update): 1.10.2

commit 066369612f07f5d4911d17e40dd577ba946eea7f Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Nov 2 14:05:53 2022 +0000 chore(update): 1.10.2 sources | 4 ++-- zerotier-one.spec | 28 ++++++++++++++-------------- zerotier-use-vendor-archive.patch | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) --- diff --git a/sources b/sources index ebc4663..28554eb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (vendor-1.8.9.tar.xz) = b324376bc1cb340e38840725398f11b0b7c2b3efe4620c31340e64ecc25fae713f2638826ef1563830a053bbd12a7a11186599250a190d9ba05ce664753ac7ff -SHA512 (zerotier-one-1.8.9.tar.gz) = 6afc415dff28fbab72acd47fdf65246fe063b0ac5a3d8f67b818e3eda33196dfac24a40cb971c61b36a84c24e704584040b2b6cafc47b5200152e646015fb75f +SHA512 (vendor-1.10.2.tar.xz) = a1ea726a3526d6c077902f819054ed12b89a90d6e6c6d5723c3ce3242cf672049059693331a18d27570d5a1ce587c780683b0aac52dac18698c739d1ab0cce9e +SHA512 (zerotier-one-1.10.2.tar.gz) = 4876285c323b9c0a44230dfec99798a338d5ec110815f88cbde27ccc53b3f0b1a53a00e3a935fcb336f6de0f8c3a7f49ceed7e7299a2b64e47ad42c5494c7238 diff --git a/zerotier-one.spec b/zerotier-one.spec index caedc01..66e4993 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,6 +1,8 @@ +%global toolchain clang + Name: zerotier-one -Version: 1.8.9 -Release: 3%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Summary: Smart Ethernet Switch for Earth # Boost: README.md @@ -42,18 +44,10 @@ Source1: vendor-%{version}.tar.xz 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: openssl1.1-devel +BuildRequires: clang +BuildRequires: openssl1.1-devel openssl1.1 BuildRequires: systemd-rpm-macros -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(miniupnpc) -BuildRequires: pkgconfig(sqlite3) - Provides: bundled(http-parser) Provides: bundled(json) = 3.10.2 Provides: bundled(salsa2012) @@ -92,9 +86,10 @@ tar -xf %{SOURCE1} popd %build -%set_build_flags %make_build \ - STRIP=%{_bindir}/true + ZT_USE_MINIUPNPC=1 \ + STRIP=%{_bindir}/true \ + one %install @@ -122,6 +117,11 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service %changelog +* Wed Nov 02 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.10.2-1 +- chore(update): 1.10.2 +- Switch to clang to match upstream spec file. +- Bundle everything to match upstream spec file. + * Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.8.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch index 98acbbd..a7e918d 100644 --- a/zerotier-use-vendor-archive.patch +++ b/zerotier-use-vendor-archive.patch @@ -1,13 +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 @@ +--- a/zeroidc/.cargo/config.toml ++++ b/zeroidc/.cargo/config.toml +@@ -1,6 +1,10 @@ + [source.crates-io] + replace-with = "vendored-sources" - [target.i686-pc-windows-msvc] - rustflags = ["-C", "target-feature=+crt-static"] -+ -+[source.crates-io] ++[source."https://github.com/glimberg/rust-jwt"] ++git = "https://github.com/glimberg/rust-jwt" +replace-with = "vendored-sources" + -+[source.vendored-sources] -+directory = "vendor" + [source.vendored-sources] + directory = "vendor" +