fix compile errors on OpenBSD host

update bluez package to latest upstream.
disable aufs2-util on OpenBSD host.

4 files changed, 41 insertions, 7 deletions

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 2d8c14735..d5b1bc48c 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.57
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		dc29e54f1204ac4215caeeee062b26f6
+PKG_VERSION:=		4.59
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c7cee215bc84656b1edee019cee78f5
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		kmod-bluetooth libusb glib dbus
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
new file mode 100644
index 000000000..4334402d7
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- bluez-4.59.orig/Makefile.in	Thu Dec 24 17:42:48 2009
++++ bluez-4.59/Makefile.in	Tue Dec 29 01:31:12 2009
+@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am
+ 	$(am__EXEEXT_10) $(am__EXEEXT_11)
+ @SBC_TRUE@am__append_1 = sbc/libsbc.la
+ @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
+ @NETLINK_TRUE@am__append_4 = plugins/netlink.la
+ @ECHOPLUGIN_TRUE@am__append_5 = echo
+ @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
+@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(
+ @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
+ @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
+ @SBC_TRUE@	sbc/sbcenc$(EXEEXT)
+-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT)
+ @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
+ @TOOLS_TRUE@	tools/hcieventmask$(EXEEXT) \
+ @TOOLS_TRUE@	tools/hcisecfilter$(EXEEXT)
+@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+ @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
+ @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
+ @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
+ @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@
+ @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
+ @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
new file mode 100644
index 000000000..0ff2c0ef3
--- /dev/null
+++ b/package/bluez/patches/patch-scripts_bluetooth_rules
@@ -0,0 +1,7 @@
+--- bluez-4.59.orig/scripts/bluetooth.rules	Thu Dec 24 17:43:09 2009
++++ bluez-4.59/scripts/bluetooth.rules	Tue Dec 29 01:26:46 2009
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index ae8f70f57..e5a84de4f 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bluez-4.12.orig/tools/hciattach.c	2008-08-05 23:14:56.000000000 +0200
-+++ bluez-4.12/tools/hciattach.c	2009-05-12 18:14:29.000000000 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-4.59.orig/tools/hciattach.c	Tue May 19 11:04:10 2009
++++ bluez-4.59/tools/hciattach.c	Tue Dec 29 01:26:35 2009
+@@ -100,6 +100,7 @@ static int uart_speed(int s)
  		return B57600;
  	case 115200:
  		return B115200;
@@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	case 230400:
  		return B230400;
  	case 460800:
-@@ -125,6 +126,7 @@ static int uart_speed(int s)
+@@ -118,6 +119,7 @@ static int uart_speed(int s)
  		return B1500000;
  	case 2000000:
  		return B2000000;