Add a patch to resolve segment fault in obex-check-device.
Signed-off-by: Chen Qi
---
.../obex/openobex-1.5/disable-cable-test.patch | 16 --
.../openobex-1.5/libusb_crosscompile_check.patch | 11 ---
.../obex/openobex-1.5/separate_builddir.patch | 16 --
...001-obex-check-device-avoid-segment-fault.patch | 29 ++
meta-oe/recipes-connectivity/obex/openobex_1.5.bb | 35 --
.../recipes-connectivity/obex/openobex_1.7.2.bb| 33
6 files changed, 62 insertions(+), 78 deletions(-)
delete mode 100644
meta-oe/recipes-connectivity/obex/openobex-1.5/disable-cable-test.patch
delete mode 100644
meta-oe/recipes-connectivity/obex/openobex-1.5/libusb_crosscompile_check.patch
delete mode 100644
meta-oe/recipes-connectivity/obex/openobex-1.5/separate_builddir.patch
create mode 100644
meta-oe/recipes-connectivity/obex/openobex/0001-obex-check-device-avoid-segment-fault.patch
delete mode 100644 meta-oe/recipes-connectivity/obex/openobex_1.5.bb
create mode 100644 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
diff --git
a/meta-oe/recipes-connectivity/obex/openobex-1.5/disable-cable-test.patch
b/meta-oe/recipes-connectivity/obex/openobex-1.5/disable-cable-test.patch
deleted file mode 100644
index 95b636d..000
--- a/meta-oe/recipes-connectivity/obex/openobex-1.5/disable-cable-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
openobex-1.2/apps/Makefile.am~disable-cable-test
-+++ openobex-1.2/apps/Makefile.am
-@@ -6,7 +6,7 @@
- obex_io.c obex_io.h \
- obex_put_common.c obex_put_common.h
-
--bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
-+bin_PROGRAMS = irxfer obex_tcp irobex_palm3
-
- obex_test_SOURCES = \
- obex_test.c obex_test.h \
diff --git
a/meta-oe/recipes-connectivity/obex/openobex-1.5/libusb_crosscompile_check.patch
b/meta-oe/recipes-connectivity/obex/openobex-1.5/libusb_crosscompile_check.patch
deleted file mode 100644
index 1177dfe..000
---
a/meta-oe/recipes-connectivity/obex/openobex-1.5/libusb_crosscompile_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
/tmp/acinclude.m4 2009-04-12 10:32:15.0 +0200
-+++ openobex-1.5/acinclude.m4 2009-04-12 10:32:38.0 +0200
-@@ -158,7 +158,7 @@
- ;;
- *)
- PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes,
AC_MSG_RESULT(no))
-- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc,
REQUIRES="libusb")
-+ REQUIRES="libusb"
- ;;
- esac
- AC_SUBST(USB_CFLAGS)
diff --git
a/meta-oe/recipes-connectivity/obex/openobex-1.5/separate_builddir.patch
b/meta-oe/recipes-connectivity/obex/openobex-1.5/separate_builddir.patch
deleted file mode 100644
index 8abf8ae..000
--- a/meta-oe/recipes-connectivity/obex/openobex-1.5/separate_builddir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix detection of IrDA failing with B!=S
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton
-
a/acinclude.m4 2014-05-24 14:05:41.757796816 +0100
-+++ b/acinclude.m4 2014-05-24 14:03:06.556795536 +0100
-@@ -54,6 +54,7 @@
- ])
-
- AC_DEFUN([AC_PATH_IRDA_LINUX], [
-+ CPPFLAGS="${CPPFLAGS} -I${srcdir}"
- AC_CACHE_CHECK([for IrDA support], irda_found, [
- AC_TRY_COMPILE([
- #include
diff --git
a/meta-oe/recipes-connectivity/obex/openobex/0001-obex-check-device-avoid-segment-fault.patch
b/meta-oe/recipes-connectivity/obex/openobex/0001-obex-check-device-avoid-segment-fault.patch
new file mode 100644
index 000..d7c2681
--- /dev/null
+++
b/meta-oe/recipes-connectivity/obex/openobex/0001-obex-check-device-avoid-segment-fault.patch
@@ -0,0 +1,29 @@
+Subject: obex-check-device: avoid segment fault
+
+The argument number needs to be no less than 3 instead of 2. Otherwise,
+when we use `obex-check-device xxx' on target, there would be segment
+fault error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi
+---
+ udev/obex-check-device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/udev/obex-check-device.c b/udev/obex-check-device.c
+index 9eb4769..df9fc73 100644
+--- a/udev/obex-check-device.c
b/udev/obex-check-device.c
+@@ -62,7 +62,7 @@ int main (int argc, char **argv)
+ unsigned long vendor;
+ unsigned long product;
+
+- if (argc < 2)
++ if (argc < 3)
+ return 0;
+
+ vendor = strtoul(argv[1], NULL, 16);
+--
+2.8.3
+
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
deleted file mode 100644
index 6ac7905..000
--- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Openobex project is an open source implementation of the \
-Object Exchange (OBEX) protocol."
-HOMEPAGE = "http://openobex.triq.net";
-SECTION = "libs"
-DEPENDS = "virtual/libus