From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 26 Sep 2017 15:13:18 +0000 (+0300)
Subject: ipset: replace patch that was reverted upstream
X-Git-Tag: v18.06.0-rc1~2173
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=456de2129727cdbeb0552f9a593518eb5452eef8;p=openwrt%2Fopenwrt.git

ipset: replace patch that was reverted upstream

Use the correct prefix for backports while at it.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

diff --git a/package/network/utils/ipset/patches/001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch b/package/network/utils/ipset/patches/001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch
new file mode 100644
index 0000000000..745e9fa3b3
--- /dev/null
+++ b/package/network/utils/ipset/patches/001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch
@@ -0,0 +1,25 @@
+From a4212bf911026740afc7fce98d9100e2ef5dcea0 Mon Sep 17 00:00:00 2001
+From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+Date: Tue, 26 Sep 2017 07:00:13 +0200
+Subject: [PATCH] Replace the last reference to u_int8_t with uint8_t.
+
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index 79f56b8..df0778a 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -282,7 +282,7 @@ call_parser(int *argc, char *argv[], const struct ipset_type *type,
+ 	const struct ipset_arg *arg;
+ 	const char *optstr;
+ 	const struct ipset_type *t = type;
+-	u_int8_t revision = type->revision;
++	uint8_t revision = type->revision;
+ 	int ret = 0, i = 1;
+ 
+ 	/* Currently CREATE and ADT may have got additional arguments */
+-- 
+2.13.5
+
diff --git a/package/network/utils/ipset/patches/100-ipset-fix-build-with-musl.patch b/package/network/utils/ipset/patches/100-ipset-fix-build-with-musl.patch
deleted file mode 100644
index 38377d698d..0000000000
--- a/package/network/utils/ipset/patches/100-ipset-fix-build-with-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 992723e3712a09037338aa9e5506a080e24d1642 Mon Sep 17 00:00:00 2001
-From: Stijn Tintel <stijn@linux-ipv6.be>
-Date: Mon, 25 Sep 2017 08:09:01 +0300
-Subject: [PATCH] ipset: fix build with musl
-
-Include sys/types.h for u_int8_t and define _GNU_SOURCE for musl to
-expose it.
-
-Fixes: 54802b2c2826 ("Report if the option is supported by a newer kernel release")
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
-Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
----
- src/ipset.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/ipset.c b/src/ipset.c
-index 79f56b8..8d70abc 100644
---- a/src/ipset.c
-+++ b/src/ipset.c
-@@ -14,6 +14,8 @@
- #include <stdio.h>			/* fprintf, fgets */
- #include <stdlib.h>			/* exit */
- #include <string.h>			/* str* */
-+#define _GNU_SOURCE
-+#include <sys/types.h>			/* u_int8_t */
- 
- #include <config.h>
- 
--- 
-2.13.5
-