gentoo auto-resync : 13:11:2023 - 16:26:20

3 files changed, 28 insertions, 6 deletions

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 483e8853d0c6..bd19502ed8b9 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,5 +1,6 @@
 AUX zerotier-1.10.1-add-armv7a-support.patch 371 BLAKE2B ee67acce5deabc4670f3717eca72d99973874f2a30c913cfec1de763c2239a6ad1b5ed01270e1018dc9e4bdd8650e8e7127509dffb53d29c1886d4cd8f54b779 SHA512 def493479a982adeda85f6915ff3b5d53552c22f03a01690d5aeb23f46352faa3c53882adf16d7cc79f6cbbc2e0e3e84107de4c1a594d14bdce8cb968d1b7eb5
 AUX zerotier-1.10.1-respect-ldflags.patch 370 BLAKE2B acea29854cf64d3d84fc703ed6eafb1492536a3f4c6c028189d448bcb49e2046500bd3b4b239dc445bd6da86b5b0790659b84cecfc138c7586680a1acdbbdf1d SHA512 555dad4795442872c5e1c764c78b3152ce5a29bb69d3aa075c9852f0ca78b07e1f2929cd354fc02d0c3e5b45fe4d3da4ef9256e60876789022ace688a455b468
+AUX zerotier-1.12.2-noexecstack.patch 810 BLAKE2B d597aa3755c7d03e755c9ae910502082b56ad00c8c337a6673deced0348ef153a9fe89dea90106a345f1de22f9e8fd89d5c68770086064e121ca1a9e4bd1d846 SHA512 984500a3f65872cbcdf16714db1c82f69b3db995b55d7178f530be138ed0ff361fcde1028d76b1ac118c1e7bf55455de34488028de69f8a6e4a970c4c6841c16
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319
@@ -291,5 +292,5 @@ DIST zerotier-1.10.6.tar.gz 15259391 BLAKE2B 48a47744502f976584c622f0f117ae2b7f7
 DIST zerotier-1.12.2.tar.gz 12431815 BLAKE2B c67889ce1f2479553382f43d581631686060218d187913931d92da751606246b72763a537fa936d462cdc7b6641ee2d2f4a753cd46398a1a4e6e8ac6a2e19f11 SHA512 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73
 EBUILD zerotier-1.10.1.ebuild 1343 BLAKE2B 0547025346e58df3cd0a3991ae7e10d38d4be889815a00f15955d6dad7b5c646b24255558893752b9d253526797bc35ed3b8eff047e022a63428ffdc61ab06de SHA512 62eb9da4d3ada5f379f380d86b4db4e8bbfadb10727655fdd78b77e12eabd118d1ab0f55fd410af992387019d6aa9ae179a20ea0895bfd40e887c660bcbacf61
 EBUILD zerotier-1.10.6.ebuild 5899 BLAKE2B d0f79bfca0ddc4f68bfb5758349cd3d6acc9bae3f7435c46ec347f19c65fe26d68e776015a12f4ab935652a928d9443d6ac824401f70689ba5999e9859161c8e SHA512 570850268019bcf85af37766eb0657ec83e1e10a35331f759cc1828e410478fd4ca7beb1f804247b8aa3989f8f34f09b657b076baf3f3602abb136df7773066f
-EBUILD zerotier-1.12.2.ebuild 5887 BLAKE2B ed172c76f43eabfab14def3a178995de8c2309f02b2834026c777c51f8643edffda5b507ac011fd8f1ff5d11b9c48cb0cf53c663bb92620e90b2a8a8fdc8024e SHA512 46b31cc8a2edfa8ca5e1a7e8dc1cb1fb20ae08ad86c7463e8815e600df2547fec8803526f23ce37ddcd212a3ee1d0af93a783760f691513104f76daebb9b9fc1
+EBUILD zerotier-1.12.2.ebuild 5775 BLAKE2B 4e126418d217269b7e7ae3db35349fe2c79943f8b9c3a4ef61b65a29ce98aae08a502974b235a7b89ff9f76a7a2f2f2865598e35c91cbadce2c2a77101fd9370 SHA512 0e6f25efb2d1a9f48e180237daf1306882f09dee2237cf775474519e064844d0470702939f0a4679b20f53518c34660a581be833b6a794ee81e8dddd32e309a6
 MISC metadata.xml 437 BLAKE2B fea864d7223156676a2a4fb5e08358e629d8d90bac85ea5ebd3ab7dddaecfab06506434b4babd652822a68a31e8213b927367c1ccdd5a482836b56ea928c753d SHA512 1c1b68c5a45910769dd273c1edf826c00762b0a6557126867d9a971eb95545de80b66a62d200265e38f06fb7ffbed1f17f2da2f785984df4526064ed479c2714
diff --git a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch
new file mode 100644
index 000000000000..2888577d13ba
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch
@@ -0,0 +1,24 @@
+https://github.com/zerotier/ZeroTierOne/pull/2161
+
+From e171384c19bb0c0dfe0368e4f249dd6a30d33748 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sun, 29 Oct 2023 13:48:07 +0200
+Subject: [PATCH] Append noexecstack to linker flags instead of assembler flags
+
+* Better compatibility with LLVM toolchain where clang -c doesn't
+  support the flag, but the linker does. LLD already defaults to
+  noexecstack, but adding it in the linker phase will avoid errors about
+  unsupported options.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -358,7 +358,7 @@ override CFLAGS+=-fPIC -fPIE
+ override CXXFLAGS+=-fPIC -fPIE
+ 
+ # Non-executable stack
+-override ASFLAGS+=--noexecstack
++override LDFLAGS+=-Wl,-z,noexecstack
+ 
+ .PHONY: all
+ all:	one
diff --git a/net-misc/zerotier/zerotier-1.12.2.ebuild b/net-misc/zerotier/zerotier-1.12.2.ebuild
index fb7ba2cbffc8..d380ca84b14c 100644
--- a/net-misc/zerotier/zerotier-1.12.2.ebuild
+++ b/net-misc/zerotier/zerotier-1.12.2.ebuild
@@ -191,7 +191,7 @@ declare -A GIT_CRATES=(
 	[jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%'
 )
 
-inherit cargo flag-o-matic systemd toolchain-funcs
+inherit cargo systemd toolchain-funcs
 
 DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
 HOMEPAGE="https://www.zerotier.com/"
@@ -225,6 +225,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch
 	"${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
+	"${FILESDIR}"/${PN}-1.12.2-noexecstack.patch
 )
 
 DOCS=( README.md AUTHORS.md )
@@ -248,10 +249,6 @@ src_prepare() {
 src_configure() {
 	tc-export CXX CC
 
-	# Several assembler files without GNU-stack markings
-	# https://github.com/zerotier/ZeroTierOne/issues/1179
-	append-ldflags -Wl,-z,noexecstack
-
 	use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1
 
 	use sso && cargo_src_configure