rpms/bluez-utils/F-9 bluez-utils-3.36-input-no-sdp.patch, NONE, 1.1 bluetooth.init, 1.10, 1.11 bluez-utils.spec, 1.106, 1.107 sources, 1.37, 1.38

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22534

Modified Files:
	bluetooth.init bluez-utils.spec sources 
Added Files:
	bluez-utils-3.36-input-no-sdp.patch 
Log Message:
3.36

bluez-utils-3.36-input-no-sdp.patch:

--- NEW FILE bluez-utils-3.36-input-no-sdp.patch ---
--- bluez-utils-3.36/input/manager.c~	2008-06-18 09:24:55.000000000 -0700
+++ bluez-utils-3.36/input/manager.c	2008-09-09 18:17:54.000000000 -0700
@@ -413,16 +413,15 @@ static void pnp_record_cb(sdp_list_t *re
 	if (err < 0) {
-		error_not_supported(pr->conn, pr->msg);
 		error("SDP search error: %s (%d)", strerror(-err), -err);
-		goto fail;
+		goto no_pnp;
 	}
 
 	if (!recs || !recs->data) {
-		error_not_supported(pr->conn, pr->msg);
 		error("Invalid PnP service record length");
-		goto fail;
+		goto no_pnp;
 	}
 
 	pr->pnp_recs = recs;
+ no_pnp:
 	sdp_uuid16_create(&uuid, HID_SVCLASS_ID);
 	err = bt_search_service(&pr->src, &pr->dst, &uuid, hid_record_cb,
 			pr, NULL);


Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluetooth.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bluetooth.init	12 Sep 2008 09:42:05 -0000	1.10
+++ bluetooth.init	13 Sep 2008 21:20:25 -0000	1.11
@@ -35,7 +35,7 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon /usr/sbin/hcid -s
+	daemon /usr/sbin/hcid -s -x
 	RETVAL=$?
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/hcid
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/bluez-utils.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- bluez-utils.spec	12 Sep 2008 09:42:05 -0000	1.106
+++ bluez-utils.spec	13 Sep 2008 21:20:25 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 3.35
-Release: 5%{?dist}
+Version: 3.36
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -13,10 +13,11 @@
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-oui-usage.patch
+Patch2: bluez-utils-3.36-input-no-sdp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
-BuildRequires: bluez-libs-devel >= %{version}
+BuildRequires: bluez-libs-devel >= 3.35
 BuildRequires: flex
 BuildRequires: dbus-devel >= 0.90
 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
@@ -74,6 +75,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0 -b .oui
+%patch2 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -81,7 +83,7 @@
 	   --enable-avctrl --enable-glib --enable-input --enable-echo \
 	   --enable-serial --disable-sdpd --enable-audio --disable-sync \
 	   --disable-obex --enable-network --enable-cups --enable-pcmciarules \
-	   --enable-hidd --enable-hid2hci --enable-dund
+	   --enable-hidd --enable-hid2hci --enable-dund --enable-pand
 make
 
 %install
@@ -158,6 +160,12 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Sep 13 2008 - David Woodhouse <David.Woodhouse at intel.com> - 3.36-1
+- Update to 3.36  
+- Re-enable pand
+- Add -x to hcid args to enable BlueZ 4.0 APIs
+- Don't fail when input device has no PnP record
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 3.35-5
 - Re-add chkconfig code to the initscript (#448888)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	3 Jul 2008 16:00:54 -0000	1.37
+++ sources	13 Sep 2008 21:20:25 -0000	1.38
@@ -1 +1 @@
-21dc2f8c03dae9db87da351c735510bb  bluez-utils-3.35.tar.gz
+4fc292b635ba7b442c7aaf5680199012  bluez-utils-3.36.tar.gz