gentoo auto-resync : 24:11:2024 - 03:02:54

4 files changed, 0 insertions, 87 deletions

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index d9c2f58debc6..41eaca65ed09 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,7 +1,4 @@
 AUX zerotier-1.10.1-add-armv7a-support.patch 371 BLAKE2B ee67acce5deabc4670f3717eca72d99973874f2a30c913cfec1de763c2239a6ad1b5ed01270e1018dc9e4bdd8650e8e7127509dffb53d29c1886d4cd8f54b779 SHA512 def493479a982adeda85f6915ff3b5d53552c22f03a01690d5aeb23f46352faa3c53882adf16d7cc79f6cbbc2e0e3e84107de4c1a594d14bdce8cb968d1b7eb5
-AUX zerotier-1.12.2-noexecstack.patch 810 BLAKE2B d597aa3755c7d03e755c9ae910502082b56ad00c8c337a6673deced0348ef153a9fe89dea90106a345f1de22f9e8fd89d5c68770086064e121ca1a9e4bd1d846 SHA512 984500a3f65872cbcdf16714db1c82f69b3db995b55d7178f530be138ed0ff361fcde1028d76b1ac118c1e7bf55455de34488028de69f8a6e4a970c4c6841c16
-AUX zerotier-1.14.0-respect-ldflags.patch 740 BLAKE2B f32fe609bb76f17c664b2bea706d29d32768ed6df9102f0c24c925dd19ba2139dea9f56becdaaf2384c65c3b13631b807aca55b9a0712ee9317b317235abb81e SHA512 a0e8fde605e6d10725e553b7a885d99e7fdc846a3697a610d220c260d2590f2e9f000e14d798aadf9022e1cbb4fcf31887139cfbf7518f59cbd80dbe19cf8b0d
-AUX zerotier-1.14.0-update-time.patch 1275 BLAKE2B 1f1c4544abd227d7c09630884e9cfe1686aa489dad27bc0d012abdd96faf597e5e075768d87aa1acbe502003dadab85fcebe9e0c1cc16090932c9af6a724fa41 SHA512 d9c4ffb90a5d033516ed0dfb90a39f587f52a23d998dcb23c54d7ab94ca5335ecd8dddf6f544cc4f0d2c7c8f68e8dec42a23a08b391d80758062391fc96ccb1c
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST addr2line-0.24.1.crate 41554 BLAKE2B 583f343fb5af2768ecd3c787efbd6340d7dee70b16cbc2ca2201cde384f651ae4d7cf961bd8bc0a765bd207d6540326dd48355aed3f4afa0b9b7591548009eb6 SHA512 ffa53fcfbbccdec943410083aa5f44e93122e0b40dc45acfe00b454a02c5575549e9a61807d87080d1677da807fef695b6676036fec3ca079d2b841794dbc0b5
diff --git a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch
deleted file mode 100644
index 2888577d13ba..000000000000
--- a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/zerotier-1.14.0-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch
deleted file mode 100644
index 12e00b598975..000000000000
--- a/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/zerotier/ZeroTierOne/pull/2162
-
-From 55485ad51e5de6a344f7dc7f352df1876fa747ea Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Sun, 29 Oct 2023 14:11:13 +0200
-Subject: [PATCH 1/2] Respect user LDFLAGS
-
-* Respect user LDFLAGS instead of replacing them.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/make-linux.mk
-+++ b/make-linux.mk
-@@ -71,7 +71,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
- 	ZT_CARGO_FLAGS=--release
- endif
- 
--- 
-2.45.1
-
diff --git a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
deleted file mode 100644
index 27a991cf719b..000000000000
--- a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/938204
-https://github.com/zerotier/ZeroTierOne/issues/2345
-https://github.com/zerotier/ZeroTierOne/pull/2349
-https://github.com/zerotier/ZeroTierOne/commit/e915d109530a34370af948a04cac91b2f049c486
-https://github.com/time-rs/time/issues/681
-https://github.com/time-rs/time/pull/671
-
-diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock
-index 1b01a0df3..09d9ced0c 100644
---- a/rustybits/Cargo.lock
-+++ b/rustybits/Cargo.lock
-@@ -2855,9 +2855,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -2876,9 +2876,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-  "num-conv",
-  "time-core",
-