[meego-commits] 6061: Changes to Trunk/connman
Peter Zhu
peter.j.zhu at intel.com
Wed Jul 28 14:48:59 UTC 2010
Hi,
I have made the following changes to connman in project Trunk. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #6061:
submit: Trunk:Testing/connman(r21) -> Trunk/connman
Message:
Move to Trunk
State: new 2010-07-28T02:42:05 peter
Comment: None
changes files:
--------------
--- connman.changes
+++ connman.changes
@@ -0,0 +1,5 @@
+* Tue Jul 27 2010 Martin Xu <martin.xu at intel.com> - 0.54.3
+- upgrade to 0.54.3
+- to fix BMC #4017
+- and BMC #3897
+
old:
----
connman-0.54.2.tar.bz2
new:
----
connman-0.54.3.tar.bz2
spec files:
-----------
--- connman.spec
+++ connman.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.15
+# spectacle version 0.18
#
# >> macros
# << macros
Name: connman
Summary: Connection Manager
-Version: 0.54.2
+Version: 0.54.3
Release: 1
Group: System/Networking
License: GPLv2
@@ -28,6 +28,7 @@
BuildRequires: dhclient
BuildRequires: openconnect
+
%description
Connection Manager provides a daemon for managing Internet connections
within embedded devices running the Linux operating system.
other changes:
--------------
++++++ connman-0.54.2.tar.bz2 -> connman-0.54.3.tar.bz2
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,13 @@
+ver 0.54.3
+ Fix html fetching error when recv returns 0
+ Fix wrong adapter_watch PATH
+
+ver 0.54.2
+ Fix SEGV at first startup
+ Fix connman_wifi_load_ssid
+ Fix crash in dhclient release
+ Create service ipconfig only when it's NULL
+
ver 0.54.1:
ConnMan 0.54 code merge
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for connman 0.54.2.
+# Generated by GNU Autoconf 2.64 for connman 0.54.3.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -695,8 +695,8 @@
# Identity of this package.
PACKAGE_NAME='connman'
PACKAGE_TARNAME='connman'
-PACKAGE_VERSION='0.54.2'
-PACKAGE_STRING='connman 0.54.2'
+PACKAGE_VERSION='0.54.3'
+PACKAGE_STRING='connman 0.54.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1583,7 +1583,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.54.2 to adapt to many kinds of systems.
+\`configure' configures connman 0.54.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1653,7 +1653,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of connman 0.54.2:";;
+ short | recursive ) echo "Configuration of connman 0.54.3:";;
esac
cat <<\_ACEOF
@@ -1821,7 +1821,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-connman configure 0.54.2
+connman configure 0.54.3
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2279,7 +2279,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.54.2, which was
+It was created by connman $as_me 0.54.3, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -3088,7 +3088,7 @@
# Define the identity of the package.
PACKAGE='connman'
- VERSION='0.54.2'
+ VERSION='0.54.3'
cat >>confdefs.h <<_ACEOF
@@ -13867,7 +13867,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.54.2, which was
+This file was extended by connman $as_me 0.54.3, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13931,7 +13931,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-connman config.status 0.54.2
+connman config.status 0.54.3
configured by $0, generated by GNU Autoconf 2.64,
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.54.2)
+AC_INIT(connman, 0.54.3)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_CONFIG_HEADER(config.h)
--- plugins/bluetooth.c
+++ plugins/bluetooth.c
@@ -903,7 +903,7 @@
NULL, NULL);
adapter_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
- BLUEZ_MANAGER_INTERFACE,
+ BLUEZ_ADAPTER_INTERFACE,
PROPERTY_CHANGED, adapter_changed,
NULL, NULL);
--- plugins/portal.c
+++ plugins/portal.c
@@ -159,6 +159,7 @@
{
struct connman_location *location = user_data;
struct server_data *data = connman_location_get_data(location);
+ enum get_page_status status;
char buf[BUFSIZ+1];
int len;
int sk;
@@ -168,24 +169,26 @@
if (condition & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) {
connman_error("TCP event error %d", condition);
- remove_timeout(data);
- data->watch = 0;
- if (data->get_page)
- data->get_page(location, NULL, 0, GET_PAGE_FAILED);
-
- return FALSE;
+ len = 0;
+ status = GET_PAGE_FAILED;
+ goto done;
}
sk = g_io_channel_unix_get_fd(channel);
len = recv(sk, buf, BUFSIZ, 0);
- if (len > 0) {
- remove_timeout(data);
- if (data->get_page)
- data->get_page(location, buf, len, GET_PAGE_SUCCESS);
- }
+ if (len > 0)
+ status = GET_PAGE_SUCCESS;
+ else
+ status = GET_PAGE_FAILED;
- return TRUE;
+done:
+ remove_timeout(data);
+ data->watch = 0;
+ if (data->get_page)
+ data->get_page(location, buf, len, status);
+
+ return FALSE;
}
static gboolean socket_event(GIOChannel *channel, GIOCondition condition,
@@ -224,7 +227,7 @@
}
g_free(query);
} else if (condition & G_IO_IN)
- tcp_event(channel, condition, user_data);
+ return tcp_event(channel, condition, user_data);
return TRUE;
}
@@ -370,7 +373,7 @@
remove_connection(location);
- if (page)
+ if (page && len > 0)
ret = get_status(data, page, len);
else
ret = status;
++++++ connman.yaml
--- connman.yaml
+++ connman.yaml
@@ -1,6 +1,6 @@
Name: connman
Summary: Connection Manager
-Version: 0.54.2
+Version: 0.54.3
Release: 1
Group: System/Networking
License: GPLv2
More information about the MeeGo-commits
mailing list