summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-08-14 10:02:09 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-08-14 10:02:09 +0200
commit906d0f8f2dec23d5deaed51a858335752e4a6ee0 (patch)
tree90253524f1bc918c6f6f6484f77f5004d28edf6d /sys-apps/iproute2/files
parentsys-apps/iproute2: Bump to version 4.18.0 (diff)
downloadgentoo-906d0f8f2dec23d5deaed51a858335752e4a6ee0.tar.gz
gentoo-906d0f8f2dec23d5deaed51a858335752e4a6ee0.tar.bz2
gentoo-906d0f8f2dec23d5deaed51a858335752e4a6ee0.zip
sys-apps/iproute2: Removed old.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
Diffstat (limited to 'sys-apps/iproute2/files')
-rw-r--r--sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch38
-rw-r--r--sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch25
-rw-r--r--sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch42
3 files changed, 0 insertions, 105 deletions
diff --git a/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch b/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch
deleted file mode 100644
index 48cae701438e..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 18 Jul 2017 14:09:06 +0300
-Subject: [PATCH] Fix build with uClibc-ng
-
-Add a local definition for IPPROTO_MH to fix build with uClibc-ng. As of
-version 1.0.25, the uClibc-ng netinet/in.h header does not provide this
-definition. The kernel provided definition is masked by libc-compat.h. Add
-this local fix until uClibc-ng syncs netinet/in.h with glibc.
-
-This partially reverts upstream commit a9ae195a2169 (xfrm: get #define's from
-linux includes)
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: non upstreamable; local uClibc-ng compatibility fix
----
- ip/xfrm.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ip/xfrm.h b/ip/xfrm.h
-index 54d80ce5e949..50b85550fb45 100644
---- a/ip/xfrm.h
-+++ b/ip/xfrm.h
-@@ -30,6 +30,10 @@
- #include <linux/xfrm.h>
- #include <linux/ipsec.h>
-
-+#ifndef IPPROTO_MH
-+# define IPPROTO_MH 135
-+#endif
-+
- #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info))))
- #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info))
-
---
-2.13.2
-
diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
deleted file mode 100644
index d2940c9e927f..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/652986
-
-https://marc.info/?l=linux-netdev&m=152363743818340&w=2
-
---- a/lib/utils.c
-+++ b/lib/utils.c
-@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
- if (strcmp(name, "default") == 0) {
- if ((family == AF_DECnet) || (family == AF_MPLS))
- return -1;
-- addr->family = (family != AF_UNSPEC) ? family : AF_INET;
-+ addr->family = family;
- addr->bytelen = af_byte_len(addr->family);
- addr->bitlen = -2;
- addr->flags |= PREFIXLEN_SPECIFIED;
-@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
- strcmp(name, "any") == 0) {
- if ((family == AF_DECnet) || (family == AF_MPLS))
- return -1;
-- addr->family = AF_UNSPEC;
-+ addr->family = family;
- addr->bytelen = 0;
- addr->bitlen = -2;
- return 0;
---
diff --git a/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch b/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
deleted file mode 100644
index 7ed9dfbad248..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- iproute2-4.5.0/configure~ 2016-03-14 23:02:31.000000000 +0000
-+++ iproute2-4.5.0/configure 2016-03-17 13:24:17.634743197 +0000
-@@ -169,10 +169,25 @@
-
- check_ipt()
- {
-- if ! grep TC_CONFIG_XT Config > /dev/null
-+ if grep -q TC_CONFIG_XT Config
- then
-+ return
-+ fi
-+
-+ cat >$TMPDIR/ipttest.c <<EOF
-+#include <iptables.h>
-+int main() { return 0; }
-+EOF
-+
-+ if $CC -std=c90 -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \
-+ $(${PKG_CONFIG} libiptc --cflags --libs 2>/dev/null) -ldl >/dev/null 2>&1
-+ then
-+ echo "TC_CONFIG_IPT:=y" >>Config
- echo "using iptables"
-+ else
-+ echo "no"
- fi
-+ rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
- }
-
- check_ipt_lib_dir()
---- iproute2-4.5.0/tc/Makefile~ 2016-03-14 23:02:31.000000000 +0000
-+++ iproute2-4.5.0/tc/Makefile 2016-03-17 13:18:18.686689985 +0000
-@@ -88,7 +88,9 @@
- CFLAGS += -DTC_CONFIG_XT_H
- TCSO += m_xt_old.so
- else
-- TCMODULES += m_ipt.o
-+ ifeq ($(TC_CONFIG_IPT),y)
-+ TCMODULES += m_ipt.o
-+ endif
- endif
- endif
- endif