rpm/wpa_supplicant
SHA256
1
0
Fork 0
forked from pool/wpa_supplicant
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wpa_supplicant?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2008-08-04 11:02:45 +00:00 committed by Git OBS Bridge
parent abfb8878f4
commit 4a9425723c
11 changed files with 71 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wpa_supplicant-0.5.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e9c0019227d15087f2808df242fe8f69ab42c1ffacd321945c7f31d74779467
size 566760

3
wpa_supplicant-0.6.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8342a394f67d2690311fede0518b6b311b422d5a7bfb783936f14b362757896c
size 738030

16
wpa_supplicant-assoc-timeout.patch
View File

@ -1,16 +0,0 @@
Index: wpa_supplicant-0.5.8/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
+++ wpa_supplicant-0.5.8/wpa_supplicant.c
@@ -1513,9 +1513,9 @@ void wpa_supplicant_associate(struct wpa
/* Timeout for IEEE 802.11 authentication and association */
int timeout;
if (assoc_failed)
- timeout = 5;
+ timeout = 15;
else if (wpa_s->conf->ap_scan == 1)
- timeout = 10;
+ timeout = 15;
else
timeout = 60;
wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);

9
wpa_supplicant-dbus-iface-segfault-fix.patch
View File

@ -1,8 +1,7 @@
Index: wpa_supplicant-0.5.8/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
+++ wpa_supplicant-0.5.8/wpa_supplicant.c
@@ -2363,7 +2363,8 @@ static void wpa_supplicant_deinit_iface(
diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:40.000000000 +0200
+++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:24.000000000 +0200
@@ -1818,7 +1818,8 @@
wpa_clear_keys(wpa_s, NULL);
}

17
wpa_supplicant-driver-wext-debug.patch
View File

@ -1,8 +1,7 @@
Index: wpa_supplicant-0.5.8/driver_wext.c
===================================================================
--- wpa_supplicant-0.5.8.orig/driver_wext.c
+++ wpa_supplicant-0.5.8/driver_wext.c
@@ -1803,20 +1803,32 @@ wpa_driver_wext_associate(void *priv,
diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c
--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-02-23 03:45:24.000000000 +0100
+++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:20:37.000000000 +0200
@@ -2069,20 +2069,32 @@
*/
if (drv->auth_alg_fallback &&
wpa_driver_wext_auth_alg_fallback(drv, params) < 0)
@ -34,8 +33,8 @@ Index: wpa_supplicant-0.5.8/driver_wext.c
+}
if (params->wpa_ie == NULL || params->wpa_ie_len == 0)
value = IW_AUTH_WPA_VERSION_DISABLED;
else if (params->wpa_ie[0] == RSN_INFO_ELEM)
@@ -1825,26 +1837,41 @@ wpa_driver_wext_associate(void *priv,
else if (params->wpa_ie[0] == WLAN_EID_RSN)
@@ -2091,26 +2103,41 @@
value = IW_AUTH_WPA_VERSION_WPA;
if (wpa_driver_wext_set_auth_param(drv,
IW_AUTH_WPA_VERSION, value) < 0)
@ -77,7 +76,7 @@ Index: wpa_supplicant-0.5.8/driver_wext.c
/* Allow unencrypted EAPOL messages even if pairwise keys are set when
* not using WPA. IEEE 802.1X specifies that these frames are not
@@ -1858,14 +1885,26 @@ wpa_driver_wext_associate(void *priv,
@@ -2124,14 +2151,26 @@
if (wpa_driver_wext_set_auth_param(drv,
IW_AUTH_RX_UNENCRYPTED_EAPOL,
allow_unencrypted_eapol) < 0)
@ -104,7 +103,7 @@ Index: wpa_supplicant-0.5.8/driver_wext.c
return ret;
}
@@ -1890,6 +1929,8 @@ static int wpa_driver_wext_set_auth_alg(
@@ -2156,6 +2195,8 @@
res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG,
algs);
drv->auth_alg_fallback = res == -2;

7
wpa_supplicant-errormsg.patch
View File

@ -1,6 +1,7 @@
--- driver_wext.c
+++ driver_wext.c
@@ -154,10 +154,12 @@ static int wpa_driver_wext_set_auth_para
diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c
--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:26.000000000 +0200
+++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:11.000000000 +0200
@@ -251,10 +251,12 @@
iwr.u.param.value = value;
if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) {

189
wpa_supplicant-fix-deprecated-dbus-function.patch
View File

@ -1,189 +0,0 @@
Index: wpa_supplicant-0.5.8/dbus_dict_helpers.c
===================================================================
--- wpa_supplicant-0.5.8.orig/dbus_dict_helpers.c
+++ wpa_supplicant-0.5.8/dbus_dict_helpers.c
@@ -629,36 +629,55 @@ dbus_bool_t wpa_dbus_dict_open_read(DBus
}
+#define BYTE_ARRAY_CHUNK_SIZE 34
+#define BYTE_ARRAY_ITEM_SIZE (sizeof (char))
+
static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array(
- DBusMessageIter *iter, int array_len, int array_type,
+ DBusMessageIter *iter, int array_type,
struct wpa_dbus_dict_entry *entry)
{
- dbus_uint32_t i = 0;
+ dbus_uint32_t count = 0;
dbus_bool_t success = FALSE;
- char byte;
+ char * buffer;
- /* Zero-length arrays are valid. */
- if (array_len == 0) {
- entry->bytearray_value = NULL;
- entry->array_type = DBUS_TYPE_BYTE;
- success = TRUE;
- goto done;
- }
+ entry->bytearray_value = NULL;
+ entry->array_type = DBUS_TYPE_BYTE;
- entry->bytearray_value = wpa_zalloc(array_len * sizeof(char));
- if (!entry->bytearray_value) {
+ buffer = wpa_zalloc(BYTE_ARRAY_ITEM_SIZE * BYTE_ARRAY_CHUNK_SIZE);
+ if (!buffer) {
perror("_wpa_dbus_dict_entry_get_byte_array[dbus]: out of "
"memory");
goto done;
}
- entry->array_type = DBUS_TYPE_BYTE;
- entry->array_len = array_len;
+ entry->bytearray_value = buffer;
+ entry->array_len = 0;
while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_BYTE) {
+ char byte;
+
+ if ((count % BYTE_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
+ buffer = realloc(buffer, BYTE_ARRAY_ITEM_SIZE * (count + BYTE_ARRAY_CHUNK_SIZE));
+ if (buffer == NULL) {
+ perror("_wpa_dbus_dict_entry_get_byte_array["
+ "dbus] out of memory trying to "
+ "retrieve the string array");
+ goto done;
+ }
+ }
+ entry->bytearray_value = buffer;
+
dbus_message_iter_get_basic(iter, &byte);
- entry->bytearray_value[i++] = byte;
+ entry->bytearray_value[count] = byte;
+ entry->array_len = ++count;
dbus_message_iter_next(iter);
}
+
+ /* Zero-length arrays are valid. */
+ if (entry->array_len == 0) {
+ free(entry->bytearray_value);
+ entry->strarray_value = NULL;
+ }
+
success = TRUE;
done:
@@ -666,8 +685,11 @@ done:
}
+#define STR_ARRAY_CHUNK_SIZE 8
+#define STR_ARRAY_ITEM_SIZE (sizeof (char *))
+
static dbus_bool_t _wpa_dbus_dict_entry_get_string_array(
- DBusMessageIter *iter, int array_len, int array_type,
+ DBusMessageIter *iter, int array_type,
struct wpa_dbus_dict_entry *entry)
{
dbus_uint32_t count = 0;
@@ -677,13 +699,7 @@ static dbus_bool_t _wpa_dbus_dict_entry_
entry->strarray_value = NULL;
entry->array_type = DBUS_TYPE_STRING;
- /* Zero-length arrays are valid. */
- if (array_len == 0) {
- success = TRUE;
- goto done;
- }
-
- buffer = wpa_zalloc(sizeof (char *) * 8);
+ buffer = wpa_zalloc(STR_ARRAY_ITEM_SIZE * STR_ARRAY_CHUNK_SIZE);
if (buffer == NULL) {
perror("_wpa_dbus_dict_entry_get_string_array[dbus] out of "
"memory trying to retrieve a string array");
@@ -696,18 +712,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
const char *value;
char *str;
- if ((count % 8) == 0 && count != 0) {
- char **tmp;
- tmp = realloc(buffer, sizeof(char *) * (count + 8));
- if (tmp == NULL) {
+ if ((count % STR_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
+ buffer = realloc(buffer, STR_ARRAY_ITEM_SIZE * (count + STR_ARRAY_CHUNK_SIZE));
+ if (buffer == NULL) {
perror("_wpa_dbus_dict_entry_get_string_array["
"dbus] out of memory trying to "
"retrieve the string array");
- free(buffer);
- buffer = NULL;
goto done;
}
- buffer = tmp;
}
entry->strarray_value = buffer;
@@ -723,6 +735,13 @@ static dbus_bool_t _wpa_dbus_dict_entry_
entry->array_len = ++count;
dbus_message_iter_next(iter);
}
+
+ /* Zero-length arrays are valid. */
+ if (entry->array_len == 0) {
+ free(entry->strarray_value);
+ entry->strarray_value = NULL;
+ }
+
success = TRUE;
done:
@@ -734,7 +753,6 @@ static dbus_bool_t _wpa_dbus_dict_entry_
DBusMessageIter *iter_dict_val, struct wpa_dbus_dict_entry *entry)
{
int array_type = dbus_message_iter_get_element_type(iter_dict_val);
- int array_len;
dbus_bool_t success = FALSE;
DBusMessageIter iter_array;
@@ -743,20 +761,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
dbus_message_iter_recurse(iter_dict_val, &iter_array);
- array_len = dbus_message_iter_get_array_len(&iter_array);
- if (array_len < 0)
- return FALSE;
-
switch (array_type) {
case DBUS_TYPE_BYTE:
success = _wpa_dbus_dict_entry_get_byte_array(&iter_array,
- array_len,
array_type,
entry);
break;
case DBUS_TYPE_STRING:
success = _wpa_dbus_dict_entry_get_string_array(&iter_array,
- array_len,
array_type,
entry);
break;
@@ -946,9 +958,17 @@ void wpa_dbus_dict_entry_clear(struct wp
break;
case DBUS_TYPE_ARRAY:
switch (entry->array_type) {
- case DBUS_TYPE_BYTE:
- free(entry->bytearray_value);
- break;
+ case DBUS_TYPE_BYTE: {
+ free(entry->bytearray_value);
+ break;
+ }
+ case DBUS_TYPE_STRING: {
+ int i;
+ for (i = 0; i < entry->array_len; i++)
+ free (entry->strarray_value[i]);
+ free (entry->strarray_value);
+ break;
+ }
}
break;
}

17
wpa_supplicant-flush-debug-output.patch
View File

@ -1,8 +1,7 @@
Index: wpa_supplicant-0.5.8/common.c
===================================================================
--- wpa_supplicant-0.5.8.orig/common.c
+++ wpa_supplicant-0.5.8/common.c
@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void)
diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c
--- BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-02-23 03:45:24.000000000 +0100
+++ BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-08-04 11:39:05.000000000 +0200
@@ -39,6 +39,7 @@
if (out_file) {
fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
(unsigned int) tv.usec);
@ -10,7 +9,7 @@ Index: wpa_supplicant-0.5.8/common.c
} else
#endif /* CONFIG_DEBUG_FILE */
printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec);
@@ -185,6 +186,7 @@ void wpa_printf(int level, char *fmt, ..
@@ -67,6 +68,7 @@
if (out_file) {
vfprintf(out_file, fmt, ap);
fprintf(out_file, "\n");
@ -18,7 +17,7 @@ Index: wpa_supplicant-0.5.8/common.c
} else {
#endif /* CONFIG_DEBUG_FILE */
vprintf(fmt, ap);
@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons
@@ -99,6 +101,7 @@
fprintf(out_file, " [REMOVED]");
}
fprintf(out_file, "\n");
@ -26,7 +25,7 @@ Index: wpa_supplicant-0.5.8/common.c
} else {
#endif /* CONFIG_DEBUG_FILE */
printf("%s - hexdump(len=%lu):", title, (unsigned long) len);
@@ -262,12 +265,14 @@ static void _wpa_hexdump_ascii(int level
@@ -144,12 +147,14 @@
fprintf(out_file,
"%s - hexdump_ascii(len=%lu): [REMOVED]\n",
title, (unsigned long) len);
@ -41,7 +40,7 @@ Index: wpa_supplicant-0.5.8/common.c
return;
}
fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level
@@ -174,6 +179,7 @@
pos += llen;
len -= llen;
}

21
wpa_supplicant-sigusr1-changes-debuglevel.patch
View File

@ -1,11 +1,10 @@
Index: wpa_supplicant-0.5.8/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
+++ wpa_supplicant-0.5.8/wpa_supplicant.c
@@ -931,6 +931,24 @@ static void wpa_supplicant_reconfig(int
diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-02-23 03:45:24.000000000 +0100
+++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:43:25.000000000 +0200
@@ -133,6 +133,22 @@
return set;
}
+static void wpa_supplicant_handle_sigusr1(int sig, void *eloop_ctx,
+ void *signal_ctx)
+{
@ -22,12 +21,10 @@ Index: wpa_supplicant-0.5.8/wpa_supplicant.c
+ ((wpa_debug_level == MSG_DEBUG) ? "DEBUG" :
+ ((wpa_debug_level == MSG_MSGDUMP) ? "MSGDUMP" : "UNKNOWN")));
+}
+
+
static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid;
@@ -2570,6 +2588,8 @@ int wpa_supplicant_run(struct wpa_global
static int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
@@ -2016,6 +2032,8 @@
eloop_register_signal_terminate(wpa_supplicant_terminate, NULL);
eloop_register_signal_reconfig(wpa_supplicant_reconfig, NULL);

7
wpa_supplicant.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 4 12:33:10 CEST 2008 - hschaa@suse.de
- Remove patches that are already upstream
- Rebase patches to new version
- Update to 0.6.3
-------------------------------------------------------------------
Mon May 5 09:52:45 CEST 2008 - schwab@suse.de

55
wpa_supplicant.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package wpa_supplicant (Version 0.5.10)
# spec file for package wpa_supplicant (Version 0.6.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -17,8 +17,8 @@ BuildRequires: dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readli
BuildRequires: madwifi-devel
%endif
Url: http://hostap.epitest.fi/wpa_supplicant/
Version: 0.5.10
Release: 26
Version: 0.6.3
Release: 1
License: BSD 3-Clause; GPL v2 or later
Group: Productivity/Networking/Other
Summary: WPA supplicant implementation
@ -26,13 +26,11 @@ Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.
Source1: config
Source2: %{name}.conf
Source3: fi.epitest.hostap.WPASupplicant.service
Patch0: wpa_supplicant-assoc-timeout.patch
Patch1: wpa_supplicant-driver-wext-debug.patch
Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch
Patch5: wpa_supplicant-flush-debug-output.patch
Patch6: wpa_supplicant-sigusr1-changes-debuglevel.patch
Patch8: wpa_supplicant-dbus-iface-segfault-fix.patch
Patch9: wpa_supplicant-errormsg.patch
Patch0: wpa_supplicant-driver-wext-debug.patch
Patch1: wpa_supplicant-flush-debug-output.patch
Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch
Patch3: wpa_supplicant-dbus-iface-segfault-fix.patch
Patch4: wpa_supplicant-errormsg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -65,18 +63,17 @@ Authors:
%prep
%setup -n wpa_supplicant-%{version}
cp %{SOURCE1} .config
%patch0 -p1
%patch1 -p1
%patch3 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch9
cp %{SOURCE1} wpa_supplicant/.config
%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2
%patch4 -p2
%build
cd wpa_supplicant
%ifarch %ix86 x86_64
echo CONFIG_DRIVER_MADWIFI=y >>.config
echo CONFIG_DRIVER_MADWIFI=y >> .config
echo "CFLAGS += -I/usr/include/madwifi" >> .config
%endif
CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs}
@ -86,24 +83,24 @@ make %{?jobs:-j%jobs}
%install
install -d %{buildroot}/%{_sbindir}
install -m 0755 wpa_cli %{buildroot}%{_sbindir}
install -m 0755 wpa_passphrase %{buildroot}%{_sbindir}
install -m 0755 wpa_supplicant %{buildroot}%{_sbindir}
install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir}
install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir}
install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir}
install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d
install -m 0644 dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
install -m 0644 wpa_supplicant/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
install -d %{buildroot}/%{_sysconfdir}/%{name}
install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_datadir}/dbus-1/system-services
install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services
install -d %{buildroot}/%{_localstatedir}/run/%{name}
install -d %{buildroot}%{_mandir}/man{5,8}
install -m 0644 doc/docbook/*.8 %{buildroot}%{_mandir}/man8
install -m 0644 doc/docbook/*.5 %{buildroot}%{_mandir}/man5
install -m 755 wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
%files
%defattr(-,root,root)
%doc ChangeLog COPYING README todo.txt doc/wpa_supplicant.fig examples wpa_supplicant.conf
%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/doc/wpa_supplicant.fig wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
%{_sbindir}/wpa_cli
%{_sbindir}/wpa_passphrase
%{_sbindir}/wpa_supplicant
@ -120,6 +117,10 @@ install -m 755 wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
/usr/sbin/wpa_gui
%changelog
* Mon Aug 04 2008 hschaa@suse.de
- Remove patches that are already upstream
- Rebase patches to new version
- Update to 0.6.3
* Mon May 05 2008 schwab@suse.de
- Fix mangled error message.
* Mon Mar 17 2008 hschaa@suse.de