Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/net-tools/files/
Date: Tue, 02 Feb 2021 21:38:48
Message-Id: 1612301908.251c1906233fa28d7ce4b5d36a7eec46fea5f186.conikost@gentoo
1 commit: 251c1906233fa28d7ce4b5d36a7eec46fea5f186
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 2 16:55:58 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 21:38:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251c1906
7
8 sys-apps/net-tools: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/19306
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...235919-fix-building-w-older-linux-headers.patch | 33 ----------------------
16 1 file changed, 33 deletions(-)
17
18 diff --git a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
19 deleted file mode 100644
20 index 5e330ace021..00000000000
21 --- a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
22 +++ /dev/null
23 @@ -1,33 +0,0 @@
24 -From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001
25 -From: Mike Frysinger <vapier@g.o>
26 -Date: Mon, 14 Nov 2016 22:48:42 -0500
27 -Subject: [PATCH] iptunnel: fix building w/older linux headers
28 -
29 -While linux-4.8+ headers work, older ones are missing includes.
30 -Dropping netinet/ip.h uncovered that mess, so add linux/ip.h.
31 -
32 -URL: https://bugs.gentoo.org/599542
33 -Reported-by: Conrad Kostecki <ck@××××××××.de>
34 ----
35 - iptunnel.c | 5 +++++
36 - 1 file changed, 5 insertions(+)
37 -
38 -diff --git a/iptunnel.c b/iptunnel.c
39 -index 247ae10..d6e47e6 100644
40 ---- a/iptunnel.c
41 -+++ b/iptunnel.c
42 -@@ -29,7 +29,12 @@
43 - #include <arpa/inet.h>
44 - #include <net/if.h>
45 - #include <net/if_arp.h>
46 -+/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers
47 -+ * (pre linux-4.8) did not include all the proper headers leading to missing
48 -+ * structs and types.
49 -+ */
50 - #include <linux/types.h>
51 -+#include <linux/ip.h>
52 - #include <linux/if_tunnel.h>
53 -
54 - #include "config.h"
55 ---
56 -2.9.0