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>

3 files changed, 45 insertions, 8 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
diff --git a/rules/connman.make b/rules/connman.make
index cc995a83b..2f671f7d4 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CONNMAN) += connman
 #
 # Paths and names
 #
-CONNMAN_VERSION	:= 1.30
-CONNMAN_MD5	:= 3e4006236e53b61c966213331df91f35
+CONNMAN_VERSION	:= 1.35
+CONNMAN_MD5	:= c082f39423ceed0cbf8f5fde07f4c9af
 CONNMAN		:= connman-$(CONNMAN_VERSION)
 CONNMAN_SUFFIX	:= tar.gz
 CONNMAN_URL	:= $(call ptx/mirror, KERNEL, network/connman/$(CONNMAN).$(CONNMAN_SUFFIX))
@@ -35,7 +35,9 @@ CONNMAN_LICENSE	:= GPL-2.0-only
 CONNMAN_CONF_TOOL	:= autoconf
 CONNMAN_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-optimization \
 	--disable-debug \
+	--enable-pie \
 	--disable-hh2serial-gps \
 	--disable-openconnect \
 	--disable-openvpn \
@@ -53,6 +55,7 @@ CONNMAN_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_CONNMAN_ETHERNET)-ethernet \
 	--$(call ptx/endis, PTXCONF_CONNMAN_GADGET)-gadget \
 	--$(call ptx/endis, PTXCONF_CONNMAN_WIFI)-wifi \
+	--disable-iwd \
 	--$(call ptx/endis, PTXCONF_CONNMAN_BLUETOOTH)-bluetooth \
 	--disable-ofono \
 	--disable-dundee \
@@ -63,7 +66,9 @@ CONNMAN_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_CONNMAN_CLIENT)-client \
 	--enable-datafiles \
 	--with-dbusconfdir=/usr/share \
-	--with-systemdunitdir=/usr/lib/systemd/system
+	--with-systemdunitdir=/usr/lib/systemd/system \
+	--with-tmpfilesdir=/usr/lib/tmpfiles.d \
+	--with-firewall=iptables
 
 CONNMAN_TESTS := \
 	backtrace \
@@ -110,10 +115,6 @@ CONNMAN_TESTS := \
 $(STATEDIR)/connman.install:
 	@$(call targetinfo)
 	@$(call install, CONNMAN)
-ifdef PTXCONF_CONNMAN_CLIENT
-	install -D -m 755 "$(CONNMAN_DIR)/client/connmanctl" \
-		"$(CONNMAN_PKGDIR)/usr/sbin/connmanctl"
-endif
 ifdef PTXCONF_CONNMAN_TESTS
 	@$(foreach test, $(CONNMAN_TESTS), \
 		install -D -m 755 "$(CONNMAN_DIR)/test/$(test)" \
@@ -174,7 +175,7 @@ endif
 
 #	# command line client
 ifdef PTXCONF_CONNMAN_CLIENT
-	@$(call install_copy, connman, 0, 0, 0755, -, /usr/sbin/connmanctl)
+	@$(call install_copy, connman, 0, 0, 0755, -, /usr/bin/connmanctl)
 endif
 
 #	# python tests