iproute2: drop obsolete patch

Since version 4.5.0 the iptables_common.h header is unused. Don't bother
patching this file.

Renumber the following patch.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/iproute2/0002-Add-missing-sys-types.h-include.patch b/package/iproute2/0002-Add-missing-sys-types.h-include.patch
deleted file mode 100644 (file)
index ef91814..0000000
--- a/package/iproute2/0002-Add-missing-sys-types.h-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 19 Nov 2015 17:48:55 +0100
-Subject: [PATCH] Add missing <sys/types.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The u_intXX_t types are defined in <sys/types.h>, so it should be
-included before using those types. Otherwise, with certain C
-libraries, the build fails with:
-
-In file included from ../include/iptables.h:4:0,
-                 from m_ipt.c:18:
-../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
- #define __le32 u_int32_t
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- include/iptables_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/iptables_common.h b/include/iptables_common.h
-index 9099667..2c27a4b 100644
---- a/include/iptables_common.h
-+++ b/include/iptables_common.h
-@@ -43,6 +43,8 @@ extern char *lib_dir;
-   extern void init_extensions(void);
- #endif
- 
-+#include <sys/types.h>
-+
- #define __be32        u_int32_t
- #define __le32        u_int32_t
- #define __be16        u_int16_t
--- 
-2.6.3
-

diff --git a/package/iproute2/0002-ip-include-libc-headers-first.patch b/package/iproute2/0002-ip-include-libc-headers-first.patch
new file mode 100644 (file)
index 0000000..b842142
--- /dev/null
+++ b/package/iproute2/0002-ip-include-libc-headers-first.patch
@@ -0,0 +1,35 @@
+From 8afdd8babb9e82bcfde78e851b24b698436a6f9f Mon Sep 17 00:00:00 2001
+Message-Id: <8afdd8babb9e82bcfde78e851b24b698436a6f9f.1495466847.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 22 May 2017 15:42:49 +0300
+Subject: [PATCH] ip: include libc headers first
+
+Including libc headers first helps as a workaround to redefinition of struct
+ethhdr with a suitably patched musl libc that suppresses the kernel
+if_ether.h.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: posted http://marc.info/?l=linux-netdev&m=149545968900803&w=2
+
+ ip/iplink_bridge.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
+index 818b43c89b5b..cccdec1c203a 100644
+--- a/ip/iplink_bridge.c
++++ b/ip/iplink_bridge.c
+@@ -13,9 +13,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <netinet/in.h>
++#include <netinet/ether.h>
+ #include <linux/if_link.h>
+ #include <linux/if_bridge.h>
+-#include <netinet/ether.h>
+ #include <net/if.h>
+ 
+ #include "rt_names.h"
+-- 
+2.11.0
+

diff --git a/package/iproute2/0003-ip-include-libc-headers-first.patch b/package/iproute2/0003-ip-include-libc-headers-first.patch
deleted file mode 100644 (file)
index b842142..0000000
--- a/package/iproute2/0003-ip-include-libc-headers-first.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8afdd8babb9e82bcfde78e851b24b698436a6f9f Mon Sep 17 00:00:00 2001
-Message-Id: <8afdd8babb9e82bcfde78e851b24b698436a6f9f.1495466847.git.baruch@tkos.co.il>
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Mon, 22 May 2017 15:42:49 +0300
-Subject: [PATCH] ip: include libc headers first
-
-Including libc headers first helps as a workaround to redefinition of struct
-ethhdr with a suitably patched musl libc that suppresses the kernel
-if_ether.h.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: posted http://marc.info/?l=linux-netdev&m=149545968900803&w=2
-
- ip/iplink_bridge.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
-index 818b43c89b5b..cccdec1c203a 100644
---- a/ip/iplink_bridge.c
-+++ b/ip/iplink_bridge.c
-@@ -13,9 +13,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <netinet/in.h>
-+#include <netinet/ether.h>
- #include <linux/if_link.h>
- #include <linux/if_bridge.h>
--#include <netinet/ether.h>
- #include <net/if.h>
- 
- #include "rt_names.h"
--- 
-2.11.0
-