From 391e453a205afe210e265d766226be52b56c76c1 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Wed, 18 Feb 2026 11:36:59 +0000
Subject: [PATCH] connman: upgrade 1.45 -> 2.0

---
 ...man-vpn-avoid-hiding-implementation-reserved-sym.patch | 5 +----
 .../0002-resolve-musl-does-not-implement-res_ninit.patch  | 2 +-
 .../connman/connman/no-version-scripts.patch              | 8 ++++----
 .../connman/{connman_1.45.bb => connman_2.0.bb}           | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 meta/recipes-connectivity/connman/connman/0001-connman-vpn-avoid-hiding-implementation-reserved-sym.patch
 rename meta/recipes-connectivity/connman/{connman_1.45.bb => connman_2.0.bb} (99%)

diff --git a/meta/recipes-connectivity/connman/connman/0001-connman-vpn-avoid-hiding-implementation-reserved-sym.patch b/meta/recipes-connectivity/connman/connman/0001-connman-vpn-avoid-hiding-implementation-reserved-sym.patch
old mode 100755
new mode 100644
index 3b7b5a096e..6940e81006
--- a/meta/recipes-connectivity/connman/connman/0001-connman-vpn-avoid-hiding-implementation-reserved-sym.patch
+++ b/meta/recipes-connectivity/connman/connman/0001-connman-vpn-avoid-hiding-implementation-reserved-sym.patch
@@ -1,4 +1,4 @@
-From eac489c872c775c88bbd85b4cec6c1d47ad9e6a6 Mon Sep 17 00:00:00 2001
+From 37ccc55f9493bdcd31bcca29ac35347ca156da2d Mon Sep 17 00:00:00 2001
 From: Peter Tatrai <peter.tatrai.ext@siemens.com>
 Date: Sun, 7 Sep 2025 09:25:20 +0200
 Subject: [PATCH] connman, vpn: avoid hiding implementation-reserved symbols
@@ -45,6 +45,3 @@ index b887706..5cad344 100644
 -		*;
 +		[!_]*;
  };
--- 
-2.47.2
-
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 2c612039ee..a75b55d6e7 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,4 +1,4 @@
-From 4e726a5aaa75d60fab6a56bc37dbec48be53ff79 Mon Sep 17 00:00:00 2001
+From 16caa22ca9ec9ccd735cf9743dfb70b59b87ef66 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 6 Apr 2015 23:02:21 -0700
 Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to
diff --git a/meta/recipes-connectivity/connman/connman/no-version-scripts.patch b/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
index c96ab311e5..54d1fe2c58 100644
--- a/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
+++ b/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
@@ -1,4 +1,4 @@
-From 67f37aafcc8ef5d2eb006387e7bec21f74518727 Mon Sep 17 00:00:00 2001
+From 6a5ac5476207fa745f9a2890042cc98dd892b999 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Tue, 9 Aug 2016 12:12:02 +0100
 Subject: [PATCH] connman: disable version-scripts to fix crashes at startup
@@ -23,10 +23,10 @@ Signed-off-by: Peter Tatrai <peter.tatrai.ext@siemens.com>
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 3dc3bb5..3be5ccb 100644
+index 1e44314..f5366ad 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -143,8 +143,7 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+@@ -142,8 +142,7 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
  			@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
  			-lresolv -ldl -lrt
  
@@ -36,7 +36,7 @@ index 3dc3bb5..3be5ccb 100644
  
  src_connmand_wait_online_SOURCES = src/connmand-wait-online.c
  
-@@ -187,8 +186,7 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
+@@ -186,8 +185,7 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
  				@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
  				-lresolv -ldl
  
diff --git a/meta/recipes-connectivity/connman/connman_1.45.bb b/meta/recipes-connectivity/connman/connman_2.0.bb
similarity index 99%
rename from meta/recipes-connectivity/connman/connman_1.45.bb
rename to meta/recipes-connectivity/connman/connman_2.0.bb
index ca0337b4d3..6f7093301b 100644
--- a/meta/recipes-connectivity/connman/connman_1.45.bb
+++ b/meta/recipes-connectivity/connman/connman_2.0.bb
@@ -25,7 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
            file://0002-resolve-musl-does-not-implement-res_ninit.patch \
            "
 
-SRC_URI[sha256sum] = "77128cce80865455c4f106b5901a575e2dfdb35a7d2e2e2996f16e85cba10913"
+SRC_URI[sha256sum] = "d25c2ddc0b5ad13e986ec35ad765ae8d2f4b7acb47c958a05616c943cd082527"
 
 RRECOMMENDS:${PN} = "connman-conf"
 RCONFLICTS:${PN} = "networkmanager"
-- 
2.47.1

