From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id EF3DA745DE for ; Wed, 31 Oct 2018 19:16:18 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a8-v6so15515247wmf.1 for ; Wed, 31 Oct 2018 12:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=2ZgLcaX3UFlNzTV2hhunT835ZcpQqdSTNK2A0WHQBIU=; b=VKT4ZUoHgURpa/lg91zP8oPN+fScKxiB1WDiwoePdcSSShTaD/H9An7bqvuJbMjr5U 224ylu/0Lw5tXtI7z0G3mIIpqQki7zzZmXxirGhwfv3SiZ/71gtPqAKc0R3noLtkgebC I/q7xO4cMcRJ0yewQ6+zmMKXIT8vkazoA5q2DjabsoAbbkXdQ7kkG/Kvbyk0ut4l9pry RK5dRQSrWDYIULlyu6KSJm5Gb6VZxNwqCZv7MxmJNCmYauhMueMoap0V/GJHA4Bd0LYD ZtIWbupGZhy+4shEhclCahcqjchAlLgEhbCRJ0tK09KJGpd5FiFpabNbmbM+HdTPdglw sXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=2ZgLcaX3UFlNzTV2hhunT835ZcpQqdSTNK2A0WHQBIU=; b=FMb6oyYhEQ/oZFbL1CPZBR2Ta9dLS4xewG1+FxaG/TG0eEZV38S5E0QPgsCKApBOfV Q30M/pOejG5wMmzVF3vXWhJx60OR31+zVyZdTXrKjhX70419xUMoTz7UalnpObbBAa02 cOQwsO6u/na+jucXtpBSB1MYlS6iUJGdpBbC6tYfdGI1NtQ4MxYLzN6prjCeZBA4m+e8 eSg68UhalEj9EJ3ss/mOP1z5fXB7yIPp4OCqmc6lBZJn/we1f54H3FHFYN2LZyxpAdQt IFxCc1TP+BNKn4/KnK+jB6Hf/MSGTbh2v4vBc2i1X8/tvOX/vkl+hFgSKxX0TD4Xavz5 aZfQ== X-Gm-Message-State: AGRZ1gJZaOBkAqPwBjBeTzasBOJ24iNKASqINUWDuemX2GSCTXDAyMrp 4kqkmmhIiytKn3iD9rf5BmY= X-Google-Smtp-Source: AJdET5cvO6TjZH91IR9eixHlmWyEjljSAhTgOv3tKhw+wjbbhA+DtyZLiIdTP3OVxg+GAKZpqhGi7A== X-Received: by 2002:a1c:f313:: with SMTP id q19-v6mr3270289wmq.87.1541013379184; Wed, 31 Oct 2018 12:16:19 -0700 (PDT) Received: from ?IPv6:2a01:598:9909:57eb:55d5:2138:7822:b301? ([2a01:598:9909:57eb:55d5:2138:7822:b301]) by smtp.gmail.com with ESMTPSA id d6-v6sm28097792wro.72.2018.10.31.12.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 12:16:18 -0700 (PDT) Mime-Version: 1.0 (1.0) From: Alexander Kanavin X-Mailer: iPhone Mail (16A404) In-Reply-To: Date: Wed, 31 Oct 2018 20:15:51 +0100 Message-Id: References: <20181008210551.1394-1-dev@sashko.rv.ua> To: Oleksandr Kravchuk Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH v2] connman: update to 1.36 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 19:16:19 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable There is a feature freeze up until thud is released. Generally version upgra= des aren=E2=80=99t accepted in M4 phase. Alex > On 31 Oct 2018, at 19.59, Oleksandr Kravchuk wrote: >=20 > Are there any issues with this patch or you are simply not interested in i= t? >=20 >> On 08/10/2018 23:05, Oleksandr Kravchuk wrote: >> From: Olekandr Kravchuk >>=20 >> - updated connman to v1.36 >> - removed mainstreamed patches >> - includes.patch has been rabased and transformed into git format >>=20 >> Signed-off-by: Oleksandr Kravchuk >> --- >> meta/recipes-connectivity/connman/connman.inc | 2 +- >> ...ues-which-cause-problems-under-musl.patch} | 437 ++++++++---------- >> ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 -- >> ...eep-track-of-addr-in-fw_snat-session.patch | 112 ----- >> ...ubnet-route-creation-deletion-in-ipr.patch | 69 --- >> ...PIs-for-creating-and-deleting-subnet.patch | 68 --- >> ...net-route-creation-and-deletion-APIs.patch | 77 --- >> .../connman/connman_1.35.bb | 22 - >> .../connman/connman_1.36.bb | 16 + >> 9 files changed, 208 insertions(+), 636 deletions(-) >> rename meta/recipes-connectivity/connman/connman/{includes.patch =3D> 000= 1-Fix-various-issues-which-cause-problems-under-musl.patch} (68%) >> delete mode 100644 meta/recipes-connectivity/connman/connman/0001-giognut= ls-Fix-a-crash-using-wispr-over-TLS.patch >> delete mode 100644 meta/recipes-connectivity/connman/connman/0001-session= -Keep-track-of-addr-in-fw_snat-session.patch >> delete mode 100644 meta/recipes-connectivity/connman/connman/0002-inet-Im= plement-subnet-route-creation-deletion-in-ipr.patch >> delete mode 100644 meta/recipes-connectivity/connman/connman/0003-inet-Im= plement-APIs-for-creating-and-deleting-subnet.patch >> delete mode 100644 meta/recipes-connectivity/connman/connman/0004-session= -Use-subnet-route-creation-and-deletion-APIs.patch >> delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb >> create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb >>=20 >> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes= -connectivity/connman/connman.inc >> index 2b03f9cb06..0ba375137d 100644 >> --- a/meta/recipes-connectivity/connman/connman.inc >> +++ b/meta/recipes-connectivity/connman/connman.inc >> @@ -156,7 +156,7 @@ RDEPENDS_${PN}-client =3D"${PN}" >>=20 >> FILES_${PN} =3D "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.= so.* \ >> ${libdir}/connman/plugins \ >> - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ >> + ${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir} \= >> ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${dat= adir}/${PN} \ >> ${datadir}/dbus-1/system-services/* \ >> ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf" >> diff --git a/meta/recipes-connectivity/connman/connman/includes.patch b/m= eta/recipes-connectivity/connman/connman/0001-Fix-various-issues-which-cause= -problems-under-musl.patch >> similarity index 68% >> rename from meta/recipes-connectivity/connman/connman/includes.patch >> rename to meta/recipes-connectivity/connman/connman/0001-Fix-various-issu= es-which-cause-problems-under-musl.patch >> index 9f7395cbbb..f344fea109 100644 >> --- a/meta/recipes-connectivity/connman/connman/includes.patch >> +++ b/meta/recipes-connectivity/connman/connman/0001-Fix-various-issues-w= hich-cause-problems-under-musl.patch >> @@ -1,36 +1,43 @@ >> -Fix various issues which cause problems under musl. >> - >> -Upstream-Status: Backport [bd1326ba7d68df38c5ccaafd2403a5fb30bd452b] >> -Signed-off-by: Ross Burton >> - >> -=46rom 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001= >> +=46rom 181ff3439783c6920f5211730672685a210c318f Mon Sep 17 00:00:00 2001= >> From: Ross Burton >> -Date: Tue, 9 Aug 2016 16:22:36 +0100 >> -Subject: [PATCH 1/3] Use AC_USE_SYSTEM_EXTENSIONS >> +Date: Mon, 8 Oct 2018 22:12:56 +0200 >> +Subject: [PATCH] Fix various issues which cause problems under musl >> + >> +Instead of using #define _GNU_SOURCE in some source files which causes >> +problems when building with musl as more files need the define, simply >> +use AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.= >>=20 >> -Instead of using #define _GNU_SOURCE in some source files which causes p= roblems >> -when building with musl as more files need the define, simply use >> -AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally. >> +Signed-off-by: Ross Burton >> +Upstream-Status: Backport [bd1326ba7d68df38c5ccaafd2403a5fb30bd452b] >> --- >> - configure.ac | 1 + >> - gdhcp/client.c | 1 - >> - plugins/tist.c | 1 - >> - src/backtrace.c | 1 - >> - src/inet.c | 1 - >> - src/log.c | 1 - >> - src/ntp.c | 1 - >> - src/resolver.c | 1 - >> - src/rfkill.c | 1 - >> - src/stats.c | 1 - >> - src/timezone.c | 1 - >> - tools/stats-tool.c | 1 - >> - tools/tap-test.c | 1 - >> - tools/wispr.c | 1 - >> - vpn/plugins/vpn.c | 1 - >> - 15 files changed, 1 insertion(+), 14 deletions(-) >> + configure.ac | 3 +++ >> + gdhcp/client.c | 1 - >> + gdhcp/common.h | 5 +++-- >> + gweb/gresolv.c | 1 + >> + plugins/tist.c | 1 - >> + plugins/wifi.c | 3 +-- >> + src/backtrace.c | 1 - >> + src/inet.c | 1 - >> + src/ippool.c | 1 - >> + src/iptables.c | 2 +- >> + src/log.c | 1 - >> + src/ntp.c | 1 - >> + src/resolver.c | 1 - >> + src/rfkill.c | 1 - >> + src/stats.c | 1 - >> + src/tethering.c | 2 -- >> + src/timezone.c | 1 - >> + tools/dhcp-test.c | 1 - >> + tools/dnsproxy-test.c | 1 + >> + tools/private-network-test.c | 2 +- >> + tools/stats-tool.c | 1 - >> + tools/tap-test.c | 3 +-- >> + tools/wispr.c | 1 - >> + vpn/plugins/vpn.c | 1 - >> + 24 files changed, 12 insertions(+), 25 deletions(-) >>=20 >> diff --git a/configure.ac b/configure.ac >> -index 6e66ab3..bacf5ec 100644 >> +index 39745f76..984126c2 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -20,6 +20,7 @@ AC_SUBST(abs_top_srcdir) >> @@ -41,8 +48,17 @@ index 6e66ab3..bacf5ec 100644 >>=20 >> AC_PROG_CC >> AM_PROG_CC_C_O >> +@@ -185,6 +186,8 @@ AC_CHECK_LIB(resolv, ns_initparse, dummy=3Dyes, [ >> + AC_CHECK_HEADERS([execinfo.h]) >> + AM_CONDITIONAL([BACKTRACE], [test "${ac_cv_header_execinfo_h}" =3D "yes= "]) >> +=20 >> ++AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) >> ++ >> + AC_CHECK_FUNC(signalfd, dummy=3Dyes, >> + AC_MSG_ERROR(signalfd support is required)) >> +=20 >> diff --git a/gdhcp/client.c b/gdhcp/client.c >> -index fbb40ab..3aeb089 100644 >> +index 67357782..c7db76f0 100644 >> --- a/gdhcp/client.c >> +++ b/gdhcp/client.c >> @@ -23,7 +23,6 @@ >> @@ -53,8 +69,43 @@ index fbb40ab..3aeb089 100644 >> #include >> #include >> #include >> +diff --git a/gdhcp/common.h b/gdhcp/common.h >> +index 75abc183..6899499e 100644 >> +--- a/gdhcp/common.h >> ++++ b/gdhcp/common.h >> +@@ -19,6 +19,7 @@ >> + * >> + */ >> +=20 >> ++#include >> + #include >> + #include >> +=20 >> +@@ -170,8 +171,8 @@ static const uint8_t dhcp_option_lengths[] =3D { >> + [OPTION_U32] =3D 4, >> + }; >> +=20 >> +-/* already defined within netinet/in.h if using GNU compiler */ >> +-#ifndef __USE_GNU >> ++/* already defined within netinet/in.h if using glibc or musl */ >> ++#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR >> + struct in6_pktinfo { >> + struct in6_addr ipi6_addr; /* src/dst IPv6 address */ >> + unsigned int ipi6_ifindex; /* send/recv interface index */ >> +diff --git a/gweb/gresolv.c b/gweb/gresolv.c >> +index 81c79b6c..b06f8932 100644 >> +--- a/gweb/gresolv.c >> ++++ b/gweb/gresolv.c >> +@@ -29,6 +29,7 @@ >> + #include >> + #include >> + #include >> ++#include >> + #include >> + #include >> + #include >> diff --git a/plugins/tist.c b/plugins/tist.c >> -index ad5ef79..cc2800a 100644 >> +index ad5ef79e..cc2800a1 100644 >> --- a/plugins/tist.c >> +++ b/plugins/tist.c >> @@ -23,7 +23,6 @@ >> @@ -65,8 +116,23 @@ index ad5ef79..cc2800a 100644 >> #include >> #include >> #include >> +diff --git a/plugins/wifi.c b/plugins/wifi.c >> +index dc08c6af..46e4cca4 100644 >> +--- a/plugins/wifi.c >> ++++ b/plugins/wifi.c >> +@@ -30,9 +30,8 @@ >> + #include >> + #include >> + #include >> +-#include >> +-#include >> + #include >> ++#include >> +=20 >> + #ifndef IFF_LOWER_UP >> + #define IFF_LOWER_UP 0x10000 >> diff --git a/src/backtrace.c b/src/backtrace.c >> -index 6a66c0a..4dbdda8 100644 >> +index e8d7f432..bede6698 100644 >> --- a/src/backtrace.c >> +++ b/src/backtrace.c >> @@ -24,7 +24,6 @@ >> @@ -78,7 +144,7 @@ index 6a66c0a..4dbdda8 100644 >> #include >> #include >> diff --git a/src/inet.c b/src/inet.c >> -index 69ded19..81d92c2 100644 >> +index a31372b5..a58ce7c1 100644 >> --- a/src/inet.c >> +++ b/src/inet.c >> @@ -25,7 +25,6 @@ >> @@ -89,8 +155,33 @@ index 69ded19..81d92c2 100644 >> #include >> #include >> #include >> +diff --git a/src/ippool.c b/src/ippool.c >> +index cea1dccd..8a645da2 100644 >> +--- a/src/ippool.c >> ++++ b/src/ippool.c >> +@@ -28,7 +28,6 @@ >> + #include >> + #include >> + #include >> +-#include >> + #include >> +=20 >> + #include "connman.h" >> +diff --git a/src/iptables.c b/src/iptables.c >> +index f3670e77..469effed 100644 >> +--- a/src/iptables.c >> ++++ b/src/iptables.c >> +@@ -28,7 +28,7 @@ >> + #include >> + #include >> + #include >> +-#include >> ++#include >> + #include >> + #include >> + #include >> diff --git a/src/log.c b/src/log.c >> -index 9bae4a3..f7e82e5 100644 >> +index 9bae4a3d..f7e82e5d 100644 >> --- a/src/log.c >> +++ b/src/log.c >> @@ -23,7 +23,6 @@ >> @@ -102,7 +193,7 @@ index 9bae4a3..f7e82e5 100644 >> #include >> #include >> diff --git a/src/ntp.c b/src/ntp.c >> -index dd246eb..db8ae96 100644 >> +index 51ba9aac..724ca188 100644 >> --- a/src/ntp.c >> +++ b/src/ntp.c >> @@ -23,7 +23,6 @@ >> @@ -114,7 +205,7 @@ index dd246eb..db8ae96 100644 >> #include >> #include >> diff --git a/src/resolver.c b/src/resolver.c >> -index fbe4be7..ef61f92 100644 >> +index 76f0a8e1..10121aa5 100644 >> --- a/src/resolver.c >> +++ b/src/resolver.c >> @@ -23,7 +23,6 @@ >> @@ -126,7 +217,7 @@ index fbe4be7..ef61f92 100644 >> #include >> #include >> diff --git a/src/rfkill.c b/src/rfkill.c >> -index 2bfb092..af49d12 100644 >> +index d9bed4d2..b2514c41 100644 >> --- a/src/rfkill.c >> +++ b/src/rfkill.c >> @@ -23,7 +23,6 @@ >> @@ -138,7 +229,7 @@ index 2bfb092..af49d12 100644 >> #include >> #include >> diff --git a/src/stats.c b/src/stats.c >> -index 26343b1..cfcdc94 100644 >> +index 663bc382..c9ddc2e8 100644 >> --- a/src/stats.c >> +++ b/src/stats.c >> @@ -23,7 +23,6 @@ >> @@ -149,8 +240,21 @@ index 26343b1..cfcdc94 100644 >> #include >> #include >> #include >> +diff --git a/src/tethering.c b/src/tethering.c >> +index 4b202369..f3cb36f4 100644 >> +--- a/src/tethering.c >> ++++ b/src/tethering.c >> +@@ -34,8 +34,6 @@ >> + #include >> + #include >> + #include >> +-#include >> +-#include >> + #include >> +=20 >> + #include "connman.h" >> diff --git a/src/timezone.c b/src/timezone.c >> -index e346b11..8e91267 100644 >> +index e346b11a..8e912670 100644 >> --- a/src/timezone.c >> +++ b/src/timezone.c >> @@ -23,7 +23,6 @@ >> @@ -161,210 +265,8 @@ index e346b11..8e91267 100644 >> #include >> #include >> #include >> -diff --git a/tools/stats-tool.c b/tools/stats-tool.c >> -index b076478..428d94b 100644 >> ---- a/tools/stats-tool.c >> -+++ b/tools/stats-tool.c >> -@@ -22,7 +22,6 @@ >> - #include >> - #endif >> -=20 >> --#define _GNU_SOURCE >> - #include >> - #include >> - #include >> -diff --git a/tools/tap-test.c b/tools/tap-test.c >> -index fdc098a..57917f5 100644 >> ---- a/tools/tap-test.c >> -+++ b/tools/tap-test.c >> -@@ -23,7 +23,6 @@ >> - #include >> - #endif >> -=20 >> --#define _GNU_SOURCE >> - #include >> - #include >> - #include >> -diff --git a/tools/wispr.c b/tools/wispr.c >> -index d5f9341..e56dfc1 100644 >> ---- a/tools/wispr.c >> -+++ b/tools/wispr.c >> -@@ -23,7 +23,6 @@ >> - #include >> - #endif >> -=20 >> --#define _GNU_SOURCE >> - #include >> - #include >> - #include >> -diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c >> -index 9a42385..479c3a7 100644 >> ---- a/vpn/plugins/vpn.c >> -+++ b/vpn/plugins/vpn.c >> -@@ -23,7 +23,6 @@ >> - #include >> - #endif >> -=20 >> --#define _GNU_SOURCE >> - #include >> - #include >> - #include >> ---=20 >> -2.8.1 >> - >> - >> -=46rom b8b7878e6cb2a1ed4fcfa256f7e232511a40e3d9 Mon Sep 17 00:00:00 2001= >> -From: Ross Burton >> -Date: Tue, 9 Aug 2016 15:37:50 +0100 >> -Subject: [PATCH 2/3] Check for in6_pktinfo.ipi6_addr explicitly >> - >> -Instead of assuming that just glibc has this structure, check for it at >> -configure as musl also has it. >> - >> -Based on work by Khem Raj . >> ---- >> - configure.ac | 2 ++ >> - gdhcp/common.h | 5 +++-- >> - 2 files changed, 5 insertions(+), 2 deletions(-) >> - >> -diff --git a/configure.ac b/configure.ac >> -index bacf5ec..ad00456 100644 >> ---- a/configure.ac >> -+++ b/configure.ac >> -@@ -186,6 +186,8 @@ AC_CHECK_LIB(resolv, ns_initparse, dummy=3Dyes, [ >> - AC_CHECK_HEADERS([execinfo.h]) >> - AM_CONDITIONAL([BACKTRACE], [test "${ac_cv_header_execinfo_h}" =3D "yes= "]) >> -=20 >> -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) >> -+ >> - AC_CHECK_FUNC(signalfd, dummy=3Dyes, >> - AC_MSG_ERROR(signalfd support is required)) >> -=20 >> -diff --git a/gdhcp/common.h b/gdhcp/common.h >> -index 75abc18..6899499 100644 >> ---- a/gdhcp/common.h >> -+++ b/gdhcp/common.h >> -@@ -19,6 +19,7 @@ >> - * >> - */ >> -=20 >> -+#include >> - #include >> - #include >> -=20 >> -@@ -170,8 +171,8 @@ static const uint8_t dhcp_option_lengths[] =3D { >> - [OPTION_U32] =3D 4, >> - }; >> -=20 >> --/* already defined within netinet/in.h if using GNU compiler */ >> --#ifndef __USE_GNU >> -+/* already defined within netinet/in.h if using glibc or musl */ >> -+#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR >> - struct in6_pktinfo { >> - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ >> - unsigned int ipi6_ifindex; /* send/recv interface index */ >> ---=20 >> -2.8.1 >> - >> - >> -=46rom c0726e432fa0274a2b9c70179b03df6720972816 Mon Sep 17 00:00:00 2001= >> -From: Ross Burton >> -Date: Tue, 9 Aug 2016 15:19:23 +0100 >> -Subject: [PATCH 3/3] Rationalise includes >> - >> -gweb/gresolv.c uses snprintf() and isspace() so it should include stdio.= h and >> -ctype.h. >> - >> -tools/dnsproxy-test uses functions from stdio.h. >> - >> -musl warns when sys/ headers are included when the non-sys form should b= e used, >> -so switch sys/errno.h and so on to errno.h. >> - >> -musl also causes redefinition errors when pieces of the networking heade= rs are >> -included, so remove the redundant includes. >> - >> -Based on work by Khem Raj . >> ---- >> - gweb/gresolv.c | 2 ++ >> - plugins/wifi.c | 3 +-- >> - src/ippool.c | 1 - >> - src/iptables.c | 2 +- >> - src/tethering.c | 2 -- >> - tools/dhcp-test.c | 1 - >> - tools/dnsproxy-test.c | 1 + >> - tools/private-network-test.c | 2 +- >> - tools/tap-test.c | 2 +- >> - 9 files changed, 7 insertions(+), 9 deletions(-) >> - >> -diff --git a/gweb/gresolv.c b/gweb/gresolv.c >> -index 8a51a9f..d55027c 100644 >> ---- a/gweb/gresolv.c >> -+++ b/gweb/gresolv.c >> -@@ -29,6 +29,7 @@ >> - #include >> - #include >> - #include >> -+#include >> - #include >> - #include >> - #include >> -diff --git a/plugins/wifi.c b/plugins/wifi.c >> -index 9d56671..148131d 100644 >> ---- a/plugins/wifi.c >> -+++ b/plugins/wifi.c >> -@@ -30,9 +30,8 @@ >> - #include >> - #include >> - #include >> --#include >> --#include >> - #include >> -+#include >> -=20 >> - #ifndef IFF_LOWER_UP >> - #define IFF_LOWER_UP 0x10000 >> -diff --git a/src/ippool.c b/src/ippool.c >> -index cea1dcc..8a645da 100644 >> ---- a/src/ippool.c >> -+++ b/src/ippool.c >> -@@ -28,7 +28,6 @@ >> - #include >> - #include >> - #include >> --#include >> - #include >> -=20 >> - #include "connman.h" >> -diff --git a/src/iptables.c b/src/iptables.c >> -index 5ef757a..82e3ac4 100644 >> ---- a/src/iptables.c >> -+++ b/src/iptables.c >> -@@ -28,7 +28,7 @@ >> - #include >> - #include >> - #include >> --#include >> -+#include >> - #include >> - #include >> - #include >> -diff --git a/src/tethering.c b/src/tethering.c >> -index 3153349..ad062d5 100644 >> ---- a/src/tethering.c >> -+++ b/src/tethering.c >> -@@ -31,10 +31,8 @@ >> - #include >> - #include >> - #include >> --#include >> - #include >> - #include >> --#include >> - #include >> - #include >> -=20 >> diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c >> -index c34e10a..eae66fc 100644 >> +index c34e10a8..eae66fc2 100644 >> --- a/tools/dhcp-test.c >> +++ b/tools/dhcp-test.c >> @@ -33,7 +33,6 @@ >> @@ -376,7 +278,7 @@ index c34e10a..eae66fc 100644 >> #include >>=20 >> diff --git a/tools/dnsproxy-test.c b/tools/dnsproxy-test.c >> -index 551cae9..371e2e2 100644 >> +index 551cae91..371e2e23 100644 >> --- a/tools/dnsproxy-test.c >> +++ b/tools/dnsproxy-test.c >> @@ -24,6 +24,7 @@ >> @@ -388,7 +290,7 @@ index 551cae9..371e2e2 100644 >> #include >> #include >> diff --git a/tools/private-network-test.c b/tools/private-network-test.c >> -index 3dd115b..2828bb3 100644 >> +index 3dd115ba..2828bb30 100644 >> --- a/tools/private-network-test.c >> +++ b/tools/private-network-test.c >> @@ -32,7 +32,7 @@ >> @@ -400,11 +302,29 @@ index 3dd115b..2828bb3 100644 >> #include >> #include >>=20 >> +diff --git a/tools/stats-tool.c b/tools/stats-tool.c >> +index efa39de2..5695048f 100644 >> +--- a/tools/stats-tool.c >> ++++ b/tools/stats-tool.c >> +@@ -22,7 +22,6 @@ >> + #include >> + #endif >> +=20 >> +-#define _GNU_SOURCE >> + #include >> + #include >> + #include >> diff --git a/tools/tap-test.c b/tools/tap-test.c >> -index 57917f5..cb3ee62 100644 >> +index fdc098aa..cb3ee622 100644 >> --- a/tools/tap-test.c >> +++ b/tools/tap-test.c >> -@@ -28,7 +28,7 @@ >> +@@ -23,13 +23,12 @@ >> + #include >> + #endif >> +=20 >> +-#define _GNU_SOURCE >> + #include >> + #include >> #include >> #include >> #include >> @@ -413,5 +333,30 @@ index 57917f5..cb3ee62 100644 >> #include >>=20 >> #include >> +diff --git a/tools/wispr.c b/tools/wispr.c >> +index d5f9341f..e56dfc16 100644 >> +--- a/tools/wispr.c >> ++++ b/tools/wispr.c >> +@@ -23,7 +23,6 @@ >> + #include >> + #endif >> +=20 >> +-#define _GNU_SOURCE >> + #include >> + #include >> + #include >> +diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c >> +index 10548aaf..6e3f640c 100644 >> +--- a/vpn/plugins/vpn.c >> ++++ b/vpn/plugins/vpn.c >> +@@ -23,7 +23,6 @@ >> + #include >> + #endif >> +=20 >> +-#define _GNU_SOURCE >> + #include >> + #include >> + #include >> --=20 >> -2.8.1 >> +2.17.1 >> + >> diff --git a/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix= -a-crash-using-wispr-over-TLS.patch b/meta/recipes-connectivity/connman/conn= man/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch >> deleted file mode 100644 >> index f9080d4ba9..0000000000 >> --- a/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-cras= h-using-wispr-over-TLS.patch >> +++ /dev/null >> @@ -1,41 +0,0 @@ >> -=46rom 929fc9b7068100444e0ffcccd25841f78791e619 Mon Sep 17 00:00:00 2001= >> -From: Jian Liang >> -Date: Fri, 15 Sep 2017 06:40:08 -0400 >> -Subject: [PATCH] gweb: Fix a crash using wispr over TLS >> -To: connman@lists.01.org >> -Cc: wagi@monom.org >> - >> -When gnutls_channel is instantiated, the gnutls_channel->established >> -has to be initiated as FALSE. Otherwise, check_handshake function >> -won't work. A random initial value 1 of gnutls_channel->established >> -will make check_handshake return G_IO_STATUS_NORMAL, when the channel >> -is actually not ready to be used. The observed behaviours are, >> - >> -- wispr is getting random errors in wispr_portal_web_result >> -- ConnMan crashes on exit after those random errors >> -- when wispr is luckly working, ConnMan doesn't crash on exit >> - >> -Signed-off-by: Jian Liang >> - >> ---- >> -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connma= n/connman.git/commit/?id=3D73e53f3bd9e7debae86341f1eee7b97862a56a5e] >> -Signed-off-by: Andr=C3=A9 Draszik >> - gweb/giognutls.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/gweb/giognutls.c b/gweb/giognutls.c >> -index 09dc9e7..c029a8b 100644 >> ---- a/gweb/giognutls.c >> -+++ b/gweb/giognutls.c >> -@@ -421,7 +421,7 @@ GIOChannel *g_io_channel_gnutls_new(int fd) >> -=20 >> - DBG(""); >> -=20 >> -- gnutls_channel =3D g_new(GIOGnuTLSChannel, 1); >> -+ gnutls_channel =3D g_new0(GIOGnuTLSChannel, 1); >> -=20 >> - channel =3D (GIOChannel *) gnutls_channel; >> -=20 >> ---=20 >> -2.7.4 >> - >> diff --git a/meta/recipes-connectivity/connman/connman/0001-session-Keep-= track-of-addr-in-fw_snat-session.patch b/meta/recipes-connectivity/connman/c= onnman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch >> deleted file mode 100644 >> index f1b4d0aaa7..0000000000 >> --- a/meta/recipes-connectivity/connman/connman/0001-session-Keep-track-o= f-addr-in-fw_snat-session.patch >> +++ /dev/null >> @@ -1,112 +0,0 @@ >> -=46rom b5fd5945886fa1845db5c969424b63d894fe0376 Mon Sep 17 00:00:00 2001= >> -From: Jian Liang >> -Date: Fri, 25 Aug 2017 10:02:16 -0400 >> -Subject: [PATCH 1/2] session: Keep track of addr in fw_snat & session >> -To: connman@lists.01.org >> -Cc: wagi@monom.org >> - >> -When there is more than one session in fw_snat's list of sessions, >> -fw_snat failed to be re-created when update-session-state is triggered >> -with new IP address. This is because index alone is not sufficient to >> -decide if fw_snat needs to be re-created. The solution here is to keep >> -a track of IP addr and use it to avoid false lookup of fw_snat. >> - >> -Signed-off-by: Jian Liang >> - >> ---- >> -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connma= n/connman.git/commit/?id=3Df9e27d4abfcab5c80a38e0850b5ddb26277f97c1] >> -Signed-off-by: Andr=C3=A9 Draszik >> - src/session.c | 19 +++++++++++++++---- >> - 1 file changed, 15 insertions(+), 4 deletions(-) >> - >> -diff --git a/src/session.c b/src/session.c >> -index 9e3c559..965ac06 100644 >> ---- a/src/session.c >> -+++ b/src/session.c >> -@@ -65,6 +65,7 @@ struct connman_session { >> - struct firewall_context *fw; >> - uint32_t mark; >> - int index; >> -+ char *addr; >> - char *gateway; >> - bool policy_routing; >> - bool snat_enabled; >> -@@ -79,6 +80,7 @@ struct fw_snat { >> - GSList *sessions; >> - int id; >> - int index; >> -+ char *addr; >> - struct firewall_context *fw; >> - }; >> -=20 >> -@@ -200,7 +202,7 @@ static char *service2bearer(enum connman_service_typ= e type) >> - return ""; >> - } >> -=20 >> --static struct fw_snat *fw_snat_lookup(int index) >> -+static struct fw_snat *fw_snat_lookup(int index, const char *addr) >> - { >> - struct fw_snat *fw_snat; >> - GSList *list; >> -@@ -208,8 +210,11 @@ static struct fw_snat *fw_snat_lookup(int index) >> - for (list =3D fw_snat_list; list; list =3D list->next) { >> - fw_snat =3D list->data; >> -=20 >> -- if (fw_snat->index =3D=3D index) >> -+ if (fw_snat->index =3D=3D index) { >> -+ if (g_strcmp0(addr, fw_snat->addr) !=3D 0) >> -+ continue; >> - return fw_snat; >> -+ } >> - } >> - return NULL; >> - } >> -@@ -224,6 +229,7 @@ static int fw_snat_create(struct connman_session *se= ssion, >> -=20 >> - fw_snat->fw =3D __connman_firewall_create(); >> - fw_snat->index =3D index; >> -+ fw_snat->addr =3D g_strdup(addr); >> -=20 >> - fw_snat->id =3D __connman_firewall_enable_snat(fw_snat->fw, >> - index, ifname, addr); >> -@@ -238,6 +244,7 @@ static int fw_snat_create(struct connman_session *se= ssion, >> - return 0; >> - err: >> - __connman_firewall_destroy(fw_snat->fw); >> -+ g_free(fw_snat->addr); >> - g_free(fw_snat); >> - return err; >> - } >> -@@ -393,7 +400,7 @@ static void del_nat_rules(struct connman_session *se= ssion) >> - return; >> -=20 >> - session->snat_enabled =3D false; >> -- fw_snat =3D fw_snat_lookup(session->index); >> -+ fw_snat =3D fw_snat_lookup(session->index, session->addr); >> -=20 >> - if (!fw_snat) >> - return; >> -@@ -420,8 +427,11 @@ static void add_nat_rules(struct connman_session *s= ession) >> - if (!addr) >> - return; >> -=20 >> -+ g_free(session->addr); >> -+ session->addr =3D g_strdup(addr); >> -+ >> - session->snat_enabled =3D true; >> -- fw_snat =3D fw_snat_lookup(index); >> -+ fw_snat =3D fw_snat_lookup(index, session->addr); >> - if (fw_snat) { >> - fw_snat_ref(session, fw_snat); >> - return; >> -@@ -502,6 +512,7 @@ static void free_session(struct connman_session *ses= sion) >> - g_free(session->info); >> - g_free(session->info_last); >> - g_free(session->gateway); >> -+ g_free(session->addr); >> -=20 >> - g_free(session); >> - } >> ---=20 >> -2.7.4 >> - >> diff --git a/meta/recipes-connectivity/connman/connman/0002-inet-Implemen= t-subnet-route-creation-deletion-in-ipr.patch b/meta/recipes-connectivity/co= nnman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patc= h >> deleted file mode 100644 >> index 9c953e5d51..0000000000 >> --- a/meta/recipes-connectivity/connman/connman/0002-inet-Implement-subne= t-route-creation-deletion-in-ipr.patch >> +++ /dev/null >> @@ -1,69 +0,0 @@ >> -=46rom 08cda4004491d3971a8b9df937426c43800d15b1 Mon Sep 17 00:00:00 2001= >> -From: Jian Liang >> -Date: Thu, 5 Oct 2017 09:37:06 +0100 >> -Subject: [PATCH 2/4] inet: Implement subnet route creation/deletion in >> - iproute_default_modify >> -To: connman@lists.01.org >> -Cc: wagi@monom.org >> - >> -- Calculate subnet address base on gateway address and prefixlen >> -- Differentiate creation of routes to gateway and subnet >> - >> -Signed-off-by: Jian Liang >> - >> ---- >> -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connma= n/connman.git/commit/?id=3Dff7dcf91f12a2a237feebc6e606d0a8e92975528] >> -Signed-off-by: Andr=C3=A9 Draszik >> - src/inet.c | 22 +++++++++++++++++++--- >> - 1 file changed, 19 insertions(+), 3 deletions(-) >> - >> -diff --git a/src/inet.c b/src/inet.c >> -index ab8aec8..0ddb030 100644 >> ---- a/src/inet.c >> -+++ b/src/inet.c >> -@@ -2802,6 +2802,9 @@ static int iproute_default_modify(int cmd, uint32_= t table_id, int ifindex, >> - unsigned char buf[sizeof(struct in6_addr)]; >> - int ret, len; >> - int family =3D connman_inet_check_ipaddress(gateway); >> -+ char *dst =3D NULL; >> -+ >> -+ DBG("gateway %s/%u table %u", gateway, prefixlen, table_id); >> -=20 >> - switch (family) { >> - case AF_INET: >> -@@ -2814,7 +2817,19 @@ static int iproute_default_modify(int cmd, uint32= _t table_id, int ifindex, >> - return -EINVAL; >> - } >> -=20 >> -- ret =3D inet_pton(family, gateway, buf); >> -+ if (prefixlen) { >> -+ struct in_addr ipv4_subnet_addr, ipv4_mask; >> -+ >> -+ memset(&ipv4_subnet_addr, 0, sizeof(ipv4_subnet_addr)); >> -+ ipv4_mask.s_addr =3D htonl((0xffffffff << (32 - prefixlen)) & 0= xffffffff); >> -+ ipv4_subnet_addr.s_addr =3D inet_addr(gateway); >> -+ ipv4_subnet_addr.s_addr &=3D ipv4_mask.s_addr; >> -+ >> -+ dst =3D g_strdup(inet_ntoa(ipv4_subnet_addr)); >> -+ } >> -+ >> -+ ret =3D inet_pton(family, dst ? dst : gateway, buf); >> -+ g_free(dst); >> - if (ret <=3D 0) >> - return -EINVAL; >> -=20 >> -@@ -2831,8 +2846,9 @@ static int iproute_default_modify(int cmd, uint32_= t table_id, int ifindex, >> - rth.req.u.r.rt.rtm_type =3D RTN_UNICAST; >> - rth.req.u.r.rt.rtm_dst_len =3D prefixlen; >> -=20 >> -- __connman_inet_rtnl_addattr_l(&rth.req.n, sizeof(rth.req), RTA_GATE= WAY, >> -- buf, len); >> -+ __connman_inet_rtnl_addattr_l(&rth.req.n, sizeof(rth.req), >> -+ prefixlen > 0 ? RTA_DST : RTA_GATEWAY, buf, len); >> -+ >> - if (table_id < 256) { >> - rth.req.u.r.rt.rtm_table =3D table_id; >> - } else { >> ---=20 >> -2.7.4 >> - >> diff --git a/meta/recipes-connectivity/connman/connman/0003-inet-Implemen= t-APIs-for-creating-and-deleting-subnet.patch b/meta/recipes-connectivity/co= nnman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patc= h >> deleted file mode 100644 >> index 56ba5c3f4b..0000000000 >> --- a/meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-= for-creating-and-deleting-subnet.patch >> +++ /dev/null >> @@ -1,68 +0,0 @@ >> -=46rom a9243f13d6e1aadd69bfcc27f75f69c38be51677 Mon Sep 17 00:00:00 2001= >> -From: Jian Liang >> -Date: Wed, 4 Oct 2017 17:30:17 +0100 >> -Subject: [PATCH 3/4] inet: Implement APIs for creating and deleting subn= et >> - route >> -To: connman@lists.01.org >> -Cc: wagi@monom.org >> - >> -Signed-off-by: Jian Liang >> - >> ---- >> -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connma= n/connman.git/commit/?id=3D3a15b0b7fccd053aff91da2cc68585509d0c509b] >> -Signed-off-by: Andr=C3=A9 Draszik >> - src/connman.h | 4 ++++ >> - src/inet.c | 14 ++++++++++++++ >> - 2 files changed, 18 insertions(+) >> - >> -diff --git a/src/connman.h b/src/connman.h >> -index 21b7080..da4446a 100644 >> ---- a/src/connman.h >> -+++ b/src/connman.h >> -@@ -240,7 +240,11 @@ int __connman_inet_rtnl_addattr32(struct nlmsghdr *= n, size_t maxlen, >> - int __connman_inet_add_fwmark_rule(uint32_t table_id, int family, uint3= 2_t fwmark); >> - int __connman_inet_del_fwmark_rule(uint32_t table_id, int family, uint3= 2_t fwmark); >> - int __connman_inet_add_default_to_table(uint32_t table_id, int ifindex,= const char *gateway); >> -+int __connman_inet_add_subnet_to_table(uint32_t table_id, int ifindex, >> -+ const char *gateway, unsigned char prefixlen); >> - int __connman_inet_del_default_from_table(uint32_t table_id, int ifinde= x, const char *gateway); >> -+int __connman_inet_del_subnet_from_table(uint32_t table_id, int ifindex= , >> -+ const char *gateway, unsigned char prefixlen); >> - int __connman_inet_get_address_netmask(int ifindex, >> - struct sockaddr_in *address, struct sockaddr_in *netmask); >> -=20 >> -diff --git a/src/inet.c b/src/inet.c >> -index 0ddb030..dcd1ab2 100644 >> ---- a/src/inet.c >> -+++ b/src/inet.c >> -@@ -2880,6 +2880,13 @@ int __connman_inet_add_default_to_table(uint32_t t= able_id, int ifindex, >> - return iproute_default_modify(RTM_NEWROUTE, table_id, ifindex, gatew= ay, 0); >> - } >> -=20 >> -+int __connman_inet_add_subnet_to_table(uint32_t table_id, int ifindex, >> -+ const char *gateway, unsigned char prefixlen) >> -+{ >> -+ /* ip route add 1.2.3.4/24 dev eth0 table 1234 */ >> -+ return iproute_default_modify(RTM_NEWROUTE, table_id, ifindex, gate= way, prefixlen); >> -+} >> -+ >> - int __connman_inet_del_default_from_table(uint32_t table_id, int ifinde= x, >> - const char *gateway) >> - { >> -@@ -2888,6 +2895,13 @@ int __connman_inet_del_default_from_table(uint32_= t table_id, int ifindex, >> - return iproute_default_modify(RTM_DELROUTE, table_id, ifindex, gatew= ay, 0); >> - } >> -=20 >> -+int __connman_inet_del_subnet_from_table(uint32_t table_id, int ifindex= , >> -+ const char *gateway, unsigned char prefixlen) >> -+{ >> -+ /* ip route del 1.2.3.4/24 dev eth0 table 1234 */ >> -+ return iproute_default_modify(RTM_DELROUTE, table_id, ifindex, gate= way, prefixlen); >> -+} >> -+ >> - int __connman_inet_get_interface_ll_address(int index, int family, >> - void *address) >> - { >> ---=20 >> -2.7.4 >> - >> diff --git a/meta/recipes-connectivity/connman/connman/0004-session-Use-s= ubnet-route-creation-and-deletion-APIs.patch b/meta/recipes-connectivity/con= nman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch >> deleted file mode 100644 >> index ca213eb18b..0000000000 >> --- a/meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-r= oute-creation-and-deletion-APIs.patch >> +++ /dev/null >> @@ -1,77 +0,0 @@ >> -=46rom deb9372db8396da4f7cd20555ce7c9a8b3ad96bd Mon Sep 17 00:00:00 2001= >> -From: Jian Liang >> -Date: Fri, 6 Oct 2017 11:40:16 +0100 >> -Subject: [PATCH 4/4] session: Use subnet route creation and deletion API= s >> -To: connman@lists.01.org >> -Cc: wagi@monom.org >> - >> -As subnet route is address and session specific in this case, so add >> -prefixlen into struct connman_session, and update it along with ipconfig= . >> -Then use it in subnet route related APIs. >> - >> -Signed-off-by: Jian Liang >> - >> ---- >> -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connma= n/connman.git/commit/?id=3D285f25ef6cc9e4a43dab83523f3e2eab4365ac26] >> -Signed-off-by: Andr=C3=A9 Draszik >> - src/session.c | 20 ++++++++++++++++---- >> - 1 file changed, 16 insertions(+), 4 deletions(-) >> - >> -diff --git a/src/session.c b/src/session.c >> -index 965ac06..7b7a14b 100644 >> ---- a/src/session.c >> -+++ b/src/session.c >> -@@ -67,6 +67,7 @@ struct connman_session { >> - int index; >> - char *addr; >> - char *gateway; >> -+ unsigned char prefixlen; >> - bool policy_routing; >> - bool snat_enabled; >> - }; >> -@@ -357,13 +358,17 @@ static void del_default_route(struct connman_sessi= on *session) >> - if (!session->gateway) >> - return; >> -=20 >> -- DBG("index %d routing table %d default gateway %s", >> -- session->index, session->mark, session->gateway); >> -+ DBG("index %d routing table %d default gateway %s/%u", >> -+ session->index, session->mark, session->gateway, session->prefi= xlen); >> -+ >> -+ __connman_inet_del_subnet_from_table(session->mark, >> -+ session->index, session->gateway, session->prefixlen); >> -=20 >> - __connman_inet_del_default_from_table(session->mark, >> - session->index, session->gateway); >> - g_free(session->gateway); >> - session->gateway =3D NULL; >> -+ session->prefixlen =3D 0; >> - session->index =3D -1; >> - } >> -=20 >> -@@ -383,13 +388,20 @@ static void add_default_route(struct connman_sessi= on *session) >> - if (!session->gateway) >> - session->gateway =3D g_strdup(inet_ntoa(addr)); >> -=20 >> -- DBG("index %d routing table %d default gateway %s", >> -- session->index, session->mark, session->gateway); >> -+ session->prefixlen =3D __connman_ipconfig_get_prefixlen(ipconfig); >> -+ >> -+ DBG("index %d routing table %d default gateway %s/%u", >> -+ session->index, session->mark, session->gateway, session->prefi= xlen); >> -=20 >> - err =3D __connman_inet_add_default_to_table(session->mark, >> - session->index, session->gateway); >> - if (err < 0) >> - DBG("session %p %s", session, strerror(-err)); >> -+ >> -+ err =3D __connman_inet_add_subnet_to_table(session->mark, >> -+ session->index, session->gateway, session->prefixle= n); >> -+ if (err < 0) >> -+ DBG("session add subnet route %p %s", session, strerror(-err));= >> - } >> -=20 >> - static void del_nat_rules(struct connman_session *session) >> ---=20 >> -2.7.4 >> - >> diff --git a/meta/recipes-connectivity/connman/connman_1.35.bb b/meta/rec= ipes-connectivity/connman/connman_1.35.bb >> deleted file mode 100644 >> index ff2118113f..0000000000 >> --- a/meta/recipes-connectivity/connman/connman_1.35.bb >> +++ /dev/null >> @@ -1,22 +0,0 @@ >> -require connman.inc >> - >> -SRC_URI =3D "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ >> - file://0001-plugin.h-Change-visibility-to-default-for-debug-= symb.patch \ >> - file://0001-connman.service-stop-systemd-resolved-when-we-us= e-co.patch \ >> - file://connman \ >> - file://no-version-scripts.patch \ >> - file://includes.patch \ >> - file://0001-session-Keep-track-of-addr-in-fw_snat-session.pa= tch \ >> - file://0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch= \ >> - file://0001-inet-Add-prefixlen-to-iproute_default_function.p= atch \ >> - file://0002-inet-Implement-subnet-route-creation-deletion-in= -ipr.patch \ >> - file://0003-inet-Implement-APIs-for-creating-and-deleting-su= bnet.patch \ >> - file://0004-session-Use-subnet-route-creation-and-deletion-A= PIs.patch \ >> - " >> -SRC_URI_append_libc-musl =3D " file://0002-resolve-musl-does-not-impleme= nt-res_ninit.patch \ >> - " >> - >> -SRC_URI[md5sum] =3D "bae37b45ee9b3db5ec8115188f8a7652" >> -SRC_URI[sha256sum] =3D "66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf4= 0afbc859842cf2aa" >> - >> -RRECOMMENDS_${PN} =3D "connman-conf" >> diff --git a/meta/recipes-connectivity/connman/connman_1.36.bb b/meta/rec= ipes-connectivity/connman/connman_1.36.bb >> new file mode 100644 >> index 0000000000..6e4dbdfda6 >> --- /dev/null >> +++ b/meta/recipes-connectivity/connman/connman_1.36.bb >> @@ -0,0 +1,16 @@ >> +require connman.inc >> + >> +SRC_URI =3D "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ >> + file://0001-plugin.h-Change-visibility-to-default-for-debug-= symb.patch \ >> + file://0001-connman.service-stop-systemd-resolved-when-we-us= e-co.patch \ >> + file://connman \ >> + file://no-version-scripts.patch \ >> + file://0001-Fix-various-issues-which-cause-problems-under-mu= sl.patch \ >> +" >> + >> +SRC_URI_append_libc-musl =3D " file://0002-resolve-musl-does-not-impleme= nt-res_ninit.patch" >> + >> +SRC_URI[md5sum] =3D "dae77d9c904d2c223ae849e32079d57e" >> +SRC_URI[sha256sum] =3D "c789db41cc443fa41e661217ea321492ad59a004bebcd1aa= 013f3bc10a6e0074" >> + >> +RRECOMMENDS_${PN} =3D "connman-conf" > --=20 > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core