1 |
commit: 55bcc464de70b4b6b695e292592dd47b6175d4ac |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 9 09:07:25 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 9 09:07:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55bcc464 |
7 |
|
8 |
net-misc/zerotier: add 1.10.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/856013 |
11 |
Closes: https://bugs.gentoo.org/786669 |
12 |
Bug: https://bugs.gentoo.org/718648 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
net-misc/zerotier/Manifest | 1 + |
16 |
.../files/zerotier-1.10.1-add-armv7a-support.patch | 14 +++++ |
17 |
.../files/zerotier-1.10.1-respect-ldflags.patch | 11 ++++ |
18 |
net-misc/zerotier/zerotier-1.10.1.ebuild | 67 ++++++++++++++++++++++ |
19 |
4 files changed, 93 insertions(+) |
20 |
|
21 |
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest |
22 |
index e825f666e9d7..f27d27bd9192 100644 |
23 |
--- a/net-misc/zerotier/Manifest |
24 |
+++ b/net-misc/zerotier/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
+DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd |
27 |
DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c |
28 |
|
29 |
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch |
30 |
new file mode 100644 |
31 |
index 000000000000..c0dd5e900269 |
32 |
--- /dev/null |
33 |
+++ b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch |
34 |
@@ -0,0 +1,14 @@ |
35 |
+--- a/make-linux.mk |
36 |
++++ b/make-linux.mk |
37 |
+@@ -203,6 +203,11 @@ ifeq ($(CC_MACH),armv7) |
38 |
+ override DEFS+=-DZT_NO_TYPE_PUNNING |
39 |
+ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 |
40 |
+ endif |
41 |
++ifeq ($(CC_MACH),armv7a) |
42 |
++ ZT_ARCHITECTURE=3 |
43 |
++ override DEFS+=-DZT_NO_TYPE_PUNNING |
44 |
++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 |
45 |
++endif |
46 |
+ ifeq ($(CC_MACH),armv7l) |
47 |
+ ZT_ARCHITECTURE=3 |
48 |
+ override DEFS+=-DZT_NO_TYPE_PUNNING |
49 |
|
50 |
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch |
51 |
new file mode 100644 |
52 |
index 000000000000..41a42197c17d |
53 |
--- /dev/null |
54 |
+++ b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch |
55 |
@@ -0,0 +1,11 @@ |
56 |
+--- a/make-linux.mk |
57 |
++++ b/make-linux.mk |
58 |
+@@ -70,7 +70,7 @@ else |
59 |
+ override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) |
60 |
+ CXXFLAGS?=-O3 -fstack-protector |
61 |
+ override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) |
62 |
+- LDFLAGS=-pie -Wl,-z,relro,-z,now |
63 |
++ LDFLAGS?=-pie -Wl,-z,relro,-z,now |
64 |
+ RUSTFLAGS=--release |
65 |
+ endif |
66 |
+ |
67 |
|
68 |
diff --git a/net-misc/zerotier/zerotier-1.10.1.ebuild b/net-misc/zerotier/zerotier-1.10.1.ebuild |
69 |
new file mode 100644 |
70 |
index 000000000000..fff14d007687 |
71 |
--- /dev/null |
72 |
+++ b/net-misc/zerotier/zerotier-1.10.1.ebuild |
73 |
@@ -0,0 +1,67 @@ |
74 |
+# Copyright 1999-2022 Gentoo Authors |
75 |
+# Distributed under the terms of the GNU General Public License v2 |
76 |
+ |
77 |
+EAPI=8 |
78 |
+ |
79 |
+inherit flag-o-matic systemd toolchain-funcs |
80 |
+ |
81 |
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth" |
82 |
+HOMEPAGE="https://www.zerotier.com/" |
83 |
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" |
84 |
+S="${WORKDIR}"/ZeroTierOne-${PV} |
85 |
+ |
86 |
+LICENSE="BSL-1.1" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" |
89 |
+IUSE="cpu_flags_arm_neon" |
90 |
+ |
91 |
+RDEPEND=" |
92 |
+ dev-libs/json-glib |
93 |
+ net-libs/libnatpmp |
94 |
+ >=net-libs/miniupnpc-2:= |
95 |
+" |
96 |
+DEPEND="${RDEPEND}" |
97 |
+ |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch |
100 |
+ "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch |
101 |
+) |
102 |
+ |
103 |
+DOCS=( README.md AUTHORS.md ) |
104 |
+ |
105 |
+src_configure() { |
106 |
+ tc-export CXX CC |
107 |
+ |
108 |
+ append-ldflags -Wl,-z,noexecstack |
109 |
+ |
110 |
+ use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 |
111 |
+} |
112 |
+ |
113 |
+src_compile() { |
114 |
+ myemakeargs=( |
115 |
+ CXX="${CXX}" |
116 |
+ STRIP=: |
117 |
+ |
118 |
+ # Needs Rust and fails to build as of 1.10.1 |
119 |
+ ZT_SSO_SUPPORTED=0 |
120 |
+ ) |
121 |
+ |
122 |
+ emake "${myemakeargs[@]}" one |
123 |
+} |
124 |
+ |
125 |
+src_test() { |
126 |
+ emake "${myemakeargs[@]}" selftest |
127 |
+ ./zerotier-selftest || die |
128 |
+} |
129 |
+ |
130 |
+src_install() { |
131 |
+ default |
132 |
+ |
133 |
+ # Remove pre-zipped man pages |
134 |
+ rm "${ED}"/usr/share/man/{man1,man8}/* || die |
135 |
+ |
136 |
+ newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" |
137 |
+ systemd_dounit "${FILESDIR}/${PN}".service |
138 |
+ |
139 |
+ doman doc/zerotier-{cli.1,idtool.1,one.8} |
140 |
+} |