[zerotier-one] chore(update): 1.10.6

commit aa4cc967d5bcd14ea27d06897571f81a43ab939e Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun May 21 15:25:04 2023 +0100 chore(update): 1.10.6 sources | 4 ++-- zerotier-one-sysusers | 1 + zerotier-one.spec | 16 ++++++++++++---- zerotier-use-vendor-archive.patch | 18 +++++++++++------- 4 files changed, 26 insertions(+), 13 deletions(-) --- diff --git a/sources b/sources index 8aa9cff..cd35f52 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (zerotier-one-1.10.3.tar.gz) = 8012a76e9fa541d4acad58bd7bd2a133e1946b55a2fda8983e3829287a2b2eddc63ff9893c70e8a04b4ef705a63d7d4375c6aceb77132ca09a3b405a116ccab7 -SHA512 (vendor-1.10.3.tar.xz) = ce973e27391f485428517353532dffe045c003f9d8f21419a1b98b93ea0644f997350b85bb974daea0eccfb8f11b2205ff184c8c3da658d5daa78500a0b98bef +SHA512 (zerotier-one-1.10.6.tar.gz) = e22982e0898d5db4748ca009480cc6ea07b13e1cf3dcb2c78fbba5036519c0d08afe8bdad20766669f52fef03679ff228414337e2478990fd5ba5d3dbece1972 +SHA512 (vendor-1.10.6.tar.xz) = 87039ed80350d7c343aac70009e72a841cd4b648d6fc95974827e5d5b2324ce0a81e5d37ba94a7bc2db1bfd94b50e3ff7e69af29ad1423cda5c38fa64b8d1d7d diff --git a/zerotier-one-sysusers b/zerotier-one-sysusers new file mode 100644 index 0000000..13a1436 --- /dev/null +++ b/zerotier-one-sysusers @@ -0,0 +1 @@ +u zerotier-one - "ZeroTier One user" /var/lib/zerotier-one /usr/bin/nologin diff --git a/zerotier-one.spec b/zerotier-one.spec index a30b1fc..dbfd279 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,11 +1,11 @@ -%global toolchain clang +#global toolchain clang # /usr/bin/debugedit: Cannot handle 8-byte build ID %ifarch %{arm} %global debug_package %{nil} %endif Name: zerotier-one -Version: 1.10.3 +Version: 1.10.6 Release: 1%{?dist} Summary: Smart Ethernet Switch for Earth @@ -43,12 +43,13 @@ 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 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: gcc-c++ BuildRequires: openssl1.1-devel openssl1.1 BuildRequires: systemd-rpm-macros @@ -98,8 +99,11 @@ popd %install %make_install -install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -D -m0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service +install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf +%pre +%sysusers_create_compat %{SOURCE2} %post %systemd_post %{name}.service @@ -117,10 +121,14 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service %{_mandir}/man{1,8}/*.{1,8}* %{_sbindir}/zerotier-* %{_sharedstatedir}/%{name}/ +%{_sysusersdir}/%{name}.conf %{_unitdir}/*.service %changelog +* Sun May 21 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.10.6-1 +- chore(update): 1.10.6 + * Fri Feb 17 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.10.3-1 - chore(update): 1.10.3 diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch index a7e918d..ae2794d 100644 --- a/zerotier-use-vendor-archive.patch +++ b/zerotier-use-vendor-archive.patch @@ -1,13 +1,17 @@ --- a/zeroidc/.cargo/config.toml +++ b/zeroidc/.cargo/config.toml -@@ -1,6 +1,10 @@ - [source.crates-io] - replace-with = "vendored-sources" +@@ -9,3 +9,14 @@ rustflags = ["-C", "target-feature=+crt- -+[source."https://github.com/glimberg/rust-jwt"] + [target.i686-pc-windows-msvc] + rustflags = ["-C", "target-feature=+crt-static"] ++ ++[source.crates-io] ++replace-with = "vendored-sources" ++ ++[source."git+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" ++