summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane8
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig157
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh50
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch14
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch189
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf13
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc4
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb2
8 files changed, 2 insertions, 435 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane
deleted file mode 100644
index 67c4cbddf8..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane
+++ /dev/null
@@ -1,8 +0,0 @@
1# Useful flags:
2# -i <ifname> Interface (required, unless specified in config)
3# -D <driver> Wireless Driver
4# -d Debugging (-dd for more)
5# -q Quiet (-qq for more)
6
7CONFIG="/etc/wpa_supplicant.conf"
8OPTIONS="-i eth1 -D wext"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
deleted file mode 100644
index c165343399..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
+++ /dev/null
@@ -1,157 +0,0 @@
1# This file lists the configuration options that are used when building the
2# hostapd binary. All lines starting with # are ignored. Configuration option
3# lines must be commented out complete, if they are not to be included, i.e.,
4# just setting VARIABLE=n is not disabling that variable.
5#
6# This file is included in Makefile, so variables like CFLAGS and LIBS can also
7# be modified from here. In most cass, these lines should use += in order not
8# to override previous values of the variables.
9
10CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD
11
12# for wpa_supplicant, wpa_cli
13LIBS = $(TARGET_LDFLAGS)
14
15# for wpa_passphrase:
16LIBS_p = $(TARGET_LDFLAGS)
17
18
19# Uncomment following two lines and fix the paths if you have installed openssl
20# in non-default location
21#CFLAGS += -I/usr/local/openssl/include
22#LIBS += -L/usr/local/openssl/lib
23
24# Example configuration for various cross-compilation platforms
25
26#### sveasoft (e.g., for Linksys WRT54G) ######################################
27#CC=mipsel-uclibc-gcc
28#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
29#CFLAGS += -Os
30#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
31#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
32###############################################################################
33
34#### openwrt (e.g., for Linksys WRT54G) #######################################
35#CC=mipsel-uclibc-gcc
36#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
37#CFLAGS += -Os
38#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
39# -I../WRT54GS/release/src/include
40#LIBS = -lssl
41###############################################################################
42
43
44# Driver interface for Host AP driver
45CONFIG_DRIVER_HOSTAP=y
46
47# Driver interface for Agere driver
48CONFIG_DRIVER_HERMES=y
49
50# Driver interface for madwifi driver
51#CONFIG_DRIVER_MADWIFI=y
52# Change include directories to match with the local setup
53#CFLAGS += -I../madwifi/wpa
54
55# Driver interface for Prism54 driver
56#CONFIG_DRIVER_PRISM54=y
57
58# Driver interface for ndiswrapper
59#CONFIG_DRIVER_NDISWRAPPER=y
60
61# Driver interface for Atmel driver
62#CONFIG_DRIVER_ATMEL=y
63
64# Driver interface for Broadcom driver
65#CONFIG_DRIVER_BROADCOM=y
66# Example path for wlioctl.h; change to match your configuration
67#CFLAGS += -I/opt/WRT54GS/release/src/include
68
69# Driver interface for Intel ipw2100 driver
70#CONFIG_DRIVER_IPW2100=y
71
72# Driver interface for generic Linux wireless extensions
73CONFIG_DRIVER_WEXT=y
74
75# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
76#CONFIG_DRIVER_BSD=y
77#CFLAGS += -I/usr/local/include
78#LIBS += -L/usr/local/lib
79
80# Driver interface for Windows NDIS
81#CONFIG_DRIVER_NDIS=y
82#CFLAGS += -I/usr/include/w32api/ddk
83#LIBS += -L/usr/local/lib
84# For native build using mingw
85#CONFIG_NATIVE_WINDOWS=y
86# Additional directories for cross-compilation on Linux host for mingw target
87#CFLAGS += -I/opt/mingw/mingw32/include/ddk
88#LIBS += -L/opt/mingw/mingw32/lib
89#CC=mingw32-gcc
90
91# Driver interface for development testing
92#CONFIG_DRIVER_TEST=y
93
94# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
95# included)
96CONFIG_IEEE8021X_EAPOL=y
97
98# EAP-MD5 (automatically included if EAP-TTLS is enabled)
99CONFIG_EAP_MD5=y
100
101# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
102CONFIG_EAP_MSCHAPV2=y
103
104# EAP-TLS
105CONFIG_EAP_TLS=y
106
107# EAL-PEAP
108CONFIG_EAP_PEAP=y
109
110# EAP-TTLS
111CONFIG_EAP_TTLS=y
112
113# EAP-GTC
114CONFIG_EAP_GTC=y
115
116# EAP-OTP
117CONFIG_EAP_OTP=y
118
119# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
120#CONFIG_EAP_SIM=y
121
122# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
123#CONFIG_EAP_PSK=y
124
125# LEAP
126CONFIG_EAP_LEAP=y
127
128# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
129#CONFIG_EAP_AKA=y
130
131# PKCS#12 (PFX) support (used to read private key and certificate file from
132# a file that usually has extension .p12 or .pfx)
133CONFIG_PKCS12=y
134
135# PC/SC interface for smartcards (USIM, GSM SIM)
136# Enable this if EAP-SIM or EAP-AKA is included
137#CONFIG_PCSC=y
138
139# Development testing
140#CONFIG_EAPOL_TEST=y
141
142# Replace native Linux implementation of packet sockets with libdnet/libpcap.
143# This will be automatically set for non-Linux OS.
144#CONFIG_DNET_PCAP=y
145
146# Include control interface for external programs, e.g, wpa_cli
147CONFIG_CTRL_IFACE=y
148
149# Include interface for using external supplicant (Xsupplicant) for EAP
150# authentication
151#CONFIG_XSUPPLICANT_IFACE=y
152
153# Include support for GNU Readline and History Libraries in wpa_cli.
154# When building a wpa_cli binary for distribution, please note that these
155# libraries are licensed under GPL and as such, BSD license may not apply for
156# the resulting binary.
157#CONFIG_READLINE=y
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh
deleted file mode 100644
index bc7ee9184e..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh
+++ /dev/null
@@ -1,50 +0,0 @@
1#!/bin/sh
2
3PATH=/sbin:/bin:/usr/sbin:/usr/bin
4
5DAEMON=/usr/sbin/wpa_supplicant
6CONFIG="/etc/wpa_supplicant.conf"
7PNAME="wpa_supplicant"
8
9# insane defaults
10OPTIONS=""
11
12test -f /etc/default/wpa && . /etc/default/wpa
13
14if [ ! -f $CONFIG ]; then
15 echo "No configuration file found, not starting."
16 exit 1
17fi
18
19test -f $DAEMON || exit 0
20
21case "$1" in
22 start)
23 echo -n "Starting wpa_supplicant: "
24 start-stop-daemon -S -b -x $DAEMON -- -Bw -c $CONFIG $OPTIONS >/dev/null
25 echo "done."
26 ;;
27 stop)
28 echo -n "Stopping wpa_supplicant: "
29 start-stop-daemon -K -n $PNAME >/dev/null
30 echo "done."
31 ;;
32 reload|force-reload)
33 echo -n "Reloading wpa_supplicant: "
34 killall -HUP $PNAME
35 echo "done."
36 ;;
37 restart)
38 echo -n "Restarting wpa_supplicant: "
39 start-stop-daemon -K -n $PNAME >/dev/null
40 sleep 1
41 start-stop-daemon -S -b -x $DAEMON -- -Bw -c $CONFIG $OPTIONS >/dev/null
42 echo "done."
43 ;;
44 *)
45 echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
46 exit 1
47 ;;
48esac
49
50exit 0
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
deleted file mode 100644
index 5485d55d23..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
4--- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan 2007-09-25 15:51:35.000000000 -0400
5+++ wpa_supplicant-0.5.7/wpa_supplicant.c 2007-09-25 16:31:27.000000000 -0400
6@@ -972,7 +972,7 @@ static void wpa_supplicant_scan(void *el
7 struct wpa_ssid *ssid;
8 int enabled, scan_req = 0, ret;
9
10- if (wpa_s->disconnected)
11+ if (wpa_s->disconnected && !wpa_s->scan_req)
12 return;
13
14 enabled = 0;
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
deleted file mode 100644
index a1898c3887..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
+++ /dev/null
@@ -1,189 +0,0 @@
1Upstream-Status: Inappropriate [not used]
2
3--- dbus_dict_helpers.c.array-fix 2006-12-18 12:31:11.000000000 -0500
4+++ dbus_dict_helpers.c 2006-12-20 03:17:08.000000000 -0500
5@@ -629,36 +629,55 @@ dbus_bool_t wpa_dbus_dict_open_read(DBus
6 }
7
8
9+#define BYTE_ARRAY_CHUNK_SIZE 34
10+#define BYTE_ARRAY_ITEM_SIZE (sizeof (char))
11+
12 static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array(
13- DBusMessageIter *iter, int array_len, int array_type,
14+ DBusMessageIter *iter, int array_type,
15 struct wpa_dbus_dict_entry *entry)
16 {
17- dbus_uint32_t i = 0;
18+ dbus_uint32_t count = 0;
19 dbus_bool_t success = FALSE;
20- char byte;
21+ char * buffer;
22
23- /* Zero-length arrays are valid. */
24- if (array_len == 0) {
25- entry->bytearray_value = NULL;
26- entry->array_type = DBUS_TYPE_BYTE;
27- success = TRUE;
28- goto done;
29- }
30+ entry->bytearray_value = NULL;
31+ entry->array_type = DBUS_TYPE_BYTE;
32
33- entry->bytearray_value = wpa_zalloc(array_len * sizeof(char));
34- if (!entry->bytearray_value) {
35+ buffer = wpa_zalloc(BYTE_ARRAY_ITEM_SIZE * BYTE_ARRAY_CHUNK_SIZE);
36+ if (!buffer) {
37 perror("_wpa_dbus_dict_entry_get_byte_array[dbus]: out of "
38 "memory");
39 goto done;
40 }
41
42- entry->array_type = DBUS_TYPE_BYTE;
43- entry->array_len = array_len;
44+ entry->bytearray_value = buffer;
45+ entry->array_len = 0;
46 while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_BYTE) {
47+ char byte;
48+
49+ if ((count % BYTE_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
50+ buffer = realloc(buffer, BYTE_ARRAY_ITEM_SIZE * (count + BYTE_ARRAY_CHUNK_SIZE));
51+ if (buffer == NULL) {
52+ perror("_wpa_dbus_dict_entry_get_byte_array["
53+ "dbus] out of memory trying to "
54+ "retrieve the string array");
55+ goto done;
56+ }
57+ }
58+ entry->bytearray_value = buffer;
59+
60 dbus_message_iter_get_basic(iter, &byte);
61- entry->bytearray_value[i++] = byte;
62+ entry->bytearray_value[count] = byte;
63+ entry->array_len = ++count;
64 dbus_message_iter_next(iter);
65 }
66+
67+ /* Zero-length arrays are valid. */
68+ if (entry->array_len == 0) {
69+ free(entry->bytearray_value);
70+ entry->strarray_value = NULL;
71+ }
72+
73 success = TRUE;
74
75 done:
76@@ -666,8 +685,11 @@ done:
77 }
78
79
80+#define STR_ARRAY_CHUNK_SIZE 8
81+#define STR_ARRAY_ITEM_SIZE (sizeof (char *))
82+
83 static dbus_bool_t _wpa_dbus_dict_entry_get_string_array(
84- DBusMessageIter *iter, int array_len, int array_type,
85+ DBusMessageIter *iter, int array_type,
86 struct wpa_dbus_dict_entry *entry)
87 {
88 dbus_uint32_t count = 0;
89@@ -677,13 +699,7 @@ static dbus_bool_t _wpa_dbus_dict_entry_
90 entry->strarray_value = NULL;
91 entry->array_type = DBUS_TYPE_STRING;
92
93- /* Zero-length arrays are valid. */
94- if (array_len == 0) {
95- success = TRUE;
96- goto done;
97- }
98-
99- buffer = wpa_zalloc(sizeof (char *) * 8);
100+ buffer = wpa_zalloc(STR_ARRAY_ITEM_SIZE * STR_ARRAY_CHUNK_SIZE);
101 if (buffer == NULL) {
102 perror("_wpa_dbus_dict_entry_get_string_array[dbus] out of "
103 "memory trying to retrieve a string array");
104@@ -696,18 +712,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
105 const char *value;
106 char *str;
107
108- if ((count % 8) == 0 && count != 0) {
109- char **tmp;
110- tmp = realloc(buffer, sizeof(char *) * (count + 8));
111- if (tmp == NULL) {
112+ if ((count % STR_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
113+ buffer = realloc(buffer, STR_ARRAY_ITEM_SIZE * (count + STR_ARRAY_CHUNK_SIZE));
114+ if (buffer == NULL) {
115 perror("_wpa_dbus_dict_entry_get_string_array["
116 "dbus] out of memory trying to "
117 "retrieve the string array");
118- free(buffer);
119- buffer = NULL;
120 goto done;
121 }
122- buffer = tmp;
123 }
124 entry->strarray_value = buffer;
125
126@@ -723,6 +735,13 @@ static dbus_bool_t _wpa_dbus_dict_entry_
127 entry->array_len = ++count;
128 dbus_message_iter_next(iter);
129 }
130+
131+ /* Zero-length arrays are valid. */
132+ if (entry->array_len == 0) {
133+ free(entry->strarray_value);
134+ entry->strarray_value = NULL;
135+ }
136+
137 success = TRUE;
138
139 done:
140@@ -734,7 +753,6 @@ static dbus_bool_t _wpa_dbus_dict_entry_
141 DBusMessageIter *iter_dict_val, struct wpa_dbus_dict_entry *entry)
142 {
143 int array_type = dbus_message_iter_get_element_type(iter_dict_val);
144- int array_len;
145 dbus_bool_t success = FALSE;
146 DBusMessageIter iter_array;
147
148@@ -743,20 +761,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
149
150 dbus_message_iter_recurse(iter_dict_val, &iter_array);
151
152- array_len = dbus_message_iter_get_array_len(&iter_array);
153- if (array_len < 0)
154- return FALSE;
155-
156 switch (array_type) {
157 case DBUS_TYPE_BYTE:
158 success = _wpa_dbus_dict_entry_get_byte_array(&iter_array,
159- array_len,
160 array_type,
161 entry);
162 break;
163 case DBUS_TYPE_STRING:
164 success = _wpa_dbus_dict_entry_get_string_array(&iter_array,
165- array_len,
166 array_type,
167 entry);
168 break;
169@@ -943,9 +955,17 @@ void wpa_dbus_dict_entry_clear(struct wp
170 break;
171 case DBUS_TYPE_ARRAY:
172 switch (entry->array_type) {
173- case DBUS_TYPE_BYTE:
174- free(entry->bytearray_value);
175- break;
176+ case DBUS_TYPE_BYTE: {
177+ free(entry->bytearray_value);
178+ break;
179+ }
180+ case DBUS_TYPE_STRING: {
181+ int i;
182+ for (i = 0; i < entry->array_len; i++)
183+ free (entry->strarray_value[i]);
184+ free (entry->strarray_value);
185+ break;
186+ }
187 }
188 break;
189 }
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf
deleted file mode 100644
index 8eebdeb5cb..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf
+++ /dev/null
@@ -1,13 +0,0 @@
1# This is a basic configuration for WPA with pre-shared keys (WPA-PSK)
2
3ctrl_interface=/var/run/wpa_supplicant
4ctrl_interface_group=0
5eapol_version=1
6ap_scan=1
7network={
8 ssid="YOUR_SSID"
9 psk="YOUR WPA PASSWORD IN HEX OR ASCII"
10 key_mgmt=WPA-PSK
11 pairwise=CCMP
12 priority=5
13}
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index 539ab8c19a..d92acaca93 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -11,7 +11,6 @@ RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
12SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ 12SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
13 file://defconfig-gnutls \ 13 file://defconfig-gnutls \
14 file://defaults-sane \
15 file://wpa-supplicant.sh \ 14 file://wpa-supplicant.sh \
16 file://wpa_supplicant.conf \ 15 file://wpa_supplicant.conf \
17 file://wpa_supplicant.conf-sane \ 16 file://wpa_supplicant.conf-sane \
@@ -43,8 +42,7 @@ do_install () {
43 install -d ${D}${docdir}/wpa_supplicant 42 install -d ${D}${docdir}/wpa_supplicant
44 install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant 43 install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
45 44
46 install -d ${D}${sysconfdir}/default 45 install -d ${D}${sysconfdir}
47 install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
48 install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf 46 install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
49 47
50 install -d ${D}${sysconfdir}/network/if-pre-up.d/ 48 install -d ${D}${sysconfdir}/network/if-pre-up.d/
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index c607fadee3..94c88baf97 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
1require wpa-supplicant-0.7.inc 1require wpa-supplicant-0.7.inc
2 2
3PR = "r7" 3PR = "r8"
4 4
5SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" 5SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
6SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443" 6SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 05:30:17 +0000