Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
Hi!
I'd like to upload libopenobex_1.5-2+deb7u1 to fix #743925 for wheezy.
Please find attached the debdiff; actually it's just a copy of the patch
in #699740 but I left out the updated watchfile here.
Enjoy,
Rhonda
--
Fühlst du dich mutlos, fass endlich Mut, los |
Fühlst du dich hilflos, geh raus und hilf, los | Wir sind Helden
Fühlst du dich machtlos, geh raus und mach, los | 23.55: Alles auf Anfang
Fühlst du dich haltlos, such Halt und lass los |
diff -u libopenobex-1.5/debian/changelog libopenobex-1.5/debian/changelog
--- libopenobex-1.5/debian/changelog
+++ libopenobex-1.5/debian/changelog
@@ -1,3 +1,11 @@
+libopenobex (1.5-2+deb7u1) stable; urgency=low
+
+ * NMU.
+ * Fix segfault when transferring files, taking the patch from #699740
+ (closes: #743925)
+
+ -- Gerfried Fuchs <rho...@debian.org> Fri, 25 Apr 2014 16:47:00 +0200
+
libopenobex (1.5-2) unstable; urgency=low
* Fix Docbook-XML build dependencies to build the application manual pages
diff -u libopenobex-1.5/debian/patches/series
libopenobex-1.5/debian/patches/series
--- libopenobex-1.5/debian/patches/series
+++ libopenobex-1.5/debian/patches/series
@@ -4,0 +5 @@
+fix-segfault_699740.patch
only in patch2:
unchanged:
--- libopenobex-1.5.orig/debian/patches/fix-segfault_699740.patch
+++ libopenobex-1.5/debian/patches/fix-segfault_699740.patch
@@ -0,0 +1,33 @@
+Description: Fix segfault when transferring files to smartphone
+ Handles when send() returns EAGAIN
+Author: z7z8th <ybzhao1...@gmail.com>
+Bug-Debian: http://bugs.debian.org/699740
+Reviewed-by: Joe Nahmias <je...@debian.org>
+Last-Update: 2013-07-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- libopenobex-1.5.orig/lib/obex_transport.c
++++ libopenobex-1.5/lib/obex_transport.c
+@@ -45,6 +45,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <errno.h>
+
+ #if defined(_WIN32)
+ #include <io.h>
+@@ -379,8 +380,12 @@
+ DEBUG(1, "sending %d bytes\n", size);
+
+ actual = write_func(fd, msg->data, size);
+- if (actual <= 0)
+- return actual;
++ if (actual <= 0) {
++ if (errno == EAGAIN)
++ actual = 0;
++ else
++ return actual;
++ }
+
+ /* Hide sent data */
+ buf_remove_begin(msg, actual);
