Hello community,
here is the log from the commit of package bluez
checked in at Mon Sep 29 17:29:13 CEST 2008.
--------
--- bluez/bluez.changes 2008-09-26 12:15:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluez/bluez.changes 2008-09-29 10:15:38.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 29 09:36:31 CEST 2008 - seife@suse.de
+
+- update to bluez-4.8:
+ - fix two bluetoothd crashes during device pairing
+ - reenable HAL plugin, no need for libhal anymore
+ - hciconfig and hcitool now show all extended features pages
+ (important because page 1 indicates simple pairing support)
+
+-------------------------------------------------------------------
+Sat Sep 27 07:04:45 CEST 2008 - seife@suse.de
+
+- fix a crash when e.g. connecting a new input device
+
+-------------------------------------------------------------------
Old:
----
bluez-4.7.tar.bz2
New:
----
bluez-4.8-buildfix.diff
bluez-4.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.h17297/_old 2008-09-29 17:28:53.000000000 +0200
+++ /var/tmp/diff_new_pack.h17297/_new 2008-09-29 17:28:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package bluez (Version 4.7)
+# spec file for package bluez (Version 4.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
BuildRequires: alsa-devel libsndfile-devel
BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
Url: http://www.bluez.org
-Version: 4.7
+Version: 4.8
Release: 1
Summary: Bluetooth Stack for Linux
Group: Hardware/Mobile
@@ -39,6 +39,7 @@
Source5: org.bluez.service
Source6: README.SUSE
Patch1: bluez-utils-3.8-bluetooth.rules.diff
+Patch2: bluez-4.8-buildfix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: bluez-utils = 3.36
Obsoletes: bluez-utils <= 3.36
@@ -164,12 +165,13 @@
%prep
%setup -q
%patch1 -p0
+%patch2 -p1
cp %{S:1} scripts/
cp %{S:6} .
%{?suse_update_config:%{suse_update_config -f . }}
%build
-#autoreconf -sfi
+autoreconf -sfi
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir --localstatedir=%_localstatedir
#make
#%build
@@ -257,6 +259,7 @@
%dir %{_libdir}/bluetooth/plugins
%{_libdir}/bluetooth/plugins/audio.so
%{_libdir}/bluetooth/plugins/input.so
+%{_libdir}/bluetooth/plugins/hal.so
%{_libdir}/bluetooth/plugins/netlink.so
%{_libdir}/bluetooth/plugins/network.so
%{_libdir}/bluetooth/plugins/serial.so
@@ -334,6 +337,14 @@
%{_libdir}/gstreamer-*/*.so
%changelog
+* Mon Sep 29 2008 seife@suse.de
+- update to bluez-4.8:
+ - fix two bluetoothd crashes during device pairing
+ - reenable HAL plugin, no need for libhal anymore
+ - hciconfig and hcitool now show all extended features pages
+ (important because page 1 indicates simple pairing support)
+* Sat Sep 27 2008 seife@suse.de
+- fix a crash when e.g. connecting a new input device
* Fri Sep 26 2008 seife@suse.de
- update to bluez-4.7:
- Fix pairing and service discovery logic.
++++++ bluez-4.8-buildfix.diff ++++++
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e95662a..3b258a3 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -34,7 +34,7 @@ endif
AM_LDFLAGS = -module -avoid-version -no-undefined \
-export-symbols-regex bluetooth_plugin_desc
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
@GDBUS_CFLAGS@ @NETLINK_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
++++++ bluez-4.7.tar.bz2 -> bluez-4.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/acinclude.m4 new/bluez-4.8/acinclude.m4
--- old/bluez-4.7/acinclude.m4 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/acinclude.m4 2008-09-29 01:29:58.000000000 +0200
@@ -156,12 +156,6 @@
[Define to 1 if you need the usb_interrupt_read() function.]))
])
-AC_DEFUN([AC_PATH_HAL], [
- PKG_CHECK_MODULES(HAL, hal, hal_found=yes, hal_found=no)
- AC_SUBST(HAL_CFLAGS)
- AC_SUBST(HAL_LIBS)
-])
-
AC_DEFUN([AC_PATH_NETLINK], [
PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
AC_SUBST(NETLINK_CFLAGS)
@@ -244,10 +238,6 @@
usb_enable=${enableval}
])
- AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support]), [
- hal_enable=${enableval}
- ])
-
AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
netlink_enable=${enableval}
])
@@ -342,7 +332,6 @@
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
- AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" = "yes")
AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes")
AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/audio/Makefile.in new/bluez-4.8/audio/Makefile.in
--- old/bluez-4.7/audio/Makefile.in 2008-09-26 07:40:16.000000000 +0200
+++ new/bluez-4.8/audio/Makefile.in 2008-09-29 01:30:22.000000000 +0200
@@ -179,8 +179,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/ChangeLog new/bluez-4.8/ChangeLog
--- old/bluez-4.7/ChangeLog 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/ChangeLog 2008-09-29 01:29:58.000000000 +0200
@@ -1,3 +1,9 @@
+ver 4.8:
+ Fix retrieving of formfactor value.
+ Fix retrieving of local and remote extended features.
+ Fix potential NULL pointer dereference during pairing.
+ Fix crash with browsing due to a remotely initated pairing.
+
ver 4.7:
Fix pairing and service discovery logic.
Fix crashes during suspend and resume.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/common/Makefile.in new/bluez-4.8/common/Makefile.in
--- old/bluez-4.7/common/Makefile.in 2008-09-26 07:40:16.000000000 +0200
+++ new/bluez-4.8/common/Makefile.in 2008-09-29 01:30:22.000000000 +0200
@@ -110,8 +110,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/compat/Makefile.in new/bluez-4.8/compat/Makefile.in
--- old/bluez-4.7/compat/Makefile.in 2008-09-26 07:40:17.000000000 +0200
+++ new/bluez-4.8/compat/Makefile.in 2008-09-29 01:30:23.000000000 +0200
@@ -128,8 +128,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/configure new/bluez-4.8/configure
--- old/bluez-4.7/configure 2008-09-26 07:40:23.000000000 +0200
+++ new/bluez-4.8/configure 2008-09-29 01:30:29.000000000 +0200
@@ -883,8 +883,6 @@
GSTREAMER_PLUGINSDIR
USB_CFLAGS
USB_LIBS
-HAL_CFLAGS
-HAL_LIBS
NETLINK_CFLAGS
NETLINK_LIBS
SNDFILE_CFLAGS
@@ -900,8 +898,6 @@
SNDFILE_FALSE
NETLINK_TRUE
NETLINK_FALSE
-HAL_TRUE
-HAL_FALSE
USB_TRUE
USB_FALSE
SBC_TRUE
@@ -973,8 +969,6 @@
GSTREAMER_LIBS
USB_CFLAGS
USB_LIBS
-HAL_CFLAGS
-HAL_LIBS
NETLINK_CFLAGS
NETLINK_LIBS
SNDFILE_CFLAGS
@@ -1576,7 +1570,6 @@
--enable-gstreamer enable GStreamer support
--enable-alsa enable ALSA support
--enable-usb enable USB support
- --enable-hal enable HAL support
--enable-netlink enable NETLINK support
--enable-tools install Bluetooth utilities
--enable-bccmd install BCCMD interface utility
@@ -1633,8 +1626,6 @@
linker flags for GSTREAMER, overriding pkg-config
USB_CFLAGS C compiler flags for USB, overriding pkg-config
USB_LIBS linker flags for USB, overriding pkg-config
- HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
- HAL_LIBS linker flags for HAL, overriding pkg-config
NETLINK_CFLAGS
C compiler flags for NETLINK, overriding pkg-config
NETLINK_LIBS
@@ -2404,7 +2395,7 @@
# Define the identity of the package.
PACKAGE=bluez
- VERSION=4.7
+ VERSION=4.8
cat >>confdefs.h <<_ACEOF
@@ -4895,7 +4886,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4898 "configure"' > conftest.$ac_ext
+ echo '#line 4889 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6666,11 +6657,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6669: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6660: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6673: \$? = $ac_status" >&5
+ echo "$as_me:6664: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6956,11 +6947,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6959: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6950: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6963: \$? = $ac_status" >&5
+ echo "$as_me:6954: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7060,11 +7051,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7063: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7054: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7067: \$? = $ac_status" >&5
+ echo "$as_me:7058: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9411,7 +9402,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5
-echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
-
-if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
- ($PKG_CONFIG --exists --print-errors "hal") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$HAL_LIBS"; then
- pkg_cv_HAL_LIBS="$HAL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
- ($PKG_CONFIG --exists --print-errors "hal") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1`
- else
- HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- hal_found=no
-elif test $pkg_failed = untried; then
- hal_found=no
-else
- HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
- HAL_LIBS=$pkg_cv_HAL_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- hal_found=yes
-fi
-
-
-
-
-
-pkg_failed=no
{ echo "$as_me:$LINENO: checking for NETLINK" >&5
echo $ECHO_N "checking for NETLINK... $ECHO_C" >&6; }
@@ -11593,14 +11513,6 @@
fi
- # Check whether --enable-hal was given.
-if test "${enable_hal+set}" = set; then
- enableval=$enable_hal;
- hal_enable=${enableval}
-
-fi
-
-
# Check whether --enable-netlink was given.
if test "${enable_netlink+set}" = set; then
enableval=$enable_netlink;
@@ -11785,14 +11697,6 @@
NETLINK_FALSE=
fi
- if test "${hal_enable}" = "yes" && test "${hal_found}" = "yes"; then
- HAL_TRUE=
- HAL_FALSE='#'
-else
- HAL_TRUE='#'
- HAL_FALSE=
-fi
-
if test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"; then
USB_TRUE=
USB_FALSE='#'
@@ -12118,13 +12022,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${HAL_TRUE}" && test -z "${HAL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${USB_TRUE}" && test -z "${USB_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USB\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -12992,8 +12889,6 @@
GSTREAMER_PLUGINSDIR!$GSTREAMER_PLUGINSDIR$ac_delim
USB_CFLAGS!$USB_CFLAGS$ac_delim
USB_LIBS!$USB_LIBS$ac_delim
-HAL_CFLAGS!$HAL_CFLAGS$ac_delim
-HAL_LIBS!$HAL_LIBS$ac_delim
NETLINK_CFLAGS!$NETLINK_CFLAGS$ac_delim
NETLINK_LIBS!$NETLINK_LIBS$ac_delim
SNDFILE_CFLAGS!$SNDFILE_CFLAGS$ac_delim
@@ -13009,8 +12904,6 @@
SNDFILE_FALSE!$SNDFILE_FALSE$ac_delim
NETLINK_TRUE!$NETLINK_TRUE$ac_delim
NETLINK_FALSE!$NETLINK_FALSE$ac_delim
-HAL_TRUE!$HAL_TRUE$ac_delim
-HAL_FALSE!$HAL_FALSE$ac_delim
USB_TRUE!$USB_TRUE$ac_delim
USB_FALSE!$USB_FALSE$ac_delim
SBC_TRUE!$SBC_TRUE$ac_delim
@@ -13059,7 +12952,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/configure.ac new/bluez-4.8/configure.ac
--- old/bluez-4.7/configure.ac 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/configure.ac 2008-09-29 01:29:58.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez, 4.7)
+AM_INIT_AUTOMAKE(bluez, 4.8)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -32,7 +32,6 @@
AC_PATH_ALSA
AC_PATH_GSTREAMER
AC_PATH_USB
-AC_PATH_HAL
AC_PATH_NETLINK
AC_PATH_SNDFILE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/cups/Makefile.in new/bluez-4.8/cups/Makefile.in
--- old/bluez-4.7/cups/Makefile.in 2008-09-26 07:40:17.000000000 +0200
+++ new/bluez-4.8/cups/Makefile.in 2008-09-29 01:30:23.000000000 +0200
@@ -106,8 +106,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/doc/Makefile.in new/bluez-4.8/doc/Makefile.in
--- old/bluez-4.7/doc/Makefile.in 2008-09-26 07:40:18.000000000 +0200
+++ new/bluez-4.8/doc/Makefile.in 2008-09-29 01:30:23.000000000 +0200
@@ -89,8 +89,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/gdbus/Makefile.in new/bluez-4.8/gdbus/Makefile.in
--- old/bluez-4.7/gdbus/Makefile.in 2008-09-26 07:40:18.000000000 +0200
+++ new/bluez-4.8/gdbus/Makefile.in 2008-09-29 01:30:23.000000000 +0200
@@ -101,8 +101,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/include/Makefile.in new/bluez-4.8/include/Makefile.in
--- old/bluez-4.7/include/Makefile.in 2008-09-26 07:40:18.000000000 +0200
+++ new/bluez-4.8/include/Makefile.in 2008-09-29 01:30:24.000000000 +0200
@@ -95,8 +95,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/input/Makefile.in new/bluez-4.8/input/Makefile.in
--- old/bluez-4.7/input/Makefile.in 2008-09-26 07:40:18.000000000 +0200
+++ new/bluez-4.8/input/Makefile.in 2008-09-29 01:30:24.000000000 +0200
@@ -113,8 +113,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/lib/hci.c new/bluez-4.8/lib/hci.c
--- old/bluez-4.7/lib/hci.c 2008-08-06 19:10:01.000000000 +0200
+++ new/bluez-4.8/lib/hci.c 2008-09-29 01:29:58.000000000 +0200
@@ -1337,7 +1337,9 @@
return -1;
}
- memcpy(features, rp.features, 8);
+ if (features)
+ memcpy(features, rp.features, 8);
+
return 0;
}
@@ -1368,8 +1370,12 @@
return -1;
}
- *max_page = rp.max_page_num;
- memcpy(features, rp.features, 8);
+ if (max_page)
+ *max_page = rp.max_page_num;
+
+ if (features)
+ memcpy(features, rp.features, 8);
+
return 0;
}
@@ -1449,7 +1455,9 @@
return -1;
}
- memcpy(commands, rp.commands, 64);
+ if (commands)
+ memcpy(commands, rp.commands, 64);
+
return 0;
}
@@ -1472,7 +1480,9 @@
return -1;
}
- memcpy(features, rp.features, 8);
+ if (features)
+ memcpy(features, rp.features, 8);
+
return 0;
}
@@ -1500,8 +1510,12 @@
return -1;
}
- *max_page = rp.max_page_num;
- memcpy(features, rp.features, 8);
+ if (max_page)
+ *max_page = rp.max_page_num;
+
+ if (features)
+ memcpy(features, rp.features, 8);
+
return 0;
}
@@ -1524,7 +1538,9 @@
return -1;
}
- bacpy(bdaddr, &rp.bdaddr);
+ if (bdaddr)
+ bacpy(bdaddr, &rp.bdaddr);
+
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/lib/Makefile.am new/bluez-4.8/lib/Makefile.am
--- old/bluez-4.7/lib/Makefile.am 2008-08-05 23:14:56.000000000 +0200
+++ new/bluez-4.8/lib/Makefile.am 2008-09-29 01:29:58.000000000 +0200
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 3:0:0
+libbluetooth_la_LDFLAGS = -version-info 3:1:0
INCLUDES = -I$(top_builddir)/include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/lib/Makefile.in new/bluez-4.8/lib/Makefile.in
--- old/bluez-4.7/lib/Makefile.in 2008-09-26 07:40:18.000000000 +0200
+++ new/bluez-4.8/lib/Makefile.in 2008-09-29 01:30:24.000000000 +0200
@@ -112,8 +112,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -209,7 +207,7 @@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 3:0:0
+libbluetooth_la_LDFLAGS = -version-info 3:1:0
INCLUDES = -I$(top_builddir)/include
MAINTAINERCLEANFILES = Makefile.in
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/Makefile.in new/bluez-4.8/Makefile.in
--- old/bluez-4.7/Makefile.in 2008-09-26 07:40:21.000000000 +0200
+++ new/bluez-4.8/Makefile.in 2008-09-29 01:30:27.000000000 +0200
@@ -120,8 +120,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/network/Makefile.in new/bluez-4.8/network/Makefile.in
--- old/bluez-4.7/network/Makefile.in 2008-09-26 07:40:19.000000000 +0200
+++ new/bluez-4.8/network/Makefile.in 2008-09-29 01:30:24.000000000 +0200
@@ -115,8 +115,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/plugins/hal.c new/bluez-4.8/plugins/hal.c
--- old/bluez-4.7/plugins/hal.c 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/plugins/hal.c 2008-09-29 01:29:58.000000000 +0200
@@ -26,80 +26,89 @@
#endif
#include
-#include
-#include
-
-#include
+#include
#include "plugin.h"
#include "adapter.h"
#include "logging.h"
-#if 0
-static uint32_t get_form_factor(LibHalContext *ctx)
+static void formfactor_reply(DBusPendingCall *call, void *user_data)
{
- char *formfactor;
+ const char *formfactor = NULL;
+ DBusMessage *reply;
uint8_t minor = 0;
- formfactor = libhal_device_get_property_string(ctx,
- "/org/freedesktop/Hal/devices/computer",
- "system.formfactor", NULL);
+ reply = dbus_pending_call_steal_reply(call);
- if (formfactor == NULL)
- return (1 << 8);
+ if (dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &formfactor,
+ DBUS_TYPE_INVALID) == FALSE) {
+ error("Wrong formfactor arguments");
+ return;
+ }
- if (g_str_equal(formfactor, "laptop") == TRUE)
- minor |= (1 << 2) | (1 << 3);
- else if (g_str_equal(formfactor, "desktop") == TRUE)
- minor |= 1 << 2;
- else if (g_str_equal(formfactor, "server") == TRUE)
- minor |= 1 << 3;
- else if (g_str_equal(formfactor, "handheld") == TRUE)
- minor += 1 << 4;
+ debug("Computer is classified as %s", formfactor);
- free(formfactor);
+ if (formfactor != NULL) {
+ if (g_str_equal(formfactor, "laptop") == TRUE)
+ minor |= (1 << 2) | (1 << 3);
+ else if (g_str_equal(formfactor, "desktop") == TRUE)
+ minor |= 1 << 2;
+ else if (g_str_equal(formfactor, "server") == TRUE)
+ minor |= 1 << 3;
+ else if (g_str_equal(formfactor, "handheld") == TRUE)
+ minor += 1 << 4;
+ }
/* Computer major class */
- return (1 << 8) | minor;
+ debug("Setting 0x%06x device class", (1 << 8) | minor);
}
-#endif
+
+static DBusConnection *connection;
static int hal_probe(struct btd_adapter *adapter)
{
-#if 0
- DBusConnection *conn;
- LibHalContext *ctx;
+ const char *property = "system.formfactor";
+ DBusMessage *message;
+ DBusPendingCall *call;
- conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
- if (conn == NULL)
+ connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+ if (connection == NULL)
return -ENOMEM;
- ctx = libhal_ctx_new();
- if (libhal_ctx_set_dbus_connection(ctx, conn) == FALSE) {
- libhal_ctx_free(ctx);
- dbus_connection_unref(conn);
- return -EIO;
+ message = dbus_message_new_method_call("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/devices/computer",
+ "org.freedesktop.Hal.Device",
+ "GetPropertyString");
+ if (message == NULL) {
+ error("Failed to create formfactor request");
+ dbus_connection_unref(connection);
+ return -ENOMEM;
}
- if (libhal_ctx_init(ctx, NULL) == FALSE) {
- error("Unable to init HAL context");
- libhal_ctx_free(ctx);
- dbus_connection_unref(conn);
+ dbus_message_append_args(message, DBUS_TYPE_STRING, &property,
+ DBUS_TYPE_INVALID);
+
+ if (dbus_connection_send_with_reply(connection, message,
+ &call, -1) == FALSE) {
+ error("Failed to send formfactor request");
+ dbus_connection_unref(connection);
return -EIO;
}
- debug("Setting 0x%06x device class", get_form_factor(ctx));
+ dbus_pending_call_set_notify(call, formfactor_reply, NULL, NULL);
- libhal_ctx_free(ctx);
- dbus_connection_unref(conn);
-#endif
+ return 0;
+}
- return -ENODEV;
+static void hal_remove(struct btd_adapter *adapter)
+{
+ dbus_connection_unref(connection);
}
static struct btd_adapter_driver hal_driver = {
.name = "hal",
.probe = hal_probe,
+ .remove = hal_remove,
};
static int hal_init(void)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/plugins/Makefile.am new/bluez-4.8/plugins/Makefile.am
--- old/bluez-4.7/plugins/Makefile.am 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/plugins/Makefile.am 2008-09-29 01:29:58.000000000 +0200
@@ -1,12 +1,6 @@
plugindir = $(libdir)/bluetooth/plugins
-if HAL
-hal_plugins = hal.la
-else
-hal_plugins =
-endif
-
if NETLINK
netlink_plugins = netlink.la
else
@@ -19,7 +13,7 @@
service_plugins =
endif
-plugin_LTLIBRARIES = $(hal_plugins) $(netlink_plugins) $(service_plugins)
+plugin_LTLIBRARIES = hal.la $(netlink_plugins) $(service_plugins)
noinst_LTLIBRARIES = echo.la storage.la
@@ -27,12 +21,6 @@
storage_la_SOURCES = storage.c
-if HAL
-hal_la_SOURCES = hal.c
-
-hal_la_LIBADD = @HAL_LIBS@
-endif
-
if NETLINK
netlink_la_SOURCES = netlink.c
@@ -46,8 +34,8 @@
AM_LDFLAGS = -module -avoid-version -no-undefined \
-export-symbols-regex bluetooth_plugin_desc
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
- @NETLINK_CFLAGS@ @HAL_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/plugins/Makefile.in new/bluez-4.8/plugins/Makefile.in
--- old/bluez-4.7/plugins/Makefile.in 2008-09-26 07:40:19.000000000 +0200
+++ new/bluez-4.8/plugins/Makefile.in 2008-09-29 01:30:25.000000000 +0200
@@ -54,11 +54,9 @@
echo_la_LIBADD =
am_echo_la_OBJECTS = echo.lo
echo_la_OBJECTS = $(am_echo_la_OBJECTS)
-hal_la_DEPENDENCIES =
-am__hal_la_SOURCES_DIST = hal.c
-@HAL_TRUE@am_hal_la_OBJECTS = hal.lo
-hal_la_OBJECTS = $(am_hal_la_OBJECTS)
-@HAL_TRUE@am_hal_la_rpath = -rpath $(plugindir)
+hal_la_LIBADD =
+hal_la_SOURCES = hal.c
+hal_la_OBJECTS = hal.lo
netlink_la_DEPENDENCIES =
am__netlink_la_SOURCES_DIST = netlink.c
@NETLINK_TRUE@am_netlink_la_OBJECTS = netlink.lo
@@ -84,11 +82,10 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(echo_la_SOURCES) $(hal_la_SOURCES) $(netlink_la_SOURCES) \
+SOURCES = $(echo_la_SOURCES) hal.c $(netlink_la_SOURCES) \
$(service_la_SOURCES) $(storage_la_SOURCES)
-DIST_SOURCES = $(echo_la_SOURCES) $(am__hal_la_SOURCES_DIST) \
- $(am__netlink_la_SOURCES_DIST) $(am__service_la_SOURCES_DIST) \
- $(storage_la_SOURCES)
+DIST_SOURCES = $(echo_la_SOURCES) hal.c $(am__netlink_la_SOURCES_DIST) \
+ $(am__service_la_SOURCES_DIST) $(storage_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -130,8 +127,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -226,27 +221,21 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
plugindir = $(libdir)/bluetooth/plugins
-@HAL_FALSE@hal_plugins =
-@HAL_TRUE@hal_plugins = hal.la
@NETLINK_FALSE@netlink_plugins =
@NETLINK_TRUE@netlink_plugins = netlink.la
@SERVICEPLUGIN_FALSE@service_plugins =
@SERVICEPLUGIN_TRUE@service_plugins = service.la
-plugin_LTLIBRARIES = $(hal_plugins) $(netlink_plugins) $(service_plugins)
+plugin_LTLIBRARIES = hal.la $(netlink_plugins) $(service_plugins)
noinst_LTLIBRARIES = echo.la storage.la
echo_la_SOURCES = echo.c
storage_la_SOURCES = storage.c
-@HAL_TRUE@hal_la_SOURCES = hal.c
-@HAL_TRUE@hal_la_LIBADD = @HAL_LIBS@
@NETLINK_TRUE@netlink_la_SOURCES = netlink.c
@NETLINK_TRUE@netlink_la_LIBADD = @NETLINK_LIBS@
@SERVICEPLUGIN_TRUE@service_la_SOURCES = service.c
AM_LDFLAGS = -module -avoid-version -no-undefined \
-export-symbols-regex bluetooth_plugin_desc
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
- @NETLINK_CFLAGS@ @HAL_CFLAGS@
-
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
MAINTAINERCLEANFILES = Makefile.in
all: all-am
@@ -321,7 +310,7 @@
echo.la: $(echo_la_OBJECTS) $(echo_la_DEPENDENCIES)
$(LINK) $(echo_la_OBJECTS) $(echo_la_LIBADD) $(LIBS)
hal.la: $(hal_la_OBJECTS) $(hal_la_DEPENDENCIES)
- $(LINK) $(am_hal_la_rpath) $(hal_la_OBJECTS) $(hal_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(plugindir) $(hal_la_OBJECTS) $(hal_la_LIBADD) $(LIBS)
netlink.la: $(netlink_la_OBJECTS) $(netlink_la_DEPENDENCIES)
$(LINK) $(am_netlink_la_rpath) $(netlink_la_OBJECTS) $(netlink_la_LIBADD) $(LIBS)
service.la: $(service_la_OBJECTS) $(service_la_DEPENDENCIES)
@@ -550,6 +539,7 @@
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-pluginLTLIBRARIES
+ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@
all-local:
@$(LN_S) -f $(top_srcdir)/input/.libs/input.so
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/rfcomm/Makefile.in new/bluez-4.8/rfcomm/Makefile.in
--- old/bluez-4.7/rfcomm/Makefile.in 2008-09-26 07:40:19.000000000 +0200
+++ new/bluez-4.8/rfcomm/Makefile.in 2008-09-29 01:30:25.000000000 +0200
@@ -130,8 +130,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/sbc/Makefile.in new/bluez-4.8/sbc/Makefile.in
--- old/bluez-4.7/sbc/Makefile.in 2008-09-26 07:40:19.000000000 +0200
+++ new/bluez-4.8/sbc/Makefile.in 2008-09-29 01:30:25.000000000 +0200
@@ -124,8 +124,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/scripts/Makefile.in new/bluez-4.8/scripts/Makefile.in
--- old/bluez-4.7/scripts/Makefile.in 2008-09-26 07:40:20.000000000 +0200
+++ new/bluez-4.8/scripts/Makefile.in 2008-09-29 01:30:25.000000000 +0200
@@ -95,8 +95,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/serial/Makefile.in new/bluez-4.8/serial/Makefile.in
--- old/bluez-4.7/serial/Makefile.in 2008-09-26 07:40:20.000000000 +0200
+++ new/bluez-4.8/serial/Makefile.in 2008-09-29 01:30:26.000000000 +0200
@@ -113,8 +113,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/src/dbus-hci.c new/bluez-4.8/src/dbus-hci.c
--- old/bluez-4.7/src/dbus-hci.c 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/src/dbus-hci.c 2008-09-29 01:29:58.000000000 +0200
@@ -518,7 +518,7 @@
bonding = adapter_get_bonding_info(adapter);
- if (bacmp(&bonding->bdaddr, peer))
+ if (bonding && bacmp(&bonding->bdaddr, peer))
bonding = NULL;
if (status == 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/src/device.c new/bluez-4.8/src/device.c
--- old/bluez-4.7/src/device.c 2008-09-26 07:39:55.000000000 +0200
+++ new/bluez-4.8/src/device.c 2008-09-29 01:29:58.000000000 +0200
@@ -857,6 +857,7 @@
static void services_changed(struct browse_req *req)
{
+ DBusConnection *conn = get_dbus_connection();
struct btd_device *device = req->device;
char **uuids;
GSList *l;
@@ -866,7 +867,7 @@
for (i = 0, l = device->uuids; l; l = l->next, i++)
uuids[i] = l->data;
- dbus_connection_emit_property_changed(req->conn, device->path,
+ dbus_connection_emit_property_changed(conn, device->path,
DEVICE_INTERFACE, "UUIDs",
DBUS_TYPE_ARRAY, &uuids);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/src/Makefile.in new/bluez-4.8/src/Makefile.in
--- old/bluez-4.7/src/Makefile.in 2008-09-26 07:40:20.000000000 +0200
+++ new/bluez-4.8/src/Makefile.in 2008-09-29 01:30:26.000000000 +0200
@@ -125,8 +125,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/test/list-devices new/bluez-4.8/test/list-devices
--- old/bluez-4.7/test/list-devices 2008-09-06 04:27:38.000000000 +0200
+++ new/bluez-4.8/test/list-devices 2008-09-29 01:29:58.000000000 +0200
@@ -7,6 +7,13 @@
manager = dbus.Interface(bus.get_object("org.bluez", "/"),
"org.bluez.Manager")
+def extract_objects(object_list):
+ list = ""
+ for object in object_list:
+ val = str(object)
+ list = list + val[val.rfind("/") + 1:] + " "
+ return list
+
def extract_uuids(uuid_list):
list = ""
for uuid in uuid_list:
@@ -29,9 +36,17 @@
properties = adapter.GetProperties()
for key in properties.keys():
- print " %s = %s" % (key, properties[key])
+ value = properties[key]
+ if (key == "Devices"):
+ list = extract_objects(value)
+ print " %s = %s" % (key, list)
+ else:
+ print " %s = %s" % (key, value)
- device_list = adapter.ListDevices()
+ try:
+ device_list = properties["Devices"]
+ except:
+ device_list = []
for n in device_list:
device = dbus.Interface(bus.get_object("org.bluez", n),
@@ -41,7 +56,10 @@
properties = device.GetProperties()
for key in properties.keys():
value = properties[key]
- if (key == "UUIDs"):
+ if (key == "Nodes"):
+ list = extract_objects(value)
+ print " %s = %s" % (key, list)
+ elif (key == "UUIDs"):
list = extract_uuids(value)
print " %s = %s" % (key, list)
elif (key == "Class"):
@@ -49,4 +67,18 @@
else:
print " %s = %s" % (key, value)
+ try:
+ node_list = properties["Nodes"]
+ except:
+ node_list = []
+
+ for x in node_list:
+ node = dbus.Interface(bus.get_object("org.bluez", x),
+ "org.bluez.Node")
+ print " [ " + x + " ]"
+
+ properties = node.GetProperties()
+ for key in properties.keys():
+ print " %s = %s" % (key, properties[key])
+
print
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/test/Makefile.in new/bluez-4.8/test/Makefile.in
--- old/bluez-4.7/test/Makefile.in 2008-09-26 07:40:20.000000000 +0200
+++ new/bluez-4.8/test/Makefile.in 2008-09-29 01:30:26.000000000 +0200
@@ -145,8 +145,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/tools/hciconfig.c new/bluez-4.8/tools/hciconfig.c
--- old/bluez-4.7/tools/hciconfig.c 2008-08-29 15:21:38.000000000 +0200
+++ new/bluez-4.8/tools/hciconfig.c 2008-09-29 01:29:58.000000000 +0200
@@ -358,7 +358,7 @@
static void cmd_features(int ctl, int hdev, char *opt)
{
- uint8_t max_page, features[8];
+ uint8_t features[8], max_page = 0;
char *tmp;
int i, dd;
@@ -382,17 +382,19 @@
}
print_dev_hdr(&di);
- tmp = lmp_featurestostr(di.features, "\t\t", 63);
printf("\tFeatures%s: 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x "
"0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x\n",
(max_page > 0) ? " page 0" : "",
features[0], features[1], features[2], features[3],
features[4], features[5], features[6], features[7]);
+
+ tmp = lmp_featurestostr(di.features, "\t\t", 63);
printf("%s\n", tmp);
bt_free(tmp);
for (i = 1; i <= max_page; i++) {
- if (hci_read_local_ext_features(dd, 1, &max_page, features, 1000) < 0)
+ if (hci_read_local_ext_features(dd, i, NULL,
+ features, 1000) < 0)
continue;
printf("\tFeatures page %d: 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/tools/hcitool.c new/bluez-4.8/tools/hcitool.c
--- old/bluez-4.7/tools/hcitool.c 2008-08-29 15:21:38.000000000 +0200
+++ new/bluez-4.8/tools/hcitool.c 2008-09-29 01:29:58.000000000 +0200
@@ -823,12 +823,12 @@
{
bdaddr_t bdaddr;
uint16_t handle;
- uint8_t max_page, features[8];
- char name[249], oui[9], *comp;
+ uint8_t features[8], max_page = 0;
+ char name[249], oui[9], *comp, *tmp;
struct hci_version version;
struct hci_dev_info di;
struct hci_conn_info_req *cr;
- int opt, dd, cc = 0;
+ int i, opt, dd, cc = 0;
for_each_opt(opt, info_options, NULL) {
switch (opt) {
@@ -917,20 +917,32 @@
bt_free(ver);
}
- if (hci_read_remote_features(dd, handle, features, 20000) == 0) {
- char *tmp = lmp_featurestostr(features, "\t\t", 63);
- printf("\tFeatures: 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x\n%s\n",
- features[0], features[1], features[2], features[3],
- features[4], features[5], features[6], features[7], tmp);
- bt_free(tmp);
- }
+ memset(features, 0, sizeof(features));
+ hci_read_remote_features(dd, handle, features, 20000);
- if ((di.features[7] & LMP_EXT_FEAT) && (features[7] & LMP_EXT_FEAT)) {
- if (hci_read_remote_ext_features(dd, handle, 0,
- &max_page, features, 20000) == 0)
- if (max_page > 0)
- printf("\tExtended features: %d page%s\n",
- max_page, max_page > 1 ? "s" : "");
+ if ((di.features[7] & LMP_EXT_FEAT) && (features[7] & LMP_EXT_FEAT))
+ hci_read_remote_ext_features(dd, handle, 0, &max_page,
+ features, 20000);
+
+ printf("\tFeatures%s: 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x "
+ "0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x\n",
+ (max_page > 0) ? " page 0" : "",
+ features[0], features[1], features[2], features[3],
+ features[4], features[5], features[6], features[7]);
+
+ tmp = lmp_featurestostr(features, "\t\t", 63);
+ printf("%s\n", tmp);
+ bt_free(tmp);
+
+ for (i = 1; i <= max_page; i++) {
+ if (hci_read_remote_ext_features(dd, handle, i, NULL,
+ features, 20000) < 0)
+ continue;
+
+ printf("\tFeatures page %d: 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x "
+ "0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x\n", i,
+ features[0], features[1], features[2], features[3],
+ features[4], features[5], features[6], features[7]);
}
if (cc) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/tools/Makefile.in new/bluez-4.8/tools/Makefile.in
--- old/bluez-4.7/tools/Makefile.in 2008-09-26 07:40:21.000000000 +0200
+++ new/bluez-4.8/tools/Makefile.in 2008-09-29 01:30:27.000000000 +0200
@@ -178,8 +178,6 @@
GSTREAMER_LIBS = @GSTREAMER_LIBS@
GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
GTKDOC_CHECK = @GTKDOC_CHECK@
-HAL_CFLAGS = @HAL_CFLAGS@
-HAL_LIBS = @HAL_LIBS@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-4.7/tools/sdptool.c new/bluez-4.8/tools/sdptool.c
--- old/bluez-4.7/tools/sdptool.c 2008-08-29 15:21:38.000000000 +0200
+++ new/bluez-4.8/tools/sdptool.c 2008-09-29 01:29:58.000000000 +0200
@@ -3935,8 +3935,9 @@
{
struct search_context context;
uint32_t base[] = { 0x10000, 0x10300, 0x10500,
- 0x1002e, 0x110b, 0x90000, 0x2008000,
- 0x4000000, 0x100000, 0x1000000, 0x4f491100 };
+ 0x1002e, 0x110b, 0x90000, 0x2008000,
+ 0x4000000, 0x100000, 0x1000000,
+ 0x4f491100, 0x4f491200 };
bdaddr_t bdaddr;
int i, n, opt, err = 0, num = 32;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org