[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-85-gb0b1722

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b0b1722b1c04700f2ccc133f3776f79844cadba3 (commit)
      from  53edeeb42c5b3476c207cad07fe9c09595620018 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b0b1722b1c04700f2ccc133f3776f79844cadba3
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 16:32:22 2012 +0100

    [BUILDROOT] 2012.11: clean-up openobe and ussp-push for BR upstream integration. Thx Smartin

-----------------------------------------------------------------------

Summary of changes:
 .../2012.11/116-openobex-add_package.patch         |  172 +++++++++++---------
 .../2012.11/117-ussp-push-add_package.patch        |   81 +++++++---
 2 files changed, 156 insertions(+), 97 deletions(-)

diff --git a/patches/buildroot/2012.11/116-openobex-add_package.patch b/patches/buildroot/2012.11/116-openobex-add_package.patch
index 4326dcd..1d6a492 100644
--- a/patches/buildroot/2012.11/116-openobex-add_package.patch
+++ b/patches/buildroot/2012.11/116-openobex-add_package.patch
@@ -2,23 +2,39 @@ Adds OpenOBEX package to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:44:54.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:01.000000000 +0100
-@@ -502,6 +502,7 @@
+Cc: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in                                  |  1 +
+ package/openobex/Config.in                         | 28 +++++++++++++++++
+ ...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++
+ .../openobex-replace_deprecated_functions.patch    | 30 +++++++++++++++++++
+ package/openobex/openobex.mk                       | 35 ++++++++++++++++++++++
+ 5 files changed, 112 insertions(+)
+ create mode 100644 package/openobex/Config.in
+ create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
+ create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
+ create mode 100644 package/openobex/openobex.mk
+
+diff --git a/package/Config.in b/package/Config.in
+index 74e439e..0855684 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -632,6 +632,7 @@ source "package/ntp/Config.in"
  source "package/nuttcp/Config.in"
  source "package/olsr/Config.in"
  source "package/openntpd/Config.in"
 +source "package/openobex/Config.in"
  source "package/openssh/Config.in"
+ source "package/openswan/Config.in"
  source "package/openvpn/Config.in"
- source "package/portmap/Config.in"
-Index: buildroot/package/openobex/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in	2012-02-21 16:45:01.000000000 +0100
-@@ -0,0 +1,25 @@
+diff --git a/package/openobex/Config.in b/package/openobex/Config.in
+new file mode 100644
+index 0000000..06f4c7d
+--- /dev/null
++++ b/package/openobex/Config.in
+@@ -0,0 +1,28 @@
 +config BR2_PACKAGE_OPENOBEX
 +	bool "openobex"
 +	help
@@ -28,79 +44,36 @@ Index: buildroot/package/openobex/Config.in
 +	  http://www.openobex.org
 +
 +if BR2_PACKAGE_OPENOBEX
++config BR2_PACKAGE_OPENOBEX_BLUEZ
++	bool "enable bluez support"
++	select BR2_PACKAGE_BLUEZ_UTILS
++
++config BR2_PACKAGE_OPENOBEX_LIBUSB
++	bool "enable libusb support"
++	select BR2_PACKAGE_LIBUSB
 +
 +config BR2_PACKAGE_OPENOBEX_APPS
 +	bool "install test applications"
-+	default n
 +	help
 +	  Also install the openobex test applications on target.
 +
 +config BR2_PACKAGE_OPENOBEX_SYSLOG
 +	bool "enable debugging to the system logger"
-+	default n
 +
 +config BR2_PACKAGE_OPENOBEX_DUMP
 +	bool "enable protocol dumping for debugging"
-+	default n
-+
-+endif
-Index: buildroot/package/openobex/openobex.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,47 @@
-+#############################################################
-+#
-+# openobex
-+#
-+#############################################################
-+OPENOBEX_VERSION = 1.5
-+OPENOBEX_SITE = http://www.kernel.org/pub/linux/bluetooth
-+OPENOBEX_AUTORECONF = YES
-+OPENOBEX_INSTALL_STAGING = YES
-+OPENOBEX_INSTALL_TARGET = YES
-+
-+ifeq ($(strip $(BR2_PACKAGE_BLUEZ_LIBS)),y)
-+WITH_BLUEZ=--with-bluez=$(STAGING_DIR)
-+else
-+WITH_BLUEZ=--disable-bluetooth
-+endif
-+
-+ifeq ($(strip $(BR2_PACKAGE_LIBUSB)),y)
-+WITH_USB=--with-usb=$(STAGING_DIR)
-+else
-+WITH_USB=--disable-usb
-+endif
-+
-+WITH_APPS=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_APPS)),y)
-+WITH_APPS=--enable-apps
-+endif
-+
-+WITH_SYSLOG=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_SYSLOG)),y)
-+WITH_SYSLOG=--enable-syslog
-+endif
-+
-+WITH_DUMP=
-+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_DUMP)),y)
-+WITH_DUMP=--enable-dump
 +endif
+diff --git a/package/openobex/openobex-libusb_check_when_cross-compiling.patch b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+new file mode 100644
+index 0000000..7b8056a
+--- /dev/null
++++ b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+@@ -0,0 +1,18 @@
++Fix libusb check when cross-compiling.
 +
-+OPENOBEX_CONF_OPT = \
-+		$(WITH_APPS) \
-+		$(WITH_BLUEZ) \
-+		$(WITH_USB) \
-+		$(WITH_DUMP) \
-+		$(WITH_SYSLOG)
++Signed-off-by: Julien Boibessot <jul...@ar...>
++Signed-off-by: Samuel Martin <s.m...@gm...>
 +
-+$(eval $(autotools-package))
-+
-Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,13 @@
 +Index: openobex-1.5/acinclude.m4
 +===================================================================
 +--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
@@ -114,11 +87,17 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
 + 		;;
 + 	esac
 + 	AC_SUBST(USB_CFLAGS)
-Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch	2012-02-21 16:45:02.000000000 +0100
-@@ -0,0 +1,25 @@
+diff --git a/package/openobex/openobex-replace_deprecated_functions.patch b/package/openobex/openobex-replace_deprecated_functions.patch
+new file mode 100644
+index 0000000..17274d3
+--- /dev/null
++++ b/package/openobex/openobex-replace_deprecated_functions.patch
+@@ -0,0 +1,30 @@
++obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
 +Index: openobex-1.5/apps/obex_test_cable.c
 +===================================================================
 +--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
@@ -144,3 +123,46 @@ Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
 + 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
 + 	gt->newtio.c_iflag = IGNPAR;
 + 	gt->newtio.c_oflag = 0;
+diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
+new file mode 100644
+index 0000000..beac5ff
+--- /dev/null
++++ b/package/openobex/openobex.mk
+@@ -0,0 +1,35 @@
++#############################################################
++#
++# openobex
++#
++#############################################################
++OPENOBEX_VERSION = 1.5
++OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
++# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2
++OPENOBEX_LICENSE = GPLv2/LGPLv2.1
++OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
++
++OPENOBEX_AUTORECONF = YES
++OPENOBEX_INSTALL_STAGING = YES
++
++OPENOBEX_CONF_OPT += \
++	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
++	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
++	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
++	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
++
++ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
++OPENOBEX_DEPENDENCIES += bluez_utils
++OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
++else
++OPENOBEX_CONF_OPT += --disable-bluetooth
++endif
++
++ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
++OPENOBEX_DEPENDENCIES += libusb
++OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
++else
++OPENOBEX_CONF_OPT += --disable-usb
++endif
++
++$(eval $(autotools-package))
+-- 
+1.8.0.1
diff --git a/patches/buildroot/2012.11/117-ussp-push-add_package.patch b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
index a2d1aca..0b54f74 100644
--- a/patches/buildroot/2012.11/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2012.11/117-ussp-push-add_package.patch
@@ -1,39 +1,72 @@
 Adds ussp-push package to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in                                         |  1 +
+ package/ussp-push/Config.in                               |  9 +++++++++
+ .../ussp-push/ussp-push-fix-build-against-bluez-4.patch   | 15 +++++++++++++++
+ package/ussp-push/ussp-push.mk                            | 13 +++++++++++++
+ 4 files changed, 38 insertions(+)
+ create mode 100644 package/ussp-push/Config.in
+ create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+ create mode 100644 package/ussp-push/ussp-push.mk
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:45:01.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:03.000000000 +0100
-@@ -531,6 +531,7 @@
- source "package/transmission/Config.in"
- source "package/ttcp/Config.in"
+diff --git a/package/Config.in b/package/Config.in
+index 0855684..c530305 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -668,6 +668,7 @@ source "package/ttcp/Config.in"
  source "package/udpcast/Config.in"
-+source "package/ussp-push/Config.in"
  source "package/ulogd/Config.in"
  source "package/ushare/Config.in"
++source "package/ussp-push/Config.in"
  source "package/vpnc/Config.in"
-Index: buildroot/package/ussp-push/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in	2012-02-21 16:45:03.000000000 +0100
-@@ -0,0 +1,10 @@
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
+diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
+new file mode 100644
+index 0000000..324280f
+--- /dev/null
++++ b/package/ussp-push/Config.in
+@@ -0,0 +1,9 @@
 +config BR2_PACKAGE_USSP_PUSH
 +	bool "ussp-push"
 +	select BR2_PACKAGE_OPENOBEX
-+	select BR2_PACKAGE_BLUEZ_LIBS
++	select BR2_PACKAGE_BLUEZ_UTILS
 +	help
 +	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
 +	  BlueTooth stack.
 +
 +	  http://www.xmailserver.org/ussp-push.html
-+	  http://freshmeat.net/projects/ussp-push/
-Index: buildroot/package/ussp-push/ussp-push.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk	2012-02-21 16:45:03.000000000 +0100
-@@ -0,0 +1,12 @@
+diff --git a/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+new file mode 100644
+index 0000000..0694bfb
+--- /dev/null
++++ b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
+@@ -0,0 +1,15 @@
++Fix build against bluez4.
++
++Signed-off-by: Samuel Martin <s.m...@gm...>
++
++--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
+++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
++@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
++ 	for (i = 0; i < niinf; i++) {
++ 		char devname[128];
++ 
++-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++ 				    devname, 100000) >= 0) {
++ 			if (strcasecmp(devname, btname) == 0) {
++ 				*btaddr = piinf[i].bdaddr;
+diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
+new file mode 100644
+index 0000000..6f322ab
+--- /dev/null
++++ b/package/ussp-push/ussp-push.mk
+@@ -0,0 +1,13 @@
 +#############################################################
 +#
 +# ussp-push
@@ -41,8 +74,12 @@ Index: buildroot/package/ussp-push/ussp-push.mk
 +#############################################################
 +USSP_PUSH_VERSION = 0.11
 +USSP_PUSH_SITE = http://www.xmailserver.org
++USSP_PUSH_LICENSE = GPLv2
++USSP_PUSH_LICENSE_FILES = COPYING
 +
-+USSP_PUSH_DEPENDENCIES = bluez-libs openobex
++USSP_PUSH_DEPENDENCIES = bluez_utils openobex
 +
 +$(eval $(autotools-package))
-+
+-- 
+1.8.0.1
+


hooks/post-receive
-- 
armadeus


