Skip to contentSkip to conversation

ipset: fix musl build

PATCH New Baruch Siach 2 participants 2 messages Oct 16, 2017 – Oct 17, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 ipset: fix musl build

Add upstream patch removing use of non-standard u_int8_t type.

Fixes:
http://autobuild.buildroot.net/results/126/126c97db87cd3bdc6d222982a53d871387cc9b50/
http://autobuild.buildroot.net/results/22d/22dcb72e75d1844828ba344f5ed126de06d2ab82/
http://autobuild.buildroot.net/results/b56/b56a6e3b5036c10f2f2b74e36c130d751b2c1312/

Cc Gustavo Zacarias <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 ...e-last-reference-to-u_int8_t-with-uint8_t.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch
package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch new file +28 -0
new file mode 100644
index 000000000000..84863e6e1377
@@ -0,0 +1,28 @@
+From a4212bf911026740afc7fce98d9100e2ef5dcea0 Mon Sep 17 00:00:00 2001
+From: Jozsef Kadlecsik <[email protected]>
+Date: Tue, 26 Sep 2017 07:00:13 +0200
+Subject: [PATCH] Replace the last reference to u_int8_t with uint8_t.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: commit a4212bf911026740
+
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index 79f56b869ea7..df0778a92d8b 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.14.2
+
Signature · 1 line
2.14.2
Applied
#1 lore raw

PATCH 1/1 ipset: fix musl build

Hello,

Quoted 7 lines · Baruch Siach

Add upstream patch removing use of non-standard u_int8_t type.

Fixes:
http://autobuild.buildroot.net/results/126/126c97db87cd3bdc6d222982a53d871387cc9b50/
http://autobuild.buildroot.net/results/22d/22dcb72e75d1844828ba344f5ed126de06d2ab82/
http://autobuild.buildroot.net/results/b56/b56a6e3b5036c10f2f2b74e36c130d751b2c1312/

Quoted 6 lines
Cc Gustavo Zacarias <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 ...e-last-reference-to-u_int8_t-with-uint8_t.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com