sys-apps/iproute2: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

7 files changed, 0 insertions, 451 deletions

diff --git a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
deleted file mode 100644
index be606c107fc2..000000000000
--- a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -15,6 +15,7 @@
- #include <string.h>
- #include <stdbool.h>
- #include <unistd.h>
-+#include <signal.h>
- #include <getopt.h>
- #include <limits.h>
- #include <errno.h>
diff --git a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
deleted file mode 100644
index 888091387fe9..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Disable the optional libbsd fallback in favor of iproute2's own
-strlcat/strlcpy routines. This prevents automagic linking and
-all sorts of other related problems.
-
-Bug: https://bugs.gentoo.org/911727
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-
---- a/configure	2023-09-05 16:20:48.000000000 +0200
-+++ b/configure	2023-09-05 16:29:15.850347415 +0200
-@@ -454,14 +454,8 @@ EOF
-     if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
- 	echo "no"
-     else
--	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
--		echo "no"
--	else
- 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
- 		echo "yes"
--	fi
-     fi
-     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
- }
diff --git a/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch b/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
deleted file mode 100644
index 4618fb9c94ef..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libbsd, libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
-
-Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727
-by Holger Hoffstätte <holger@applied-asynchrony.com>
-
---- a/config.include
-+++ b/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
-
---- a/bridge/Makefile
-+++ b/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- a/configure
-+++ b/configure
-@@ -202,7 +202,7 @@ EOF
-     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -269,8 +269,8 @@ check_elf()
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -388,8 +388,8 @@ check_selinux()
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -414,8 +414,8 @@ check_mnl()
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -455,8 +455,8 @@ EOF
- 	echo "no"
-     else
- 	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
-+		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
-+		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
- 		echo "no"
- 	else
- 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
-@@ -472,8 +472,8 @@ check_cap()
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -633,7 +633,3 @@ check_strlcpy
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
---- a/dcb/Makefile
-+++ b/dcb/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DCBOBJ = dcb.o \
-          dcb_app.o \
---- a/devlink/Makefile
-+++ b/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DEVLINKOBJ = devlink.o mnlg.o
- TARGETS += devlink
---- a/genl/Makefile
-+++ b/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -18,6 +18,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=routel
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- a/misc/Makefile
-+++ b/misc/Makefile
-@@ -5,6 +5,7 @@ LNSTATOBJ=lnstat.o lnstat_util.o
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- a/netem/Makefile
-+++ b/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- a/rdma/Makefile
-+++ b/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -I./include/uapi/
- 
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -4,6 +4,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \
-        emp_ematch.tab.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- a/tipc/Makefile
-+++ b/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TIPCOBJ=bearer.o \
-     cmdl.o link.o \
---- a/vdpa/Makefile
-+++ b/vdpa/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -I./include/uapi/
- VDPAOBJ = vdpa.o
--- 
-2.42.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch b/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch
deleted file mode 100644
index f2895021eb1b..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
---- a/tc/tc_core.c
-+++ b/tc/tc_core.c
-@@ -197,12 +197,12 @@ int tc_calc_size_table(struct tc_sizespec *s, __u16 **stab)
- 	}
- 
- 	if (s->mtu == 0)
--		s->mtu = 2047;
-+		s->mtu = 2048;
- 	if (s->tsize == 0)
- 		s->tsize = 512;
- 
- 	s->cell_log = 0;
--	while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+	while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
- 		s->cell_log++;
- 
- 	*stab = malloc(s->tsize * sizeof(__u16));
---- a/tc/tc_stab.c
-+++ b/tc/tc_stab.c
-@@ -27,7 +27,7 @@ static void stab_help(void)
- 	fprintf(stderr,
- 		"Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ]\n"
- 		"                [ overhead BYTES ] [ linklayer TYPE ] ...\n"
--		"   mtu       : max packet size we create rate map for {2047}\n"
-+		"   mtu       : max packet size we create size table for {2048}\n"
- 		"   tsize     : how many slots should size table have {512}\n"
- 		"   mpu       : minimum packet size used in rate computations\n"
- 		"   overhead  : per-packet size overhead used in rate computations\n"
--- 
-2.42.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch b/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
deleted file mode 100644
index 0969ff0a7ab9..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://lore.kernel.org/netdev/20231202024705.1375296-1-sam@gentoo.org/T/#u
-
-From 3dc0bf34c1571429c08a8d0c08a69502e3e4575c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Dec 2023 02:46:05 +0000
-Subject: [PATCH] configure: Add _GNU_SOURCE to strlcpy configure test
-
->=glibc-2.38 adds strlcpy but it's guarded under a feature-test macro. Just
-add _GNU_SOURCE to the configure test because we already pass _GNU_SOURCE unconditionally
-in the Makefiles when building iproute2.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure
-+++ b/configure
-@@ -445,6 +445,7 @@ EOF
- check_strlcpy()
- {
-     cat >$TMPDIR/strtest.c <<EOF
-+#define _GNU_SOURCE
- #include <string.h>
- int main(int argc, char **argv) {
- 	char dst[10];
--- 
-2.43.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch b/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
deleted file mode 100644
index 03c125accc8c..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/920054
-https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=962692356a1cc41932e43575f3c50927e455ab53
-
-From 962692356a1cc41932e43575f3c50927e455ab53 Mon Sep 17 00:00:00 2001
-From: Andrea Claudi <aclaudi@redhat.com>
-Date: Wed, 15 Nov 2023 18:25:35 +0100
-Subject: Makefile: use /usr/share/iproute2 for config files
-
-According to FHS:
-
-"/usr/lib includes object files and libraries. On some systems, it may
-also include internal binaries that are not intended to be executed
-directly by users or shell scripts."
-
-A better directory to store config files is /usr/share:
-
-"The /usr/share hierarchy is for all read-only architecture independent
-data files.
-
-This hierarchy is intended to be shareable among all architecture
-platforms of a given OS; thus, for example, a site with i386, Alpha, and
-PPC platforms might maintain a single /usr/share directory that is
-centrally-mounted."
-
-Accordingly, move configuration files to $(DATADIR)/iproute2.
-
-Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config")
-Reported-by: Luca Boccassi <luca.boccassi@gmail.com>
-Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
-Acked-by: Luca Boccassi <bluca@debian.org>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a24844cf0..8024d45ec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,12 +16,12 @@ endif
- 
- PREFIX?=/usr
- SBINDIR?=/sbin
--CONF_ETC_DIR?=/etc/iproute2
--CONF_USR_DIR?=$(PREFIX)/lib/iproute2
- NETNS_RUN_DIR?=/var/run/netns
- NETNS_ETC_DIR?=/etc/netns
- DATADIR?=$(PREFIX)/share
- HDRDIR?=$(PREFIX)/include/iproute2
-+CONF_ETC_DIR?=/etc/iproute2
-+CONF_USR_DIR?=$(DATADIR)/iproute2
- DOCDIR?=$(DATADIR)/doc/iproute2
- MANDIR?=$(DATADIR)/man
- ARPDDIR?=/var/lib/arpd
--- 
-cgit 1.2.3-korg
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch b/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
deleted file mode 100644
index 79be096af231..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/920054
-https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=deb66acabe44d103c8368b62a76ef37aa074748d
-
-From deb66acabe44d103c8368b62a76ef37aa074748d Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Mon, 6 Nov 2023 00:14:10 +0000
-Subject: Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
-
-LIBDIR in Debian and derivatives is not /usr/lib/, it's
-/usr/lib/<architecture triplet>/, which is different, and it's the
-wrong location where to install architecture-independent default
-configuration files, which should always go to /usr/lib/ instead.
-Installing these files to the per-architecture directory is not
-the right thing, hence revert the change.
-
-This reverts commit 946753a4459bd035132a27bb2eb87529c1979b90.
-
-Signed-off-by: Luca Boccassi <bluca@debian.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5c559c8dc..a24844cf0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ endif
- PREFIX?=/usr
- SBINDIR?=/sbin
- CONF_ETC_DIR?=/etc/iproute2
--CONF_USR_DIR?=$(LIBDIR)/iproute2
-+CONF_USR_DIR?=$(PREFIX)/lib/iproute2
- NETNS_RUN_DIR?=/var/run/netns
- NETNS_ETC_DIR?=/etc/netns
- DATADIR?=$(PREFIX)/share
--- 
-cgit 1.2.3-korg