rpms/bluez-utils/devel bluez-utils-2.19-dbus.patch, 1.1, 1.2 bluez-utils.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2328

Modified Files:
	bluez-utils-2.19-dbus.patch bluez-utils.spec 
Log Message:
merge upstream fixes

bluez-utils-2.19-dbus.patch:
 dbus.c |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

Index: bluez-utils-2.19-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils-2.19-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez-utils-2.19-dbus.patch	22 Aug 2005 12:07:10 -0000	1.1
+++ bluez-utils-2.19-dbus.patch	24 Aug 2005 23:35:40 -0000	1.2
@@ -1,33 +1,56 @@
---- bluez-utils-2.19/hcid/dbus.c~	2005-08-08 11:21:48.000000000 +0100
-+++ bluez-utils-2.19/hcid/dbus.c	2005-08-22 12:14:32.000000000 +0100
-@@ -120,7 +120,9 @@ static void free_pin_req(void *req)
+Index: utils/hcid/dbus.c
+===================================================================
+RCS file: /cvsroot/bluez/utils/hcid/dbus.c,v
+retrieving revision 1.10
+retrieving revision 1.12
+diff -u -p -r1.10 -r1.12
+--- utils/hcid/dbus.c	5 Aug 2005 08:45:17 -0000	1.10
++++ utils/hcid/dbus.c	24 Aug 2005 21:09:48 -0000	1.12
+@@ -25,7 +25,7 @@
+  *  SOFTWARE IS DISCLAIMED.
+  *
+  *
+- *  $Id$
++ *  $Id$
+  */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -103,6 +103,7 @@ static void reply_handler_function(DBusP
+ 						PIN_CODE_REPLY_CP_SIZE, &pr);
+ 
+ 	dbus_message_unref(message);
++	dbus_pending_call_unref(call);
+ 
+ 	return;
+ 
+@@ -120,7 +121,9 @@ static void free_pin_req(void *req)
  void hcid_dbus_request_pin(int dev, struct hci_conn_info *ci)
  {
  	DBusMessage *message;
 -#ifndef HAVE_DBUS_MESSAGE_APPEND_ARGS
 +#ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
-+	uint8_t *bdaddr2 = &ci->bdaddr;
++	uint8_t *addr = (uint8_t *) &ci->bdaddr;
 +#else
  	DBusMessageIter iter;
  #endif
  	DBusPendingCall *pending = NULL;
-@@ -143,7 +145,7 @@ void hcid_dbus_request_pin(int dev, stru
+@@ -140,7 +143,7 @@ void hcid_dbus_request_pin(int dev, stru
  #ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
  	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
  			DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
 -			&ci->bdaddr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
-+			&bdaddr2, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
++			&addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
  #else
  	dbus_message_append_iter_init(message, &iter);
  
-@@ -176,10 +178,12 @@ failed:
+@@ -173,10 +176,12 @@ failed:
  void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi)
  {
  	DBusMessage *message;
 -#ifndef HAVE_DBUS_MESSAGE_APPEND_ARGS
 +	char local_addr[18], peer_addr[18];
 +#ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
-+	char *local_addr2 = local_addr, *peer_addr2 = peer_addr;
++	char *local_ptr = local_addr, *peer_ptr = peer_addr;
 +#else
  	DBusMessageIter iter;
  #endif
@@ -35,7 +58,7 @@
  
  	ba2str(local, local_addr);
  	ba2str(peer, peer_addr);
-@@ -193,10 +197,10 @@ void hcid_dbus_inquiry_result(bdaddr_t *
+@@ -190,10 +195,10 @@ void hcid_dbus_inquiry_result(bdaddr_t *
  
  #ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
  	dbus_message_append_args(message,
@@ -43,21 +66,22 @@
 -					DBUS_TYPE_STRING, peer_addr,
 -					DBUS_TYPE_UINT32, class,
 -					DBUS_TYPE_INT32, rssi,
-+					DBUS_TYPE_STRING, &local_addr2,
-+					DBUS_TYPE_STRING, &peer_addr2,
++					DBUS_TYPE_STRING, &local_ptr,
++					DBUS_TYPE_STRING, &peer_ptr,
 +					DBUS_TYPE_UINT32, &class,
 +					DBUS_TYPE_INT32, &rssi,
  					DBUS_TYPE_INVALID);
  #else
  	dbus_message_append_iter_init(message, &iter);
-@@ -223,10 +227,12 @@ failed:
+@@ -220,10 +225,13 @@ failed:
  void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name)
  {
  	DBusMessage *message;
 -#ifndef HAVE_DBUS_MESSAGE_APPEND_ARGS
 +	char local_addr[18], peer_addr[18];
 +#ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
-+	char *local_addr2 = local_addr, *peer_addr2 = peer_addr, *name2 = name;
++	char *local_ptr = local_addr, *peer_ptr = peer_addr;
++	char *name_ptr = name;
 +#else
  	DBusMessageIter iter;
  #endif
@@ -65,16 +89,16 @@
  
  	ba2str(local, local_addr);
  	ba2str(peer, peer_addr);
-@@ -240,9 +246,9 @@ void hcid_dbus_remote_name(bdaddr_t *loc
+@@ -237,9 +245,9 @@ void hcid_dbus_remote_name(bdaddr_t *loc
  
  #ifdef HAVE_DBUS_MESSAGE_APPEND_ARGS
  	dbus_message_append_args(message,
 -					DBUS_TYPE_STRING, local_addr,
 -					DBUS_TYPE_STRING, peer_addr,
 -					DBUS_TYPE_STRING, name,
-+					DBUS_TYPE_STRING, &local_addr2,
-+					DBUS_TYPE_STRING, &peer_addr2,
-+					DBUS_TYPE_STRING, &name2,
++					DBUS_TYPE_STRING, &local_ptr,
++					DBUS_TYPE_STRING, &peer_ptr,
++					DBUS_TYPE_STRING, &name_ptr,
  					DBUS_TYPE_INVALID);
  #else
  	dbus_message_append_iter_init(message, &iter);


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bluez-utils.spec	22 Aug 2005 12:07:10 -0000	1.23
+++ bluez-utils.spec	24 Aug 2005 23:35:40 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.19
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -109,6 +109,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Thu Aug 25 2005 David Woodhouse <dwmw2 at redhat.com> 2.19-3
+- Use dbus fixes from upstream
+
 * Mon Aug 22 2005 David Woodhouse <dwmw2 at redhat.com> 2.19-2
 - Fix calls to dbus_message_append_args()