[gentoo-commits] repo/gentoo:master commit in: net-misc/zerotier/, net-misc/zerotier/files/

[Sam James]

commit:     4aeb9963854cd2611d5b9c60181e715a76a71e48
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sun Mar 16 13:39:14 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 15:05:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aeb9963

net-misc/zerotier: fix against miniupnpc-2.2.8

Use patch from Arch and remove vendored dependencies to stop them from
mixing headers.

Bug: https://github.com/zerotier/ZeroTierOne/issues/2332
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/zerotier-1.14.2-miniupnpc-2.2.8.patch    |  65 +++
 net-misc/zerotier/zerotier-1.14.2-r2.ebuild        | 493 +++++++++++++++++++++
 2 files changed, 558 insertions(+)

diff --git a/net-misc/zerotier/files/zerotier-1.14.2-miniupnpc-2.2.8.patch 
b/net-misc/zerotier/files/zerotier-1.14.2-miniupnpc-2.2.8.patch
new file mode 100644
index 000000000000..c1cfa412ba18
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.14.2-miniupnpc-2.2.8.patch
@@ -0,0 +1,65 @@
+https://github.com/zerotier/ZeroTierOne/issues/2332
+https://gitlab.archlinux.org/archlinux/packaging/packages/zerotier-one/-/commit/1d040aee9a4cfecdcc747cb42f92a1420a42a3f4
+
+From ab00e10bfac636c97fc608608745f18889f28410 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@eworm.de>
+Date: Tue, 5 Nov 2024 16:06:06 +0100
+Subject: [PATCH 1/2] shrink variable size
+
+This is what upstream miniupnpc uses...
+--- a/osdep/PortMapper.cpp
++++ b/osdep/PortMapper.cpp
+@@ -202,7 +202,7 @@ public:
+                       // UPnP mode
+                       // 
---------------------------------------------------------------------
+                       if (mode == 1) {
+-                              char lanaddr[4096];
++                              char lanaddr[64];
+                               char externalip[4096]; // no range checking? so 
make these buffers larger than any UDP packet a uPnP server could send us as a 
precaution :P
+                               char inport[16];
+                               char outport[16];
+-- 
+2.47.0
+
+
+From fa0b81d9f9e84e282eea7955a037580be44002f9 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@eworm.de>
+Date: Tue, 5 Nov 2024 16:09:35 +0100
+Subject: [PATCH 2/2] add missing function parameter
+
+This changed with miniupnpc 2.2.8:
+
+https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f
+
+Warning: This is not a proper patch suitable for upstream! It assumes the
+parameter is always there, which is not true for older versions.
+So handle with care!
+--- a/osdep/PortMapper.cpp
++++ b/osdep/PortMapper.cpp
+@@ -203,6 +203,7 @@ public:
+                       // 
---------------------------------------------------------------------
+                       if (mode == 1) {
+                               char lanaddr[64];
++                              char wanaddr[64];
+                               char externalip[4096]; // no range checking? so 
make these buffers larger than any UDP packet a uPnP server could send us as a 
precaution :P
+                               char inport[16];
+                               char outport[16];
+@@ -224,13 +225,14 @@ public:
+ #endif
+ 
+                                       memset(lanaddr,0,sizeof(lanaddr));
++                                      memset(wanaddr,0,sizeof(wanaddr));
+                                       memset(externalip,0,sizeof(externalip));
+                                       memset(&urls,0,sizeof(urls));
+                                       memset(&data,0,sizeof(data));
+                                       
OSUtils::ztsnprintf(inport,sizeof(inport),"%d",localPort);
+ 
+                                       int foundValidIGD = 0;
+-                                      if ((foundValidIGD = 
UPNP_GetValidIGD(devlist,&urls,&data,lanaddr,sizeof(lanaddr)))&&(lanaddr[0])) {
++                                      if ((foundValidIGD = 
UPNP_GetValidIGD(devlist,&urls,&data,lanaddr,sizeof(lanaddr),wanaddr,sizeof(wanaddr)))&&(lanaddr[0]))
 {
+ #ifdef ZT_PORTMAPPER_TRACE
+                         PM_TRACE("PortMapper: UPnP: my LAN IP address: %s" 
ZT_EOL_S,lanaddr);
+ #endif
+-- 
+2.47.0
+

diff --git a/net-misc/zerotier/zerotier-1.14.2-r2.ebuild 
b/net-misc/zerotier/zerotier-1.14.2-r2.ebuild
new file mode 100644
index 000000000000..e24d9a2fb9d9
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.14.2-r2.ebuild
@@ -0,0 +1,493 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+
+CRATES="
+       addr2line@0.24.2
+       adler2@2.0.0
+       aho-corasick@1.1.3
+       allocator-api2@0.2.18
+       android-tzdata@0.1.1
+       android_system_properties@0.1.5
+       ansi_term@0.12.1
+       anstyle@1.0.8
+       anyhow@1.0.91
+       async-stream-impl@0.3.6
+       async-stream@0.3.6
+       async-trait@0.1.83
+       atomic-waker@1.1.2
+       atty@0.2.14
+       autocfg@1.4.0
+       axum-core@0.4.5
+       axum@0.7.7
+       backoff@0.4.0
+       backtrace@0.3.74
+       base16ct@0.2.0
+       base64@0.13.1
+       base64@0.21.7
+       base64@0.22.1
+       base64ct@1.6.0
+       bitflags@1.3.2
+       bitflags@2.6.0
+       block-buffer@0.10.4
+       bumpalo@3.16.0
+       byteorder@1.5.0
+       bytes@1.8.0
+       cbindgen@0.20.0
+       cc@1.1.31
+       cfg-if@1.0.0
+       chrono@0.4.38
+       clap@2.34.0
+       const-oid@0.9.6
+       core-foundation-sys@0.8.7
+       core-foundation@0.9.4
+       cpufeatures@0.2.14
+       crossbeam-channel@0.5.13
+       crossbeam-queue@0.3.11
+       crossbeam-utils@0.8.20
+       crypto-bigint@0.5.5
+       crypto-common@0.1.6
+       curve25519-dalek-derive@0.1.1
+       curve25519-dalek@4.1.3
+       darling@0.20.10
+       darling_core@0.20.10
+       darling_macro@0.20.10
+       dashmap@5.5.3
+       dashmap@6.1.0
+       der@0.7.9
+       deranged@0.3.11
+       derive_builder@0.20.2
+       derive_builder_core@0.20.2
+       derive_builder_macro@0.20.2
+       derive_more-impl@1.0.0
+       derive_more@1.0.0
+       digest@0.10.7
+       downcast@0.11.0
+       dyn-clone@1.0.17
+       ecdsa@0.16.9
+       ed25519-dalek@2.1.1
+       ed25519@2.2.3
+       either@1.13.0
+       elliptic-curve@0.13.8
+       encoding_rs@0.8.34
+       enum-iterator-derive@1.4.0
+       enum-iterator@2.1.0
+       enum_dispatch@0.3.13
+       equivalent@1.0.1
+       erased-serde@0.4.5
+       errno@0.3.9
+       fastrand@2.1.1
+       ff@0.13.0
+       fiat-crypto@0.2.9
+       fixedbitset@0.4.2
+       fnv@1.0.7
+       foldhash@0.1.3
+       foreign-types-shared@0.1.1
+       foreign-types@0.3.2
+       form_urlencoded@1.2.1
+       fragile@2.0.0
+       futures-channel@0.3.31
+       futures-core@0.3.31
+       futures-executor@0.3.31
+       futures-io@0.3.31
+       futures-macro@0.3.31
+       futures-retry@0.6.0
+       futures-sink@0.3.31
+       futures-task@0.3.31
+       futures-timer@3.0.3
+       futures-util@0.3.31
+       futures@0.3.31
+       generic-array@0.14.7
+       getrandom@0.2.15
+       gimli@0.31.1
+       governor@0.6.3
+       group@0.13.0
+       h2@0.3.26
+       h2@0.4.6
+       hashbrown@0.12.3
+       hashbrown@0.14.5
+       hashbrown@0.15.0
+       heck@0.3.3
+       heck@0.5.0
+       hermit-abi@0.1.19
+       hermit-abi@0.3.9
+       hex@0.4.3
+       hkdf@0.12.4
+       hmac@0.12.1
+       http-body-util@0.1.2
+       http-body@0.4.6
+       http-body@1.0.1
+       http@0.2.12
+       http@1.1.0
+       httparse@1.9.5
+       httpdate@1.0.3
+       hyper-timeout@0.5.1
+       hyper-tls@0.5.0
+       hyper-util@0.1.9
+       hyper@0.14.31
+       hyper@1.5.0
+       iana-time-zone-haiku@0.1.2
+       iana-time-zone@0.1.61
+       ident_case@1.0.1
+       idna@0.5.0
+       indexmap@1.9.3
+       indexmap@2.6.0
+       instant@0.1.13
+       inventory@0.3.15
+       ipnet@2.10.1
+       itertools@0.10.5
+       itertools@0.13.0
+       itoa@1.0.11
+       js-sys@0.3.72
+       lazy_static@1.5.0
+       libc@0.2.161
+       libm@0.2.8
+       linux-raw-sys@0.4.14
+       lock_api@0.4.12
+       log@0.4.22
+       lru@0.12.5
+       matchers@0.1.0
+       matchit@0.7.3
+       memchr@2.7.4
+       mime@0.3.17
+       miniz_oxide@0.8.0
+       mio@1.0.2
+       mockall@0.13.0
+       mockall_derive@0.13.0
+       multimap@0.10.0
+       native-tls@0.2.12
+       no-std-compat@0.4.1
+       nonzero_ext@0.3.0
+       ntapi@0.4.1
+       nu-ansi-term@0.46.0
+       num-bigint-dig@0.8.4
+       num-conv@0.1.0
+       num-integer@0.1.46
+       num-iter@0.1.45
+       num-traits@0.2.19
+       oauth2@4.4.2
+       object@0.36.5
+       once_cell@1.20.2
+       openidconnect@3.5.0
+       openssl-macros@0.1.1
+       openssl-probe@0.1.5
+       openssl-sys@0.9.104
+       openssl@0.10.68
+       opentelemetry@0.24.0
+       ordered-float@2.10.1
+       overload@0.1.1
+       p256@0.13.2
+       p384@0.13.0
+       parking_lot@0.12.3
+       parking_lot_core@0.9.10
+       pem-rfc7468@0.7.0
+       percent-encoding@2.3.1
+       petgraph@0.6.5
+       pid@4.0.0
+       pin-project-internal@1.1.6
+       pin-project-lite@0.2.14
+       pin-project@1.1.6
+       pin-utils@0.1.0
+       pkcs1@0.7.5
+       pkcs8@0.10.2
+       pkg-config@0.3.31
+       portable-atomic@1.9.0
+       powerfmt@0.2.0
+       ppv-lite86@0.2.20
+       predicates-core@1.0.8
+       predicates-tree@1.0.11
+       predicates@3.1.2
+       prettyplease@0.2.24
+       primeorder@0.13.6
+       proc-macro2@1.0.89
+       prometheus@0.13.4
+       prost-build@0.13.3
+       prost-derive@0.13.3
+       prost-types@0.13.3
+       prost-wkt-build@0.6.0
+       prost-wkt-types@0.6.0
+       prost-wkt@0.6.0
+       prost@0.13.3
+       protobuf@2.28.0
+       quanta@0.12.3
+       quote@1.0.37
+       rand@0.8.5
+       rand_chacha@0.3.1
+       rand_core@0.6.4
+       raw-cpuid@11.2.0
+       redox_syscall@0.5.7
+       regex-automata@0.1.10
+       regex-automata@0.4.8
+       regex-syntax@0.6.29
+       regex-syntax@0.8.5
+       regex@1.11.0
+       reqwest@0.11.27
+       rfc6979@0.4.0
+       ring@0.17.8
+       ringbuf@0.4.7
+       rsa@0.9.6
+       rustc-demangle@0.1.24
+       rustc_version@0.4.1
+       rustix@0.38.37
+       rustls-native-certs@0.8.0
+       rustls-pemfile@1.0.4
+       rustls-pemfile@2.2.0
+       rustls-pki-types@1.10.0
+       rustls-webpki@0.102.8
+       rustls@0.23.15
+       rustversion@1.0.18
+       ryu@1.0.18
+       schannel@0.1.26
+       scopeguard@1.2.0
+       sec1@0.7.3
+       security-framework-sys@2.12.0
+       security-framework@2.11.1
+       semver@1.0.23
+       serde-value@0.7.0
+       serde@1.0.213
+       serde_derive@1.0.213
+       serde_json@1.0.132
+       serde_path_to_error@0.1.16
+       serde_plain@1.0.2
+       serde_urlencoded@0.7.1
+       serde_with@3.11.0
+       serde_with_macros@3.11.0
+       sha2@0.10.8
+       sharded-slab@0.1.7
+       shlex@1.3.0
+       signal-hook-registry@1.4.2
+       signature@2.2.0
+       siphasher@1.0.1
+       slab@0.4.9
+       slotmap@1.0.7
+       smallvec@1.13.2
+       socket2@0.5.7
+       spin@0.9.8
+       spinning_top@0.3.0
+       spki@0.7.3
+       strsim@0.11.1
+       strsim@0.8.0
+       subtle@2.6.1
+       syn@1.0.109
+       syn@2.0.82
+       sync_wrapper@0.1.2
+       sync_wrapper@1.0.1
+       sysinfo@0.32.0
+       system-configuration-sys@0.5.0
+       system-configuration@0.5.1
+       tempfile@3.13.0
+       termtree@0.4.1
+       textwrap@0.11.0
+       thiserror-impl@1.0.65
+       thiserror@1.0.65
+       thread_local@1.1.8
+       time-core@0.1.2
+       time-macros@0.2.18
+       time@0.3.36
+       tinyvec@1.8.0
+       tinyvec_macros@0.1.1
+       tokio-macros@2.4.0
+       tokio-native-tls@0.3.1
+       tokio-rustls@0.26.0
+       tokio-stream@0.1.16
+       tokio-util@0.7.12
+       tokio@1.41.0
+       toml@0.5.11
+       tonic-build@0.12.3
+       tonic@0.12.3
+       tower-layer@0.3.3
+       tower-service@0.3.3
+       tower@0.4.13
+       tower@0.5.1
+       tracing-attributes@0.1.27
+       tracing-core@0.1.32
+       tracing-log@0.2.0
+       tracing-subscriber@0.3.18
+       tracing@0.1.40
+       try-lock@0.2.5
+       typeid@1.0.2
+       typenum@1.17.0
+       typetag-impl@0.2.18
+       typetag@0.2.18
+       unicode-bidi@0.3.17
+       unicode-ident@1.0.13
+       unicode-normalization@0.1.24
+       unicode-segmentation@1.12.0
+       unicode-width@0.1.14
+       unicode-xid@0.2.6
+       untrusted@0.9.0
+       url@2.5.2
+       uuid@1.11.0
+       valuable@0.1.0
+       vcpkg@0.2.15
+       vec_map@0.8.2
+       version_check@0.9.5
+       want@0.3.1
+       wasi@0.11.0+wasi-snapshot-preview1
+       wasm-bindgen-backend@0.2.95
+       wasm-bindgen-futures@0.4.45
+       wasm-bindgen-macro-support@0.2.95
+       wasm-bindgen-macro@0.2.95
+       wasm-bindgen-shared@0.2.95
+       wasm-bindgen@0.2.95
+       web-sys@0.3.72
+       winapi-i686-pc-windows-gnu@0.4.0
+       winapi-x86_64-pc-windows-gnu@0.4.0
+       winapi@0.3.9
+       windows-core@0.52.0
+       windows-core@0.57.0
+       windows-implement@0.57.0
+       windows-interface@0.57.0
+       windows-result@0.1.2
+       windows-sys@0.48.0
+       windows-sys@0.52.0
+       windows-sys@0.59.0
+       windows-targets@0.48.5
+       windows-targets@0.52.6
+       windows@0.57.0
+       windows_aarch64_gnullvm@0.48.5
+       windows_aarch64_gnullvm@0.52.6
+       windows_aarch64_msvc@0.48.5
+       windows_aarch64_msvc@0.52.6
+       windows_i686_gnu@0.48.5
+       windows_i686_gnu@0.52.6
+       windows_i686_gnullvm@0.52.6
+       windows_i686_msvc@0.48.5
+       windows_i686_msvc@0.52.6
+       windows_x86_64_gnu@0.48.5
+       windows_x86_64_gnu@0.52.6
+       windows_x86_64_gnullvm@0.48.5
+       windows_x86_64_gnullvm@0.52.6
+       windows_x86_64_msvc@0.48.5
+       windows_x86_64_msvc@0.52.6
+       winreg@0.50.0
+       zerocopy-derive@0.7.35
+       zerocopy@0.7.35
+       zeroize@1.8.1
+"
+
+declare -A GIT_CRATES=(
+       
[jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%'
+       
[rustfsm]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/fsm'
+       
[rustfsm_procmacro]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/fsm/rustfsm_procmacro'
+       
[rustfsm_trait]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/fsm/rustfsm_trait'
+       
[temporal-client]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/client'
+       
[temporal-sdk-core-api]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/core-api'
+       
[temporal-sdk-core-protos]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/sdk-core-protos'
+       
[temporal-sdk-core]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/core'
+       
[temporal-sdk]='https://github.com/temporalio/sdk-core;730aadcc02767ae630e88f8f8c788a85d6bc81e6;sdk-core-%commit%/sdk'
+)
+
+RUST_OPTIONAL=1
+
+inherit cargo 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
+       sso? (
+               ${CARGO_CRATE_URIS}
+       )
+"
+S="${WORKDIR}"/ZeroTierOne-${PV}
+
+LICENSE="BUSL-1.1"
+# Dependent crate licenses
+LICENSE+=" sso? ( 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="cpu_flags_arm_neon debug sso"
+
+# >=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:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       sso? (
+               ${RUST_DEPEND}
+       )
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
+       "${FILESDIR}"/${PN}-1.14.2-miniupnpc-2.2.8.patch
+)
+
+DOCS=( README.md AUTHORS.md )
+
+pkg_setup() {
+       use sso && rust_pkg_setup
+}
+
+src_unpack() {
+       unpack ${P}.tar.gz
+       use sso && cargo_src_unpack
+}
+
+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 -rf ext/{miniupnpc,libnatpmp} || die
+
+       #1. Dont call cargo, we'll run it with cargo eclass functions
+       #2. Remove man page compression and install, we'll handle it with 
ebuild functions
+       #3. Gentoo generates target specific build dirs now bug #937782
+       sed -i \
+               -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \
+               -e '/install:/,/^$/ { /man[0-9]/d }' \
+               -e "s|rustybits/target/$(usex debug debug 
release)|rustybits/$(cargo_target_dir)|" \
+               make-linux.mk || die
+}
+
+src_configure() {
+       tc-export CXX CC
+
+       use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1
+
+       use sso && cargo_src_configure
+}
+
+src_compile() {
+       #TODO: New rusty bit smeeclient isnt built
+       myemakeargs=(
+               CXX="${CXX}"
+               STRIP=:
+
+               # 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)"
+       )
+
+       pushd rustybits/zeroidc > /dev/null || die
+       use sso && cargo_src_compile
+       popd > /dev/null || die
+
+       emake "${myemakeargs[@]}" one
+}
+
+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}
+}