gentoo auto-resync : 09:09:2022 - 16:40:34

8 files changed, 96 insertions, 134 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c50e9f0157d8..9b90785743fb 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 9537787cf95b..37a88f5379f1 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,10 +1,6 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
-DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
-DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
 DIST xmrig-6.18.0.tar.gz 2389032 BLAKE2B c7561e2d9303c80f97615471a28f57bc48c93749459e48451de52d1130b436298354a0419c3ed3c96f2bfe3592b7d28f85b91c7698174917d6eb08b685a12145 SHA512 ed20b760ae7603de752c933513c3f7abb2e254a44d79252264952f3e70c7b5320389ed4f6534a6dc8eb7cac8b1086239c46baf18c71f7ba7f0018914b2fd5917
-EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
-EBUILD xmrig-6.17.0.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
 EBUILD xmrig-6.18.0.ebuild 1339 BLAKE2B 9b7bcd3cf6831626278475a3b08c912da8d5cb646c928493dbcddea6b6a34dbe54a650200f2676921c7daa96b288b7654699a816d55d387174d475c6562ad786 SHA512 2d0e6334dcd30bf5a357c14089842bb00df837ea4fd37b5901687f568b2f23906da5ab2add4f15ea043ef2a56c5a022381d80c7227a0ef69131aff252f7c3824
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.16.4.ebuild b/net-misc/xmrig/xmrig-6.16.4.ebuild
deleted file mode 100644
index 1b72caa1898c..000000000000
--- a/net-misc/xmrig/xmrig-6.16.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.17.0.ebuild b/net-misc/xmrig/xmrig-6.17.0.ebuild
deleted file mode 100644
index 1b72caa1898c..000000000000
--- a/net-misc/xmrig/xmrig-6.17.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 4c43310ddf51..b88e172a4f6a 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,7 +1,11 @@
+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.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
+DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd
 DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c
+EBUILD zerotier-1.10.1.ebuild 1342 BLAKE2B 6fc9a0c73c10e645ce1bf070bbae2ac66d7c7e875d2f0fd09a6c8f75de1243383c793acd5a5d59115a28b06fc0bda4d456e68a96864823848d0783fa7c3073d9 SHA512 5cd827beda429e5b9f26a4a6590beaf8e8b76af9bf1e6b005b81b8088e744a19ab1cc112071b1a17cfa3a86e2a3214a3f1f76213c7b3bd770b3d21ed435bb281
 EBUILD zerotier-1.6.4.ebuild 1811 BLAKE2B e322dffb348bd3150f528a363dbc371b162c638c16e72a5a5da93d627980039fc8f8f2a0eee1e780e91e23b643d72835310db73d41e6d119c9ea964756eabc57 SHA512 912d1a950617ea9db70f5d71329cad3fc5f3e669d0ffbaa02bc7dacf127f67ae62abb6e987b7a39a02a3c0093d1d8c670b5af4190a47443321449862a7d8270d
 MISC metadata.xml 420 BLAKE2B c51b54f7c06949c82cb1c1676110dc9221c8cb5638a1ac746a3cccf2bea40189b9c2d5eca2d0770ce60e3a934ba2c2c00930d54dd6855a5f27e8eeb2f7c1f259 SHA512 2318e3bbb8738b7f50f46e80a8186649ab5cfc1645fae790fdaa58bdb987dca6ca3819af0537ad27c437bbc0cf5c34ed265a54b6043a0d26431a1919c8ee8289
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
new file mode 100644
index 000000000000..c0dd5e900269
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch
@@ -0,0 +1,14 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -203,6 +203,11 @@ ifeq ($(CC_MACH),armv7)
+ 	override DEFS+=-DZT_NO_TYPE_PUNNING
+ 	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
+ endif
++ifeq ($(CC_MACH),armv7a)
++	ZT_ARCHITECTURE=3
++	override DEFS+=-DZT_NO_TYPE_PUNNING
++	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
++endif
+ ifeq ($(CC_MACH),armv7l)
+ 	ZT_ARCHITECTURE=3
+ 	override DEFS+=-DZT_NO_TYPE_PUNNING
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
new file mode 100644
index 000000000000..41a42197c17d
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -70,7 +70,7 @@ else
+ 	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ 	CXXFLAGS?=-O3 -fstack-protector
+ 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+-	LDFLAGS=-pie -Wl,-z,relro,-z,now
++	LDFLAGS?=-pie -Wl,-z,relro,-z,now
+ 	RUSTFLAGS=--release
+ endif
+ 
diff --git a/net-misc/zerotier/zerotier-1.10.1.ebuild b/net-misc/zerotier/zerotier-1.10.1.ebuild
new file mode 100644
index 000000000000..fff14d007687
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.10.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/ZeroTierOne-${PV}
+
+LICENSE="BSL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="cpu_flags_arm_neon"
+
+RDEPEND="
+	dev-libs/json-glib
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-2:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch
+	"${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
+)
+
+DOCS=( README.md AUTHORS.md )
+
+src_configure() {
+	tc-export CXX CC
+
+	append-ldflags -Wl,-z,noexecstack
+
+	use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1
+}
+
+src_compile() {
+	myemakeargs=(
+		CXX="${CXX}"
+		STRIP=:
+
+		# Needs Rust and fails to build as of 1.10.1
+		ZT_SSO_SUPPORTED=0
+	)
+
+	emake "${myemakeargs[@]}" one
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" selftest
+	./zerotier-selftest || die
+}
+
+src_install() {
+	default
+
+	# Remove pre-zipped man pages
+	rm "${ED}"/usr/share/man/{man1,man8}/* || die
+
+	newinitd "${FILESDIR}/${PN}".init-r1 "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}".service
+
+	doman doc/zerotier-{cli.1,idtool.1,one.8}
+}