From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Wed, 13 Jun 2018 17:08:33 +0000 (+0200)
Subject: package/connman: bump version to 1.36
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4f877e3cf3cd29da7ed40cfe4608c8167a3c06ce;p=buildroot.git

package/connman: bump version to 1.36

Added licence hash, removed patch applied upstream
https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24

Renumbered remaining patch.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Acked-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

diff --git a/package/connman/0001-nat-build-failure.patch b/package/connman/0001-nat-build-failure.patch
new file mode 100644
index 0000000000..0ab58501d0
--- /dev/null
+++ b/package/connman/0001-nat-build-failure.patch
@@ -0,0 +1,30 @@
+From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 19 Apr 2016 08:38:38 -0300
+Subject: [PATCH] nat: fix build failure
+
+_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in
+system header files.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+Status: submitted upstream
+
+ src/nat.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nat.c b/src/nat.c
+index 33ae6df..62e21d4 100644
+--- a/src/nat.c
++++ b/src/nat.c
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#define _GNU_SOURCE
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-- 
+2.7.3
+
diff --git a/package/connman/0001-tethering-Reorder-header-includes.patch b/package/connman/0001-tethering-Reorder-header-includes.patch
deleted file mode 100644
index 4955df1cdd..0000000000
--- a/package/connman/0001-tethering-Reorder-header-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bdfb3526466f8fb8f13d9259037d8f42c782ce24 Mon Sep 17 00:00:00 2001
-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>.
-
-Signed-off-by: Martin Bark <martin@barkynet.com>
----
- src/tethering.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tethering.c b/src/tethering.c
-index c929ba7..4b20236 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"
---
-2.7.4
diff --git a/package/connman/0002-nat-build-failure.patch b/package/connman/0002-nat-build-failure.patch
deleted file mode 100644
index 0ab58501d0..0000000000
--- a/package/connman/0002-nat-build-failure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 19 Apr 2016 08:38:38 -0300
-Subject: [PATCH] nat: fix build failure
-
-_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in
-system header files.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: submitted upstream
-
- src/nat.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nat.c b/src/nat.c
-index 33ae6df..62e21d4 100644
---- a/src/nat.c
-+++ b/src/nat.c
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--- 
-2.7.3
-
diff --git a/package/connman/connman.hash b/package/connman/connman.hash
index c822bb1fe4..fad1c55d2d 100644
--- a/package/connman/connman.hash
+++ b/package/connman/connman.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
-sha256	66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf40afbc859842cf2aa	connman-1.35.tar.xz
+sha256 c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074  connman-1.36.tar.xz
+# Locally computed
+sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 52c45451d9..b67d1c4b86 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONNMAN_VERSION = 1.35
+CONNMAN_VERSION = 1.36
 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables