summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-09-07 08:09:16 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-09-07 08:09:16 +0000
commitce9b85c5027e861aae4905531ef8b63203f966ec (patch)
treeb41eb2e6ef7e1950ce3f3ffc5390b13b5adb9277 /meta
parent2121a09d78e31f15daeedbb89b2789d7e50dd1c3 (diff)
downloadpoky-ce9b85c5027e861aae4905531ef8b63203f966ec.tar.gz
bluez: dropped old bluez-utils-dbus patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2705 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch53
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/dbus.patch58
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch42
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/hcid.conf72
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/smash.patch11
5 files changed, 0 insertions, 236 deletions
diff --git a/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch b/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
deleted file mode 100644
index d8ec946a0b..0000000000
--- a/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1--- bluez-utils-2.24/acinclude.m4.orig 2006-01-12 08:21:38.000000000 +0100
2+++ bluez-utils-2.24/acinclude.m4 2006-01-12 08:23:18.000000000 +0100
3@@ -131,46 +131,15 @@
4 ])
5
6 AC_DEFUN([AC_PATH_DBUS], [
7- dbus_prefix=${prefix}
8-
9- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
10- if (test "${withval}" != "yes"); then
11- dbus_prefix=${withval}
12- fi
13- ])
14-
15- ac_save_CPPFLAGS=$CPPFLAGS
16- ac_save_LDFLAGS=$LDFLAGS
17-
18- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
19- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
20- if (test "${prefix}" = "${bluez_prefix}"); then
21- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
22- else
23- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
24- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
25- fi
26+ if pkg-config --exists dbus-1; then
27+ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
28+ DBUS_LIBS="`pkg-config --libs dbus-1`"
29
30 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
31- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
32-
33- DBUS_LIBS=""
34- if (test "${prefix}" = "${dbus_prefix}"); then
35- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
36- else
37- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
38- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
39- fi
40-
41 LDFLAGS="$LDFLAGS $DBUS_LIBS"
42- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
43- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, dummy=yes, dbus_found=no)
44-
45- CPPFLAGS=$ac_save_CPPFLAGS
46- LDFLAGS=$ac_save_LDFLAGS
47-
48 AC_SUBST(DBUS_CFLAGS)
49 AC_SUBST(DBUS_LIBS)
50+ fi
51 ])
52
53 AC_DEFUN([AC_PATH_FUSE], [
diff --git a/meta/packages/bluez/bluez-utils-dbus/dbus.patch b/meta/packages/bluez/bluez-utils-dbus/dbus.patch
deleted file mode 100644
index c5ab129469..0000000000
--- a/meta/packages/bluez/bluez-utils-dbus/dbus.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- bluez-utils-2.20/acinclude.m4~dbus.patch
7+++ bluez-utils-2.20/acinclude.m4
8@@ -211,46 +211,15 @@
9 ])
10
11 AC_DEFUN([AC_PATH_DBUS], [
12- dbus_prefix=${prefix}
13-
14- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
15- if (test "${withval}" != "yes"); then
16- dbus_prefix=${withval}
17- fi
18- ])
19-
20- ac_save_CPPFLAGS=$CPPFLAGS
21- ac_save_LDFLAGS=$LDFLAGS
22-
23- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
24- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
25- if (test "${prefix}" = "${bluez_prefix}"); then
26- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
27- else
28- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
29- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
30- fi
31+ if pkg-config --exists dbus-1; then
32+ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
33+ DBUS_LIBS="`pkg-config --libs dbus-1`"
34
35 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
36- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
37-
38- DBUS_LIBS=""
39- if (test "${prefix}" = "${dbus_prefix}"); then
40- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
41- else
42- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
43- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
44- fi
45-
46 LDFLAGS="$LDFLAGS $DBUS_LIBS"
47- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
48- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_GET_BASIC, 1, [Define to 1 if you have the dbus_message_iter_get_basic() function.]))
49-
50- CPPFLAGS=$ac_save_CPPFLAGS
51- LDFLAGS=$ac_save_LDFLAGS
52-
53 AC_SUBST(DBUS_CFLAGS)
54 AC_SUBST(DBUS_LIBS)
55+ fi
56 ])
57
58 AC_DEFUN([AC_ARG_BLUEZ], [
diff --git a/meta/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch b/meta/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch
deleted file mode 100644
index 276281c14e..0000000000
--- a/meta/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1--- bluez-utils-2.20/hcid/dbus.c.orig 2005-09-21 11:27:26 +0200
2+++ bluez-utils-2.20/hcid/dbus.c 2005-09-21 11:27:35 +0200
3@@ -120,6 +121,7 @@
4 DBusMessage *message;
5 #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
6 uint8_t *addr = (uint8_t *) &ci->bdaddr;
7+ uint32_t ci_out = ci->out;
8 #else
9 DBusMessageIter iter;
10 #endif
11@@ -138,7 +140,7 @@
12 bacpy(&req->bda, &ci->bdaddr);
13
14 #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
15- dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
16+ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci_out,
17 DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
18 &addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
19 #else
20@@ -261,6 +263,8 @@
21 DBusMessage *message;
22 #ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
23 DBusMessageIter iter;
24+#else
25+ int32_t tmp_rssi = rssi;
26 #endif
27 char *local_addr, *peer_addr;
28 bdaddr_t tmp;
29@@ -276,11 +280,12 @@
30 }
31
32 #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
33+
34 dbus_message_append_args(message,
35 DBUS_TYPE_STRING, &local_addr,
36 DBUS_TYPE_STRING, &peer_addr,
37 DBUS_TYPE_UINT32, &class,
38- DBUS_TYPE_INT32, &rssi,
39+ DBUS_TYPE_INT32, &tmp_rssi,
40 DBUS_TYPE_INVALID);
41 #else
42 dbus_message_append_iter_init(message, &iter);
diff --git a/meta/packages/bluez/bluez-utils-dbus/hcid.conf b/meta/packages/bluez/bluez-utils-dbus/hcid.conf
deleted file mode 100644
index ab3ca2aaee..0000000000
--- a/meta/packages/bluez/bluez-utils-dbus/hcid.conf
+++ /dev/null
@@ -1,72 +0,0 @@
1#
2# HCI daemon configuration file.
3#
4# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
5#
6
7# HCId options
8options {
9 # Automatically initialize new devices
10 autoinit yes;
11
12 # Security Manager mode
13 # none - Security manager disabled
14 # auto - Use local PIN for incoming connections
15 # user - Always ask user for a PIN
16 #
17 security auto;
18
19 # Pairing mode
20 # none - Pairing disabled
21 # multi - Allow pairing with already paired devices
22 # once - Pair once and deny successive attempts
23 pairing multi;
24
25 # PIN helper
26 # pin_helper /usr/bin/bluepin;
27
28 # D-Bus PIN helper
29 dbus_pin_helper;
30}
31
32# Default settings for HCI devices
33device {
34 # Local device name
35 # %d - device id
36 # %h - host name
37 name "%h";
38
39 # Local device class
40 class 0x120112;
41
42 # Default packet type
43 #pkt_type DH1,DM1,HV1;
44
45 # Inquiry and Page scan
46 iscan enable; pscan enable;
47
48 # Default link mode
49 # none - no specific policy
50 # accept - always accept incoming connections
51 # master - become master on incoming connections,
52 # deny role switch on outgoing connections
53 #
54 #lm accept,master;
55 #
56 lm accept;
57
58 # Default link policy
59 # none - no specific policy
60 # rswitch - allow role switch
61 # hold - allow hold mode
62 # sniff - allow sniff mode
63 # park - allow park mode
64 #
65 #lp hold,sniff;
66 #
67 lp rswitch,hold,sniff,park;
68
69 # Authentication and Encryption
70 #auth enable;
71 encrypt enable;
72}
diff --git a/meta/packages/bluez/bluez-utils-dbus/smash.patch b/meta/packages/bluez/bluez-utils-dbus/smash.patch
deleted file mode 100644
index 55cdbb7284..0000000000
--- a/meta/packages/bluez/bluez-utils-dbus/smash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- bluez-utils-2.11/hcid/dbus.c.old 2004-12-31 16:35:12.000000000 +0000
2+++ bluez-utils-2.11/hcid/dbus.c 2004-12-31 16:39:58.000000000 +0000
3@@ -89,6 +89,8 @@
4
5 memset(&pr, 0, sizeof(pr));
6 bacpy(&pr.bdaddr, &req->bda);
7+ if (len > sizeof (pr.pin_code))
8+ goto error;
9 memcpy(pr.pin_code, pin, len);
10 pr.pin_len = len;
11 hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 07:00:53 +0000