diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-17 12:10:48 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-17 12:11:10 +0200 |
| commit | 9b389bd0696b7bbb33e15eeac1267c313ce9becb (patch) | |
| tree | a251494e8877935d7ec6bf6cb935b1f54e032674 /patches/connman-1.35 | |
| parent | fe0cbadd7c0a81a6e320c7881eb98adeebc0ab45 (diff) | |
| download | ptxdist-9b389bd0696b7bbb33e15eeac1267c313ce9becb.tar.gz ptxdist-9b389bd0696b7bbb33e15eeac1267c313ce9becb.tar.xz | |
connman: version bump 1.30 -> 1.35
Also add patch to build with gcc 7.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/connman-1.35')
| -rw-r--r-- | patches/connman-1.35/0001-tethering-Reorder-header-includes.patch | 32 | ||||
| -rw-r--r-- | patches/connman-1.35/series | 4 |
2 files changed, 36 insertions, 0 deletions
diff --git a/patches/connman-1.35/0001-tethering-Reorder-header-includes.patch b/patches/connman-1.35/0001-tethering-Reorder-header-includes.patch new file mode 100644 index 000000000..af86b930b --- /dev/null +++ b/patches/connman-1.35/0001-tethering-Reorder-header-includes.patch @@ -0,0 +1,32 @@ +From: Daniel Wagner <wagi@monom.org> +Date: Wed, 17 Jan 2018 23:42:50 +0100 +Subject: [PATCH] tethering: Reorder header includes + +Avoid compile errors due to unsupported header include order with +newer kernels (>=4.15). We should import the libc header files first +and then the Linux header files in user space applications. + +Reported by Neil MacLeod <neil@nmacleod.com>. Fix probosal by Jonas +Bonn <jonas@southpole.se> and Hauke Mehrtens <hauke@hauke-m.de>. +--- + src/tethering.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tethering.c b/src/tethering.c +index c929ba71a6dd..4b202369106f 100644 +--- a/src/tethering.c ++++ b/src/tethering.c +@@ -31,11 +31,11 @@ + #include <stdio.h> + #include <sys/ioctl.h> + #include <net/if.h> +-#include <linux/sockios.h> + #include <string.h> + #include <fcntl.h> +-#include <linux/if_tun.h> + #include <netinet/in.h> ++#include <linux/sockios.h> ++#include <linux/if_tun.h> + #include <linux/if_bridge.h> + + #include "connman.h" diff --git a/patches/connman-1.35/series b/patches/connman-1.35/series new file mode 100644 index 000000000..6bf6d6ac1 --- /dev/null +++ b/patches/connman-1.35/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-tethering-Reorder-header-includes.patch +# 7fa337ba829951de96de52edac1e6625 - git-ptx-patches magic |