Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at Fri Nov 27 13:39:32 CET 2009. -------- --- bluez/bluez.changes 2009-11-02 22:50:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez/bluez.changes 2009-11-16 09:09:54.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 16 09:02:00 CET 2009 - seife@opensuse.org + +- update to bluez-4.58: + - Fix crash when adapter agent exists during authentication. + - Fix CK-20W quirks for play and pause events. + +------------------------------------------------------------------- bluez-gstreamer.changes: same change calling whatdependson for head-i586 Old: ---- bluez-4.57.tar.bz2 New: ---- bluez-4.58.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.c9t0Ha/_old 2009-11-27 13:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.c9t0Ha/_new 2009-11-27 13:12:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bluez-gstreamer (Version 4.57) +# spec file for package bluez-gstreamer (Version 4.58) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,11 +24,11 @@ BuildRequires: alsa-devel libsndfile-devel pkg-config udev BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel Url: http://www.bluez.org -Version: 4.57 +Version: 4.58 Release: 1 Summary: Bluetooth Sound Support Group: Productivity/Multimedia/Sound/Utilities -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Sound/Utilities AutoReqProv: on Source: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2 ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.c9t0Ha/_old 2009-11-27 13:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.c9t0Ha/_new 2009-11-27 13:12:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bluez (Version 4.57) +# spec file for package bluez (Version 4.58) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,11 +23,11 @@ BuildRequires: glib2-devel libnl-devel libusb-devel BuildRequires: alsa-devel libsndfile-devel pkg-config udev Url: http://www.bluez.org -Version: 4.57 +Version: 4.58 Release: 1 Summary: Bluetooth Stack for Linux Group: Hardware/Mobile -License: GPL v2 or later +License: GPLv2+ Group: Hardware/Mobile AutoReqProv: on Source: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2 @@ -61,7 +61,7 @@ and others, see AUTHORS %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Files needed for BlueZ development Group: Development/Sources Requires: libbluetooth3 = %{version} @@ -78,7 +78,7 @@ and others, see AUTHORS %package -n libbluetooth3 -License: GPL v2 or later +License: GPLv2+ Summary: Bluetooth Libraries Group: Hardware/Mobile Provides: bluez-libs = 3.36 @@ -96,7 +96,7 @@ %package cups Group: Hardware/Printing -License: GPL v2 or later +License: GPLv2+ Summary: CUPS Driver for Bluetooth Printers Requires: libbluetooth3 = %{version} @@ -113,7 +113,7 @@ %package test Group: Development/Tools/Debuggers -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Summary: Tools for testing of various Bluetooth-functions Requires: libbluetooth3 = %{version} python-gobject2 dbus-1-python @@ -130,7 +130,7 @@ %package alsa Group: Productivity/Multimedia/Sound/Utilities -License: GPL v2 or later +License: GPLv2+ Summary: Bluetooth Sound Support Requires: libbluetooth3 = %{version} Provides: bluez-audio:%_libdir/alsa-lib/libasound_module_pcm_bluetooth.so @@ -149,7 +149,7 @@ %package compat Group: Hardware/Mobile -License: GPL v2 or later +License: GPLv2+ Summary: Bluetooth Stack for Linux Requires: libbluetooth3 = %{version} ++++++ bluez-4.57.tar.bz2 -> bluez-4.58.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/audio/control.c new/bluez-4.58/audio/control.c --- old/bluez-4.57/audio/control.c 2009-10-10 06:17:28.000000000 +0200 +++ new/bluez-4.58/audio/control.c 2009-11-15 03:04:13.000000000 +0100 @@ -650,6 +650,8 @@ if (g_str_equal(name, "Nokia CK-20W")) { control->key_quirks[FORWARD_OP] |= QUIRK_NO_RELEASE; control->key_quirks[BACKWARD_OP] |= QUIRK_NO_RELEASE; + control->key_quirks[PLAY_OP] |= QUIRK_NO_RELEASE; + control->key_quirks[PAUSE_OP] |= QUIRK_NO_RELEASE; } ba2str(&dev->dst, address); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/ChangeLog new/bluez-4.58/ChangeLog --- old/bluez-4.57/ChangeLog 2009-10-31 08:18:09.000000000 +0100 +++ new/bluez-4.58/ChangeLog 2009-11-15 03:04:13.000000000 +0100 @@ -1,3 +1,7 @@ +ver 4.58: + Fix crash when adapter agent exists during authentication. + Fix CK-20W quirks for play and pause events. + ver 4.57: Fix unloading of drivers for uninitialized adapters. Fix debug message to use requested and not opened SEID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/configure new/bluez-4.58/configure --- old/bluez-4.57/configure 2009-10-31 08:19:03.000000000 +0100 +++ new/bluez-4.58/configure 2009-11-15 03:04:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for bluez 4.57. +# Generated by GNU Autoconf 2.63 for bluez 4.58. # # 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='bluez' PACKAGE_TARNAME='bluez' -PACKAGE_VERSION='4.57' -PACKAGE_STRING='bluez 4.57' +PACKAGE_VERSION='4.58' +PACKAGE_STRING='bluez 4.58' PACKAGE_BUGREPORT='' ac_default_prefix=/usr/local @@ -1592,7 +1592,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 bluez 4.57 to adapt to many kinds of systems. +\`configure' configures bluez 4.58 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1662,7 +1662,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bluez 4.57:";; + short | recursive ) echo "Configuration of bluez 4.58:";; esac cat <<\_ACEOF @@ -1820,7 +1820,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bluez configure 4.57 +bluez configure 4.58 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1834,7 +1834,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bluez $as_me 4.57, which was +It was created by bluez $as_me 4.58, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2684,7 +2684,7 @@ # Define the identity of the package. PACKAGE='bluez' - VERSION='4.57' + VERSION='4.58' cat >>confdefs.h <<_ACEOF @@ -14145,7 +14145,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bluez $as_me 4.57, which was +This file was extended by bluez $as_me 4.58, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14208,7 +14208,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -bluez config.status 4.57 +bluez config.status 4.58 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/configure.ac new/bluez-4.58/configure.ac --- old/bluez-4.57/configure.ac 2009-10-31 08:18:09.000000000 +0100 +++ new/bluez-4.58/configure.ac 2009-11-15 03:04:13.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(bluez, 4.57) +AC_INIT(bluez, 4.58) AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/Makefile.am new/bluez-4.58/Makefile.am --- old/bluez-4.57/Makefile.am 2009-10-10 06:17:28.000000000 +0200 +++ new/bluez-4.58/Makefile.am 2009-11-15 03:04:13.000000000 +0100 @@ -332,6 +332,9 @@ src/bluetooth.exp: $(src_bluetoothd_OBJECTS) $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \ $(EGREP) -e '^btd_' -e '^g_dbus_' > $@ + $(AM_V_at)echo -e "info" >> $@ + $(AM_V_at)echo -e "error" >> $@ + $(AM_V_at)echo -e "debug" >> $@ src/bluetooth.ver: src/bluetooth.exp $(AM_V_at)echo "{ global:" > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/Makefile.in new/bluez-4.58/Makefile.in --- old/bluez-4.57/Makefile.in 2009-10-31 08:18:59.000000000 +0100 +++ new/bluez-4.58/Makefile.in 2009-11-15 03:04:42.000000000 +0100 @@ -3101,6 +3101,9 @@ src/bluetooth.exp: $(src_bluetoothd_OBJECTS) $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \ $(EGREP) -e '^btd_' -e '^g_dbus_' > $@ + $(AM_V_at)echo -e "info" >> $@ + $(AM_V_at)echo -e "error" >> $@ + $(AM_V_at)echo -e "debug" >> $@ src/bluetooth.ver: src/bluetooth.exp $(AM_V_at)echo "{ global:" > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/plugins/netlink.c new/bluez-4.58/plugins/netlink.c --- old/bluez-4.57/plugins/netlink.c 2009-05-04 01:00:28.000000000 +0200 +++ new/bluez-4.58/plugins/netlink.c 2009-11-15 03:04:13.000000000 +0100 @@ -91,8 +91,8 @@ cache = genl_ctrl_alloc_cache(handle); if (!cache) { error("Failed to allocate generic netlink cache"); - return -ENOMEM; nl_handle_destroy(handle); + return -ENOMEM; } family = genl_ctrl_search_by_name(cache, "bluetooth"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/src/adapter.c new/bluez-4.58/src/adapter.c --- old/bluez-4.57/src/adapter.c 2009-10-31 08:18:09.000000000 +0100 +++ new/bluez-4.58/src/adapter.c 2009-11-15 03:04:13.000000000 +0100 @@ -1066,7 +1066,7 @@ agent = device_get_agent(device); if (agent) { - agent_destroy(agent, FALSE); + agent_free(agent); device_set_agent(device, NULL); } @@ -1684,7 +1684,7 @@ ERROR_INTERFACE ".DoesNotExist", "No such agent"); - agent_destroy(adapter->agent, FALSE); + agent_free(adapter->agent); adapter->agent = NULL; return dbus_message_new_method_return(msg); @@ -2347,7 +2347,7 @@ { struct btd_adapter *adapter = user_data; - agent_destroy(adapter->agent, FALSE); + agent_free(adapter->agent); adapter->agent = NULL; debug("adapter_free(%p)", adapter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/src/agent.c new/bluez-4.58/src/agent.c --- old/bluez-4.57/src/agent.c 2009-09-10 15:49:37.000000000 +0200 +++ new/bluez-4.58/src/agent.c 2009-11-15 03:04:13.000000000 +0100 @@ -139,10 +139,12 @@ debug("Agent exited without calling Unregister"); - agent_destroy(agent, TRUE); + agent->exited = TRUE; + + agent_free(agent); } -static void agent_free(struct agent *agent) +void agent_free(struct agent *agent) { if (!agent) return; @@ -206,16 +208,6 @@ return agent; } -int agent_destroy(struct agent *agent, gboolean exited) -{ - if (!agent) - return 0; - - agent->exited = exited; - agent_free(agent); - return 0; -} - static struct agent_request *agent_request_new(struct agent *agent, agent_request_type_t type, void *cb, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/src/agent.h new/bluez-4.58/src/agent.h --- old/bluez-4.57/src/agent.h 2009-04-11 13:34:58.000000000 +0200 +++ new/bluez-4.58/src/agent.h 2009-11-15 03:04:13.000000000 +0100 @@ -39,7 +39,7 @@ const char *path, uint8_t capability, agent_remove_cb cb, void *remove_cb_data); -int agent_destroy(struct agent *agent, gboolean exited); +void agent_free(struct agent *agent); int agent_authorize(struct agent *agent, const char *path, const char *uuid, agent_cb cb, void *user_data, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.57/src/device.c new/bluez-4.58/src/device.c --- old/bluez-4.57/src/device.c 2009-10-31 08:18:09.000000000 +0100 +++ new/bluez-4.58/src/device.c 2009-11-15 03:04:13.000000000 +0100 @@ -223,7 +223,7 @@ struct agent *agent = adapter_get_agent(adapter); if (device->agent) - agent_destroy(device->agent, FALSE); + agent_free(device->agent); if (agent && (agent_is_busy(agent, device) || agent_is_busy(agent, device->authr))) @@ -1657,7 +1657,7 @@ return; agent_cancel(device->agent); - agent_destroy(device->agent, FALSE); + agent_free(device->agent); device->agent = NULL; } @@ -2044,12 +2044,13 @@ struct btd_device *device = auth->device; /* No need to reply anything if the authentication already failed */ - if (!auth->cb) + if (!auth || !auth->cb) return; ((agent_pincode_cb) auth->cb)(agent, err, pincode, device); - auth->cb = NULL; + device->authr->cb = NULL; + device->authr->agent = NULL; } static void confirm_cb(struct agent *agent, DBusError *err, void *data) @@ -2058,12 +2059,13 @@ struct btd_device *device = auth->device; /* No need to reply anything if the authentication already failed */ - if (!auth->cb) + if (!auth || !auth->cb) return; ((agent_cb) auth->cb)(agent, err, device); - auth->cb = NULL; + device->authr->cb = NULL; + device->authr->agent = NULL; } static void passkey_cb(struct agent *agent, DBusError *err, uint32_t passkey, @@ -2073,12 +2075,13 @@ struct btd_device *device = auth->device; /* No need to reply anything if the authentication already failed */ - if (!auth->cb) + if (!auth || !auth->cb) return; ((agent_passkey_cb) auth->cb)(agent, err, passkey, device); - auth->cb = NULL; + device->authr->cb = NULL; + device->authr->agent = NULL; } int device_request_authentication(struct btd_device *device, auth_type_t type, @@ -2145,7 +2148,7 @@ struct agent *agent = auth->agent; DBusError err; - if (!auth->cb) + if (!auth || !auth->cb) return; dbus_error_init(&err); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org