commit: 9c5077c9beb36811b810b39cb32cb59a369b4f3d Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Nov 21 18:18:01 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 26 03:06:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5077c9
net-misc/zerotier: hook up controller Unhappy with the vendoring situation. But better to have an imperfect ebuild than block the functionality on it. Dropped keywords due to new dependencies. Bug: https://bugs.gentoo.org/964715 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44711 Closes: https://github.com/gentoo/gentoo/pull/44711 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/zerotier/metadata.xml | 1 + net-misc/zerotier/zerotier-1.16.0-r1.ebuild | 181 ++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml index 263e44a24b86..a55e7ccd4d51 100644 --- a/net-misc/zerotier/metadata.xml +++ b/net-misc/zerotier/metadata.xml @@ -18,6 +18,7 @@ <remote-id type="github">zerotier/ZeroTierOne</remote-id> </upstream> <use> + <flag name="controller">Enable support for the network controller microservice (NONCOMM License)</flag> <flag name="sso">Enable support for Single sign-on through zeroidc</flag> </use> </pkgmetadata> diff --git a/net-misc/zerotier/zerotier-1.16.0-r1.ebuild b/net-misc/zerotier/zerotier-1.16.0-r1.ebuild new file mode 100644 index 000000000000..4386dc6c399f --- /dev/null +++ b/net-misc/zerotier/zerotier-1.16.0-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +declare -A GIT_CRATES=( + [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' + [rustfsm]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/fsm' + [rustfsm_procmacro]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/fsm/rustfsm_procmacro' + [rustfsm_trait]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/fsm/rustfsm_trait' + [temporal-client]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/client' + [temporal-sdk-core-api]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/core-api' + [temporal-sdk-core-protos]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/sdk-core-protos' + [temporal-sdk-core]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/core' + [temporal-sdk]='https://github.com/temporalio/sdk-core;4614dcb8f4ffd2cb244eb0a19d7485c896e3459e;sdk-core-%commit%/sdk' +) + +CARGO_OPTIONAL=1 +RUST_MIN_VER="1.88" +RUST_OPTIONAL=1 + +inherit cargo eapi9-ver flag-o-matic systemd toolchain-funcs + +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +HOMEPAGE="https://www.zerotier.com/"; +SRC_URI=" + https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + controller? ( ${CARGO_CRATE_URIS} ) + sso? ( ${CARGO_CRATE_URIS} ) +" +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + controller? ( + https://gitlab.com/api/v4/projects/32909921/packages/generic/${PN}/${PV}/${P}-crates.tar.xz + ) + sso? ( + https://gitlab.com/api/v4/projects/32909921/packages/generic/${PN}/${PV}/${P}-crates.tar.xz + ) + " +fi +S="${WORKDIR}"/ZeroTierOne-${PV} + +LICENSE="MPL-2.0 controller? ( ZeroTier )" +# Dependent crate licenses +LICENSE+=" controller? ( 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 ZLIB )" +LICENSE+=" sso? ( 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 ZLIB )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="controller cpu_flags_arm_neon debug sso" + +# https://github.com/zerotier/ZeroTierOne/pull/2453 +# >=miniupnpnc-2.2.8: https://gitlab.archlinux.org/archlinux/packaging/packages/zerotier-one/-/commit/1d040aee9a4cfecdcc747cb42f92a1420a42a3f4 +RDEPEND=" + dev-libs/openssl:= + net-libs/libnatpmp + >=net-libs/miniupnpc-2.2.8:= + controller? ( + net-libs/grpc:= + >=dev-cpp/opentelemetry-cpp-1.24.0:=[grpc(-),otlp(-),prometheus] + ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND=" + virtual/pkgconfig + sso? ( ${RUST_DEPEND} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch + "${FILESDIR}"/${PN}-1.16.0-miniupnpc-2.2.8.patch +) + +DOCS=( README.md ) + +pkg_setup() { + if use controller || use sso ; then + rust_pkg_setup + fi +} + +src_unpack() { + if use controller || use sso ; then + cargo_src_unpack + else + default + fi +} + +src_prepare() { + default + + # Remove vendored code to avoid mixing vendored and system headers, + # otherwise it will hide api breaks at build time such as: + # https://github.com/zerotier/ZeroTierOne/issues/2332 + rm -r ext/{miniupnpc,libnatpmp,nlohmann} || die + # rm ext/hiredis-* || die + # keep opentelemetry-cpp-api-only to avoid dependency for now + rm -r ext/opentelemetry-cpp-1.21.0 || die + sed -e '/cd ext\/opentelemetry-cpp-/d' -i make-linux.mk || die + # rm -r ext/redis-plus-plus-* || die + # rm -r ext/libpqxx-* || die + # header only dependency that could be packaged + # rm -r ext/inja || die + # https://github.com/zerotier/ZeroTierOne/issues/355#issuecomment-232086084 + # rm -r ext/http-parser || die + # Messy and needs proper patches + # rm -r ext/cpp-httplib || die + + # Remove man page compression and install, we'll handle it with ebuild functions + sed -e '/install:/,/^$/ { /man[0-9]/d }' \ + -i make-linux.mk || die +} + +src_configure() { + tc-export CXX CC + + if use controller; then + # ring crate cannot handle it + filter-lto + fi + + myemakeargs=( + CC="${CC}" + CXX="${CXX}" + STRIP=: + + ZT_DISABLE_NEON="$(usex !cpu_flags_arm_neon 1 0)" + + # Debug doesnt do more than add preprocessor arguments normally, + # but when rust is used it sets the correct rust directory to link against. + # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE + # and patching the makefile its just easier to have it. + ZT_DEBUG="$(usex debug 1 0)" + ZT_SSO_SUPPORTED="$(usex sso 1 0)" + + # commercial source-available license + ZT_CONTROLLER="$(usex controller 1 0)" + ZT_OTEL=$(usex controller 1 0) # fails without, but pulls in more dependencies + ZT_NONFREE=$(usex controller 1 0) + ) + + if use controller || use sso ; then + cargo_src_configure + fi +} + +src_compile() { + if use controller || use sso ; then + cargo_env emake "${myemakeargs[@]}" one + else + emake "${myemakeargs[@]}" one + fi +} + +src_test() { + emake "${myemakeargs[@]}" selftest + ./zerotier-selftest || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + + doman doc/zerotier-{cli.1,idtool.1,one.8} +} + +pkg_postinst() { + if ver_replacing -lt 1.16.0-r1; then + elog "Controller component was made conditional in 1.16.0" + elog "You can enable it with the controller use flag" + fi +}
