rpms/obexd/F-12 0001-Fix-file-corruption-during-PUT.patch, NONE, 1.1 obexd.spec, 1.19, 1.20

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/obexd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12334

Modified Files:
	obexd.spec 
Added Files:
	0001-Fix-file-corruption-during-PUT.patch 
Log Message:
* Mon Mar 08 2010 Bastien Nocera <bnocera at redhat.com> 0.19-2
- Fix sending corruption (#550538)


0001-Fix-file-corruption-during-PUT.patch:
 session.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-file-corruption-during-PUT.patch ---
>From 4205e57f83752f664bef00aed484eb701c07d702 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes at openbossa.org>
Date: Fri, 5 Mar 2010 17:12:58 -0300
Subject: [PATCH 1/2] Fix file corruption during PUT

In some cases file corruption would occur, because the order of
the arguments to memmove was inverted.
---
 client/session.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/client/session.c b/client/session.c
index 9948a4a..8ff2d48 100644
--- a/client/session.c
+++ b/client/session.c
@@ -1223,7 +1223,7 @@ static void put_xfer_progress(GwObexXfer *xfer, gpointer user_data)
 
 	session->filled = (session->filled + len) - written;
 
-	memmove(session->buffer + written, session->buffer, session->filled);
+	memmove(session->buffer, session->buffer + written, session->filled);
 
 	session->transferred += written;
 
-- 
1.6.6.1



Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/F-12/obexd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- obexd.spec	19 Nov 2009 14:14:15 -0000	1.19
+++ obexd.spec	8 Mar 2010 16:12:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		obexd
 Version:	0.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
@@ -14,6 +14,8 @@ BuildRequires:	glib2-devel
 BuildRequires:	dbus-devel
 BuildRequires:	bluez-libs-devel >= 4.0
 BuildRequires:	openobex-devel
+# http://thread.gmane.org/gmane.linux.bluez.kernel/4689/focus=4762
+Patch0:		0001-Fix-file-corruption-during-PUT.patch
 
 %description
 obexd contains obex-client, a D-Bus service to allow sending files
@@ -22,6 +24,7 @@ other Bluetooth-equipped devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .memmove
 
 %build
 %configure --disable-server
@@ -44,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Mon Mar 08 2010 Bastien Nocera <bnocera at redhat.com> 0.19-2
+- Fix sending corruption (#550538)
+
 * Thu Nov 19 2009 Bastien Nocera <bnocera at redhat.com> 0.19-1
 - Update to 0.19