commit: c44cbd01c9c7957ab2bf1257eafd2f93c746caae Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Nov 23 16:35:59 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 22:23:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44cbd01
net-misc/zerotier: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../files/zerotier-1.12.2-noexecstack.patch | 24 --------------- .../files/zerotier-1.14.0-respect-ldflags.patch | 24 --------------- .../files/zerotier-1.14.0-update-time.patch | 36 ---------------------- 3 files changed, 84 deletions(-) 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 <[email protected]> -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 <[email protected]> ---- 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 <[email protected]> -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 <[email protected]> ---- 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", -
