connman (refresh patches to apply on 1.40 version)

:Release Notes:

:Detailed Notes:
Fixes:
ERROR: connman-1.40-r0 do_patch: Command Error: 'quilt --quiltrc /jenkins/mjansa/build/ose-github/honister/BUILD/work/raspberrypi4-webos-linux-gnueabi/connman/1.40-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
stdout: Applying patch 0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch
patching file include/setting.h
Hunk #1 FAILED at 29.
1 out of 1 hunk FAILED -- rejects in file include/setting.h
patching file plugins/wifi.c
Hunk #1 succeeded at 1628 (offset 10 lines).
Hunk #2 succeeded at 1646 (offset 10 lines).
patching file src/main.c
Hunk #1 succeeded at 91 (offset 8 lines).
Hunk #2 succeeded at 117 (offset 11 lines).
Hunk webosose#3 succeeded at 144 (offset 14 lines).
Hunk webosose#4 succeeded at 171 (offset 17 lines).
Hunk webosose#5 succeeded at 304 with fuzz 2 (offset 20 lines).
Hunk webosose#6 succeeded at 443 (offset 20 lines).
Hunk webosose#7 succeeded at 779 with fuzz 1 (offset 68 lines).
Patch 0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-141293] Create GPVB with Yocto 3.4 Honister

Change-Id: I9a484682dfbe45c439d8bc7fca975e0cb586a407

meta-webos/recipes-connectivity/connman/connman/0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch

@@ -1,4 +1,4 @@
-From 3547fa9899169b35e7e0aa9778f18f34f57637d1 Mon Sep 17 00:00:00 2001
+From 856a41d332e2ac1014db8dead3d74b46e3bc84fc Mon Sep 17 00:00:00 2001
 From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
 Date: Wed, 21 Feb 2018 16:36:23 +0530
 Subject: [PATCH] Add support for the WPS PBS and PIN mode
@@ -169,18 +169,18 @@ index 7508a9a1..a3095fb7 100644
  	const char *name;
  	enum connman_service_type type;
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index 6233fe11..0917eaf5 100644
+index e7014510..dd1cdcaf 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -64,6 +64,7 @@
+@@ -63,6 +63,7 @@
  #define CLEANUP_TIMEOUT   8	/* in seconds */
  #define INACTIVE_TIMEOUT  12	/* in seconds */
  #define FAVORITE_MAXIMUM_RETRIES 2
 +#define WPS_CONNECT_TIMEOUT 120 /* in seconds */
 
  #define BGSCAN_DEFAULT "simple:30:-65:300"
  #define AUTOSCAN_EXPONENTIAL "exponential:3:300"
-@@ -82,6 +83,8 @@
+@@ -81,6 +82,8 @@
  static struct connman_technology *wifi_technology = NULL;
  static struct connman_technology *p2p_technology = NULL;
 
@@ -189,7 +189,7 @@ index 6233fe11..0917eaf5 100644
  enum wifi_ap_capability{
  	WIFI_AP_UNKNOWN 	= 0,
  	WIFI_AP_SUPPORTED 	= 1,
-@@ -165,6 +168,11 @@ struct wifi_data {
+@@ -164,6 +167,11 @@ struct wifi_data {
  	int servicing;
  	int disconnect_code;
  	int assoc_code;
@@ -201,7 +201,7 @@ index 6233fe11..0917eaf5 100644
  };
 
  struct disconnect_data {
-@@ -216,6 +224,17 @@ static bool is_p2p_connecting(void)
+@@ -215,6 +223,17 @@ static bool is_p2p_connecting(void)
  	return false;
  }
 
@@ -219,7 +219,7 @@ index 6233fe11..0917eaf5 100644
  static void add_pending_wifi_device(struct wifi_data *wifi)
  {
  	if (g_list_find(pending_wifi_device, wifi))
-@@ -793,6 +812,9 @@ static int wifi_probe(struct connman_device *device)
+@@ -800,6 +819,9 @@ static int wifi_probe(struct connman_device *device)
 
  	wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
  							wifi_newlink, device);
@@ -229,7 +229,7 @@ index 6233fe11..0917eaf5 100644
  	if (is_p2p_connecting())
  		add_pending_wifi_device(wifi);
  	else
-@@ -2058,6 +2080,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
+@@ -2068,6 +2090,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
  	return ret;
  }
 
@@ -447,7 +447,7 @@ index 6233fe11..0917eaf5 100644
  static struct connman_device_driver wifi_ng_driver = {
  	.name		= "wifi",
  	.type		= CONNMAN_DEVICE_TYPE_WIFI,
-@@ -2069,6 +2302,8 @@ static struct connman_device_driver wifi_ng_driver = {
+@@ -2079,6 +2312,8 @@ static struct connman_device_driver wifi_ng_driver = {
  	.scan		= wifi_scan,
  	.stop_scan	= wifi_stop_scan,
  	.set_regdom	= wifi_set_regdom,
@@ -456,7 +456,7 @@ index 6233fe11..0917eaf5 100644
  };
 
  static void system_ready(void)
-@@ -2093,6 +2328,23 @@ static int network_probe(struct connman_network *network)
+@@ -2103,6 +2338,23 @@ static int network_probe(struct connman_network *network)
  	return 0;
  }
 
@@ -480,7 +480,7 @@ index 6233fe11..0917eaf5 100644
  static void network_remove(struct connman_network *network)
  {
  	struct connman_device *device = connman_network_get_device(network);
-@@ -2106,6 +2358,10 @@ static void network_remove(struct connman_network *network)
+@@ -2116,6 +2368,10 @@ static void network_remove(struct connman_network *network)
 
  	if (wifi->network != network)
  		return;
@@ -491,7 +491,7 @@ index 6233fe11..0917eaf5 100644
 
  	wifi->network = NULL;
  }
-@@ -2223,6 +2479,9 @@ static int network_connect(struct connman_network *network)
+@@ -2233,6 +2489,9 @@ static int network_connect(struct connman_network *network)
  	if (!wifi)
  		return -ENODEV;
 
@@ -501,8 +501,8 @@ index 6233fe11..0917eaf5 100644
  	ssid = g_try_malloc0(sizeof(GSupplicantSSID));
  	if (!ssid)
  		return -ENOMEM;
-@@ -2277,12 +2536,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
- 	wifi->disconnecting = false;
+@@ -2289,12 +2548,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
+
  	wifi->connected = false;
 
 -	if (wifi->pending_network) {
@@ -517,7 +517,7 @@ index 6233fe11..0917eaf5 100644
  }
 
  static int network_disconnect(struct connman_network *network)
-@@ -2425,24 +2682,26 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
+@@ -2437,24 +2694,26 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
  		struct disconnect_data *dd;
  		const char *wps_key;
 
@@ -562,7 +562,7 @@ index 6233fe11..0917eaf5 100644
  		}
 
  		wps_key = g_supplicant_interface_get_wps_key(interface);
-@@ -2499,6 +2758,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
+@@ -2511,6 +2770,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
  	return false;
  }
 
@@ -628,7 +628,7 @@ index 6233fe11..0917eaf5 100644
  static void interface_state(GSupplicantInterface *interface)
  {
  	struct connman_network *network;
-@@ -2506,7 +2824,10 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2518,7 +2836,10 @@ static void interface_state(GSupplicantInterface *interface)
  	struct wifi_data *wifi;
  	GSupplicantState state = g_supplicant_interface_get_state(interface);
  	bool wps;
@@ -639,7 +639,7 @@ index 6233fe11..0917eaf5 100644
 
  	wifi = g_supplicant_interface_get_data(interface);
 
-@@ -2540,6 +2861,23 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2552,6 +2873,23 @@ static void interface_state(GSupplicantInterface *interface)
  	if (!network)
  		return;
 
@@ -663,31 +663,31 @@ index 6233fe11..0917eaf5 100644
  	switch (state) {
  	case G_SUPPLICANT_STATE_SCANNING:
  		if (wifi->connected)
-@@ -2551,6 +2889,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2563,6 +2901,7 @@ static void interface_state(GSupplicantInterface *interface)
  	case G_SUPPLICANT_STATE_ASSOCIATING:
  		stop_autoscan(device);
 
 +		connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI,FALSE);
  		if (!wifi->connected)
  			connman_network_set_associating(network, true);
 
-@@ -2560,6 +2899,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2572,6 +2911,7 @@ static void interface_state(GSupplicantInterface *interface)
  		/* though it should be already stopped: */
  		stop_autoscan(device);
 
 +		connman_device_set_scanning(device,CONNMAN_SERVICE_TYPE_WIFI,FALSE);
  		if (!handle_wps_completion(interface, network, device, wifi))
  			break;
 
-@@ -2568,6 +2908,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2580,6 +2920,7 @@ static void interface_state(GSupplicantInterface *interface)
  		wifi->disconnect_code = 0;
  		wifi->assoc_code = 0;
  		wifi->load_shaping_retries = 0;
 +		wifi->wps_active = FALSE;
  		break;
 
  	case G_SUPPLICANT_STATE_DISCONNECTED:
-@@ -2613,7 +2954,12 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2625,7 +2966,12 @@ static void interface_state(GSupplicantInterface *interface)
  		}
  		wifi->disconnecting = false;
 
@@ -701,7 +701,7 @@ index 6233fe11..0917eaf5 100644
 
  		break;
 
-@@ -3289,6 +3635,7 @@ static const GSupplicantCallbacks callbacks = {
+@@ -3301,6 +3647,7 @@ static const GSupplicantCallbacks callbacks = {
  	.peer_lost		= peer_lost,
  	.peer_changed		= peer_changed,
  	.peer_request		= peer_request,
@@ -710,10 +710,10 @@ index 6233fe11..0917eaf5 100644
  	.disconnect_reasoncode  = disconnect_reasoncode,
  	.assoc_status_code      = assoc_status_code,
 diff --git a/src/connman.h b/src/connman.h
-index a43a6b8b..b8de7bd1 100644
+index 68176086..a37d574b 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -573,6 +573,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
+@@ -571,6 +571,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
  struct connman_device *__connman_device_find_device(enum connman_service_type type);
  int __connman_device_request_scan(enum connman_service_type type);
  int __connman_device_request_scan_full(enum connman_service_type type);
@@ -850,12 +850,12 @@ index 264c5e2d..d3048379 100644
  {
  	struct ifreq ifr;
 diff --git a/src/service.c b/src/service.c
-index 69f0a511..06f7893d 100644
+index 20917a89..64b117e8 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -55,6 +55,8 @@ static unsigned int vpn_autoconnect_id = 0;
- static struct connman_service *current_default = NULL;
- static bool services_dirty = false;
+@@ -58,6 +58,8 @@ static bool enable_online_to_ready_transition = false;
+ static unsigned int online_check_initial_interval = 0;
+ static unsigned int online_check_max_interval = 0;
 
 +bool block_auto_connect = FALSE;
 +

meta-webos/recipes-connectivity/connman/connman/0002-Set-IPv6-state-same-as-IPV4-on-disconnect.patch

@@ -1,4 +1,4 @@
-From 0d5667f16ac658dd703829eb8ed29c05495dbd4d Mon Sep 17 00:00:00 2001
+From 97326e558f5aca5c2fd45bc967a7720847c105f1 Mon Sep 17 00:00:00 2001
 From: "krishna.konwar" <krishna.konwar@lge.com>
 Date: Fri, 3 Aug 2018 16:17:00 +0530
 Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect
@@ -17,10 +17,10 @@ Upstream-Status : Inappropriate [webOS specific]
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/service.c b/src/service.c
-index 06f7893d..0e1bc59d 100644
+index 64b117e8..3b35c188 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -6368,8 +6368,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
+@@ -6454,8 +6454,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
  		if (service->state == CONNMAN_SERVICE_STATE_IDLE)
  			return -EINVAL;
 

meta-webos/recipes-connectivity/connman/connman/0003-Fix-for-wifi-network-switching-and-unable-to-connect.patch

@@ -1,4 +1,4 @@
-From bf962500a95cc23399678eda17a5c5d92efc882b Mon Sep 17 00:00:00 2001
+From c59ddb4b9d463b5db8f2e1ca0eb436947771383f Mon Sep 17 00:00:00 2001
 From: Vasu Kantubukta <vasu.kantubukta@lge.com>
 Date: Wed, 19 Dec 2018 21:02:59 +0530
 Subject: [PATCH] Fix for wifi network switching and unable to connect to open
@@ -32,10 +32,10 @@ Upstream-Status: Inappropriate [webOS specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index 0917eaf5..a9dd35c4 100644
+index dd1cdcaf..13e6861a 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -2954,7 +2954,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2966,7 +2966,7 @@ static void interface_state(GSupplicantInterface *interface)
  		}
  		wifi->disconnecting = false;
 

meta-webos/recipes-connectivity/connman/connman/0004-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch

@@ -1,4 +1,4 @@
-From 37f53d5931b0827e1ec645853f1342f1baa1ff80 Mon Sep 17 00:00:00 2001
+From 43e4681dc94b8eb6d14f2854ac870919d889fcf1 Mon Sep 17 00:00:00 2001
 From: "sachin.shetty" <sachin.shetty@lge.com>
 Date: Mon, 24 Jun 2019 16:55:43 +0530
 Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN.

meta-webos/recipes-connectivity/connman/connman/0005-Support-additional-feature-for-tethering.patch

@@ -1,4 +1,4 @@
-From 8720cc006772f7c32e249a6268f500db43dc886d Mon Sep 17 00:00:00 2001
+From 810b8ba3ab15d3a20b80d9d1b87f3c5b54ff9bfd Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Tue, 25 Jun 2019 13:11:11 +0900
 Subject: [PATCH] Support additional feature for tethering
@@ -40,10 +40,10 @@ index a3095fb7..1d78649c 100644
 
  void connman_technology_wps_failed_notify(struct connman_technology *technology);
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index a9dd35c4..314d3126 100644
+index 13e6861a..23782ff8 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -3657,16 +3657,25 @@ static void tech_remove(struct connman_technology *technology)
+@@ -3669,16 +3669,25 @@ static void tech_remove(struct connman_technology *technology)
  static GSupplicantSSID *ssid_ap_init(const char *ssid, const char *passphrase)
  {
  	GSupplicantSSID *ap;
@@ -71,10 +71,10 @@ index a9dd35c4..314d3126 100644
  	if (!passphrase || strlen(passphrase) == 0) {
  		ap->security = G_SUPPLICANT_SECURITY_NONE;
 diff --git a/src/connman.h b/src/connman.h
-index b8de7bd1..8c2aebce 100644
+index a37d574b..741ce028 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -648,6 +648,7 @@ const char *__connman_tethering_get_bridge(void);
+@@ -647,6 +647,7 @@ const char *__connman_tethering_get_bridge(void);
  int __connman_tethering_set_enabled(void);
  void __connman_tethering_set_disabled(void);
  void __connman_tethering_list_clients(DBusMessageIter *array);