Hello community, here is the log from the commit of package bluez-utils checked in at Tue Mar 27 01:25:42 CEST 2007. -------- --- bluez-utils/bluez-utils.changes 2007-02-06 18:41:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez-utils/bluez-utils.changes 2007-03-26 19:30:29.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Mar 23 20:37:35 CET 2007 - dgollub@suse.de + +- added DBus retry workaround. Needed if hcid got started + before dbus started: + e.g. during boot - udev coldplug of bluetooth interface + (bug #228234, #230728, #254611) +- make use of internal SDP server +- disabled build of standalone SDP daemon +- fixed bluetooth init script which "cleans" /var/lib/bluetooth/ + instead of /var/lib/bluetooth/opd/ + +------------------------------------------------------------------- New: ---- bluez-utils-3.9-dbus-retry.diff bluez-utils-3.9-sdpd-manpage.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-utils.spec ++++++ --- /var/tmp/diff_new_pack.V12947/_old 2007-03-27 01:25:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V12947/_new 2007-03-27 01:25:30.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: alsa-devel bluez-libs cups dbus-1-devel fuse-devel libusb openobex-devel pkgconfig resmgr xorg-x11-devel URL: http://bluez.sourceforge.net Version: 3.9 -Release: 2 +Release: 11 Summary: Bluetooth Daemons and Utilities License: GNU General Public License (GPL) PreReq: %fillup_prereq %insserv_prereq @@ -34,6 +34,8 @@ Patch4: bluez-utils-3.8-bluetooth.rules.diff Patch5: bluez-utils-3.9-passkey-agent-warning.diff Patch6: bluez-utils-3.9-sdp-xml.diff +Patch7: bluez-utils-3.9-dbus-retry.diff +Patch8: bluez-utils-3.9-sdpd-manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: bluez-libs >= %( echo `rpm -q --queryformat '%{VERSION}' bluez-libs`) Requires: sysvinit @@ -99,6 +101,8 @@ %patch4 -p0 %patch5 -p0 #%patch6 -p0 +%patch7 -p0 +%patch8 %{?suse_update_config:%{suse_update_config -f . }} cd ../opd %patch1 -p1 @@ -115,7 +119,7 @@ --localstatedir=/var \ --enable-pie \ --enable-all \ -# --disable-sdpd + --disable-sdpd make cd ../opd make CFLAGS="-I. $RPM_OPT_FLAGS" @@ -196,7 +200,7 @@ %{_sbindir}/hcid %{_sbindir}/hid2hci %{_sbindir}/rcbluetooth -%{_sbindir}/sdpd +#%{_sbindir}/sdpd %{_sbindir}/avctrl # %{_sbindir}/csrinit %{_sbindir}/bccmd @@ -210,7 +214,7 @@ %doc %{_mandir}/man5/hcid.conf.5.gz %doc %{_mandir}/man8/hcid.8.gz %doc %{_mandir}/man8/hid2hci.8.gz -%doc %{_mandir}/man8/sdpd.8.gz +#%doc %{_mandir}/man8/sdpd.8.gz %doc %{_mandir}/man8/avctrl.8.gz # %doc %{_mandir}/man8/csrinit.8.gz %doc %{_mandir}/man8/bccmd.8.gz @@ -254,7 +258,16 @@ # %{_bindir}/scotest %doc %{_defaultdocdir}/bluez-test -%changelog -n bluez-utils +%changelog +* Fri Mar 23 2007 - dgollub@suse.de +- added DBus retry workaround. Needed if hcid got started + before dbus started: + e.g. during boot - udev coldplug of bluetooth interface + (bug #228234, #230728, #254611) +- make use of internal SDP server +- disabled build of standalone SDP daemon +- fixed bluetooth init script which "cleans" /var/lib/bluetooth/ + instead of /var/lib/bluetooth/opd/ * Tue Feb 06 2007 - seife@suse.de - fix array subscript range error in sdp-xml.c (bug 242030) * Mon Jan 29 2007 - seife@suse.de ++++++ bluetooth.rc.suse ++++++ --- bluez-utils/bluetooth.rc.suse 2006-10-27 20:06:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-utils/bluetooth.rc.suse 2007-03-23 20:43:00.000000000 +0100 @@ -57,7 +57,7 @@ fi # I don't like -exec # remove all files older than 3 days - find /var/lib/bluetooth/ -type f -a -mtime +3 |xargs -I{} /bin/rm {}; + find /var/lib/bluetooth/opd/ -type f -a -mtime +3 |xargs -I{} /bin/rm {}; } @@ -70,10 +70,6 @@ /sbin/checkproc $HCI_DAEMON || $HCI_DAEMON $HCI_DAEMON_ARGS echo -n " hcid" fi - if [ $SDP_START = "yes" ] && [ -x "$SDP_DAEMON" ] ; then - /sbin/checkproc $SDP_DAEMON || $SDP_DAEMON $SDP_DAEMON_ARGS - echo -n " sdpd" - fi if [ $HID_START = "yes" ] && [ -x "$HID_DAEMON" ] ; then /sbin/checkproc $HID_DAEMON || $HID_DAEMON $HID_DAEMON_ARGS echo -n " hidd" @@ -123,9 +119,6 @@ if [ -x $HID_DAEMON ]; then /sbin/killproc -TERM $HID_DAEMON && echo -n " hidd" fi - if [ -x $SDP_DAEMON ]; then - /sbin/killproc -TERM $SDP_DAEMON && echo -n " sdp" - fi if [ -x $HCI_DAEMON ]; then /sbin/killproc -TERM $HCI_DAEMON && echo -n " hcid" fi @@ -160,7 +153,6 @@ check_service "hcid" "$HCI_START" "$HCI_DAEMON" check_service "hidd" "$HID_START" "$HID_DAEMON" check_service "hid2hci" "$HID2HCI_START" "$HID2HCI_DAEMON" - check_service "sdpd" "$SDP_START" "$SDP_DAEMON" check_service "opd" "$OPD_START" "$OPD_DAEMON" check_service "rfcomm" "$RFCOMM_START" "$RFCOMM_DAEMON" check_service "pand" "$PAND_START" "$PAND_DAEMON" ++++++ bluetooth.sysconfig ++++++ --- bluez-utils/bluetooth.sysconfig 2006-10-27 20:06:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-utils/bluetooth.sysconfig 2007-03-23 20:43:21.000000000 +0100 @@ -39,30 +39,6 @@ HCI_DAEMON_ARGS=" -f /etc/bluetooth/hcid.conf" -############ SDP - -## Path: Hardware/Bluetooth -## Description: Start responsible demon for incoming service queries -## Type: yesno -## Default: yes -## ServiceRestart: bluetooth -SDP_START="yes" - -## Path: Hardware/Bluetooth -## Description: Set responsible demon for incoming service queries -## Type: list("/usr/sbin/sdpd","") -## Default: "/usr/sbin/sdpd" -## ServiceRestart: bluetooth -SDP_DAEMON="/usr/sbin/sdpd" - - -## Path: Hardware/Bluetooth -## Description: Arguments for sdp-demon start -## Type: list("","-n") -## Default: "" -## ServiceRestart: bluetooth -SDP_DAEMON_ARGS="" - ############ OPD ## Path: Hardware/Bluetooth ++++++ bluez-utils-3.9-dbus-retry.diff ++++++ --- common/dbus.c +++ common/dbus.c @@ -45,6 +45,7 @@ #include "logging.h" #define DISPATCH_TIMEOUT 0 +#define MAX_DBUS_RETRY 12 static int name_listener_initialized = 0; @@ -547,13 +548,27 @@ DBusConnection *init_dbus(const char *name, void (*disconnect_cb)(void *), void *user_data) { + int retry = 0; struct disconnect_data *dc_data; DBusConnection *conn; DBusError err; dbus_error_init(&err); - conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + do { + if (dbus_error_is_set(&err)) + dbus_error_free(&err); + + conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); + if (conn) + break; + + if (!retry) + info("Can't connect to DBUS. Will retry %i times.", MAX_DBUS_RETRY); + + sleep(5); + retry++; + } while (!conn && retry < MAX_DBUS_RETRY); if (dbus_error_is_set(&err)) { error("Can't connect to system message bus: %s", err.message); --- hcid/dbus-common.c +++ hcid/dbus-common.c @@ -64,6 +64,7 @@ #define BLUEZ_NAME "org.bluez" #define MAX_CONN_NUMBER 10 +#define MAX_DBUS_RETRY 12 #define RECONNECT_RETRY_TIMEOUT 5000 static sdp_session_t *sess = NULL; ++++++ bluez-utils-3.9-sdpd-manpage.diff ++++++ --- sdpd/Makefile.am +++ sdpd/Makefile.am @@ -17,7 +17,9 @@ INCLUDES = -I$(top_srcdir)/common +if SDPD man_MANS = sdpd.8 +endif EXTRA_DIST = $(man_MANS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org