connman: upgrade to 1.25

build-libppp-plugin-without-versioning-info.patch
no longer needed, removed.
Changelog:
Fix issue with handling rebind timer for DHCPv6.
Fix issue with handling DHCP renew transaction.
Fix issue with user supplied proxy settings and DHCP.
Fix issue with extra status codes from captive portals.
Fix issue with service idle state reset on failure.
Fix issue with DNS label compression handling.
Add support for experimental P2P Peer service.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch b/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch
deleted file mode 100644 (file)
index 8e81f1b..0000000
--- a/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
-
-From dd8044ed6ccb468558bab037257e27a409903d86 Mon Sep 17 00:00:00 2001
-From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
-Date: Mon, 21 Jul 2014 15:01:45 +0300
-Subject: [PATCH] scripts: Build libppp-plugin as a plain .so file
-
-There is no need to have module versioning for libppp-plugin.so
-file so build the plugin same way as other vpn plugins.
-
-This issue was seen when building ConnMan for Yocto.
----
- Makefile.plugins | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.plugins b/Makefile.plugins
-index 294cae0..8139967 100644
---- a/Makefile.plugins
-+++ b/Makefile.plugins
-@@ -4,7 +4,7 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
- plugin_ldflags = -no-undefined -module -avoid-version
- 
- script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
--                                      @DBUS_CFLAGS@
-+              @DBUS_CFLAGS@ $(plugin_ldflags) -shared
- 
- if LOOPBACK
- builtin_modules += loopback
--- 
-1.8.3.1
-

diff --git a/meta/recipes-connectivity/connman/connman_1.24.bb b/meta/recipes-connectivity/connman/connman_1.25.bb
similarity index 59%
rename from meta/recipes-connectivity/connman/connman_1.24.bb
rename to meta/recipes-connectivity/connman/connman_1.25.bb
index 29e239c67116daa67ee8d71a6ac47b062d347ebd..1758c95ee168b45a726e45247bad1c2b659e3748 100644 (file)
--- a/meta/recipes-connectivity/connman/connman_1.24.bb
+++ b/meta/recipes-connectivity/connman/connman_1.25.bb
@@ -4,9 +4,8 @@ SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
             file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
             file://add_xuser_dbus_permission.patch \
             file://connman \
-            file://build-libppp-plugin-without-versioning-info.patch \
             "
-SRC_URI[md5sum] = "dd6e1b4d9b9a28d127edb9f9b58bdec1"
-SRC_URI[sha256sum] = "551df7a5f0c6e4d69523dd2b3aa2c54525b323457d5135f64816215bad3dc24c"
+SRC_URI[md5sum] = "a449d2e49871494506e48765747e6624"
+SRC_URI[sha256sum] = "c1d266d6be18d2f66231f3537a7ed17b57637ca43c27328bc13c508cbeacce6e"
 
 RRECOMMENDS_${PN} = "connman-conf"