[meego-commits] 10861: Changes to MeeGo:1.1:Core:Update:Testing/connman
yingan
no_reply at build.meego.com
Mon Dec 13 06:51:30 UTC 2010
Hi,
I have made the following changes to connman in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.
Thank You,
yingan
[This message was auto-generated]
---
Request #10861:
submit: home:yingan:branches:MeeGo:1.1:Core:Update:Testing/connman(r2)(cleanup) -> MeeGo:1.1:Core:Update:Testing/connman
Message:
Update to 0.60.7 to fix BMC 9771 and BMC 10745
State: new 2010-12-12T22:51:29 yingan
Comment: None
changes files:
--------------
--- connman.changes
+++ connman.changes
@@ -0,0 +1,3 @@
+* Tue Dec 13 2010 Deng Ying An <ying.an.deng at intel.com> - 0.60.7
+- upgrade to 0.60.6 to fix BMC #10745 and #9771
+
old:
----
connman-0.60.6.tar.bz2
new:
----
connman-0.60.7.tar.bz2
spec files:
-----------
--- connman.spec
+++ connman.spec
@@ -7,7 +7,7 @@
Name: connman
Summary: Connection Manager
-Version: 0.60.6
+Version: 0.60.7
Release: 1
Group: System/Networking
License: GPLv2
other changes:
--------------
++++++ connman-0.60.6.tar.bz2 -> connman-0.60.7.tar.bz2
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+ver 0.60.7
+ Set element driver when probing a device driver (Fixes BMC#9771)
+ Fix rfkill list traversal (Fixes BMC#10745)
+
ver 0.60.6
Openconnect plugin security fix
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for connman 0.60.6.
+# Generated by GNU Autoconf 2.63 for connman 0.60.7.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
# Identity of this package.
PACKAGE_NAME='connman'
PACKAGE_TARNAME='connman'
-PACKAGE_VERSION='0.60.6'
-PACKAGE_STRING='connman 0.60.6'
+PACKAGE_VERSION='0.60.7'
+PACKAGE_STRING='connman 0.60.7'
PACKAGE_BUGREPORT=''
ac_default_prefix=/usr/local
@@ -1630,7 +1630,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures connman 0.60.6 to adapt to many kinds of systems.
+\`configure' configures connman 0.60.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1700,7 +1700,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of connman 0.60.6:";;
+ short | recursive ) echo "Configuration of connman 0.60.7:";;
esac
cat <<\_ACEOF
@@ -1864,7 +1864,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-connman configure 0.60.6
+connman configure 0.60.7
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1878,7 +1878,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by connman $as_me 0.60.6, which was
+It was created by connman $as_me 0.60.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2728,7 +2728,7 @@
# Define the identity of the package.
PACKAGE='connman'
- VERSION='0.60.6'
+ VERSION='0.60.7'
cat >>confdefs.h <<_ACEOF
@@ -15359,7 +15359,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by connman $as_me 0.60.6, which was
+This file was extended by connman $as_me 0.60.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15422,7 +15422,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-connman config.status 0.60.6
+connman config.status 0.60.7
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
--- configure.ac
+++ configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT(connman, 0.60.6)
+AC_INIT(connman, 0.60.7)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_CONFIG_HEADER(config.h)
--- src/connman.h
+++ src/connman.h
@@ -185,7 +185,7 @@
void __connman_element_list(struct connman_element *element,
enum connman_element_type type,
DBusMessageIter *iter);
-
+void __connman_element_probe_element(struct connman_element *element);
struct connman_service *__connman_element_get_service(struct connman_element *element);
struct connman_device *__connman_element_get_device(struct connman_element *element);
const char *__connman_element_get_device_path(struct connman_element *element);
--- src/device.c
+++ src/device.c
@@ -598,6 +598,8 @@
element->device->driver = driver;
setup_device(element->device);
+
+ __connman_element_probe_element(element);
}
static void remove_device(struct connman_device *device)
--- src/element.c
+++ src/element.c
@@ -479,6 +479,31 @@
return FALSE;
}
+void __connman_element_probe_element(struct connman_element *element)
+{
+ GSList *list;
+
+ DBG("element %p name %s", element, element->name);
+
+ for (list = driver_list; list; list = list->next) {
+ struct connman_driver *driver = list->data;
+
+ if (match_driver(element, driver) == FALSE)
+ continue;
+
+ DBG("driver %p name %s", driver, driver->name);
+
+ if (__connman_device_has_driver(element->device) == TRUE) {
+ if (element->driver == NULL)
+ element->driver = driver;
+ break;
+ } else if (driver->probe(element) == 0) {
+ element->driver = driver;
+ break;
+ }
+ }
+}
+
void __connman_driver_rescan(struct connman_driver *driver)
{
DBG("driver %p name %s", driver, driver->name);
@@ -1007,23 +1032,7 @@
static void probe_element(struct connman_element *element)
{
- GSList *list;
-
- DBG("element %p name %s", element, element->name);
-
- for (list = driver_list; list; list = list->next) {
- struct connman_driver *driver = list->data;
-
- if (match_driver(element, driver) == FALSE)
- continue;
-
- DBG("driver %p name %s", driver, driver->name);
-
- if (driver->probe(element) == 0) {
- element->driver = driver;
- break;
- }
- }
+ __connman_element_probe_element(element);
}
static void register_element(gpointer data, gpointer user_data)
--- src/udev.c
+++ src/udev.c
@@ -191,7 +191,7 @@
if (phyindex < 0)
return FALSE;
- for (list = rfkill_list; list; list = rfkill_list->next) {
+ for (list = rfkill_list; list; list = list->next) {
struct rfkill_data *block = list->data;
if (block->phyindex == phyindex)
@@ -208,7 +208,7 @@
DBG("index %d blocked %d", phyindex, blocked);
- for (list = rfkill_list; list; list = rfkill_list->next) {
+ for (list = rfkill_list; list; list = list->next) {
block = list->data;
if (block->phyindex == phyindex) {
++++++ connman.yaml
--- connman.yaml
+++ connman.yaml
@@ -1,6 +1,6 @@
Name: connman
Summary: Connection Manager
-Version: 0.60.6
+Version: 0.60.7
Release: 1
Group: System/Networking
License: GPLv2
More information about the MeeGo-commits
mailing list