OBS User unknown 2007-03-13 00:07:10 +00:00 committed by Git OBS Bridge
parent 8fc165dcc0
commit 1e94cd466d
9 changed files with 20 additions and 189 deletions

View File

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

View File

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

View File

@ -1,31 +0,0 @@
--- ctrl_iface.c.orig 2005-11-07 23:12:50.000000000 -0500
+++ ctrl_iface.c 2006-01-09 11:26:55.000000000 -0500
@@ -930,6 +930,18 @@
}
+static int wpa_supplicant_ctrl_iface_ap_scan(struct wpa_supplicant *wpa_s,
+ char *cmd)
+{
+ int ap_scan = atoi (cmd);
+
+ if (ap_scan < 0 || ap_scan > 2)
+ return -1;
+ wpa_s->conf->ap_scan = ap_scan;
+ return 0;
+}
+
+
static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
void *sock_ctx)
{
@@ -1064,6 +1076,9 @@
} else if (strncmp(buf, "GET_CAPABILITY ", 15) == 0) {
reply_len = wpa_supplicant_ctrl_iface_get_capability(
wpa_s, buf + 15, reply, reply_size);
+ } else if (strncmp(buf, "AP_SCAN ", 8) == 0) {
+ if (wpa_supplicant_ctrl_iface_ap_scan(wpa_s, buf + 8))
+ reply_len = -1;
} else {
memcpy(reply, "UNKNOWN COMMAND\n", 16);
reply_len = 16;

View File

@ -1,13 +0,0 @@
--- wpa_supplicant.c.ssid-len 2006-01-10 00:13:09.000000000 -0500
+++ wpa_supplicant.c 2006-01-10 00:16:26.000000000 -0500
@@ -1429,6 +1429,10 @@
}
ssid_len = res;
+ /* Some drivers NULL the end and add one to the length */
+ if (ssid[ssid_len - 1] == '\0')
+ ssid_len--;
+
if (wpa_drv_get_bssid(wpa_s, bssid) < 0) {
wpa_printf(MSG_WARNING, "Could not read BSSID from driver.");
return NULL;

View File

@ -1,28 +0,0 @@
Index: wpa_supplicant-0.4.8/driver_wext.c
===================================================================
--- wpa_supplicant-0.4.8.orig/driver_wext.c 2006-07-13 11:23:05.000000000 +0200
+++ wpa_supplicant-0.4.8/driver_wext.c 2006-07-13 11:23:57.000000000 +0200
@@ -1280,6 +1280,7 @@ static int wpa_driver_wext_set_key_ext(v
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
iwr.u.encoding.flags = key_idx + 1;
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
if (alg == WPA_ALG_NONE)
iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
iwr.u.encoding.pointer = (caddr_t) ext;
@@ -1401,6 +1402,7 @@ int wpa_driver_wext_set_key(void *priv,
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
iwr.u.encoding.flags = key_idx + 1;
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
if (alg == WPA_ALG_NONE)
iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
iwr.u.encoding.pointer = (caddr_t) key;
@@ -1415,6 +1417,7 @@ int wpa_driver_wext_set_key(void *priv,
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
iwr.u.encoding.flags = key_idx + 1;
+ iwr.u.encoding.flags |= IW_ENCODE_TEMP;
iwr.u.encoding.pointer = (caddr_t) NULL;
iwr.u.encoding.length = 0;
if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {

View File

@ -1,13 +0,0 @@
Index: wpa_supplicant-0.4.8/driver_wext.c
===================================================================
--- wpa_supplicant-0.4.8.orig/driver_wext.c
+++ wpa_supplicant-0.4.8/driver_wext.c
@@ -1415,7 +1415,7 @@ int wpa_driver_wext_set_key(void *priv,
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
iwr.u.encoding.flags = key_idx + 1;
- iwr.u.encoding.pointer = (caddr_t) key;
+ iwr.u.encoding.pointer = (caddr_t) NULL;
iwr.u.encoding.length = 0;
if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
perror("ioctl[SIOCSIWENCODE] (set_tx)");

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 10 17:44:46 CET 2007 - dmueller@suse.de
- update to 0.5.7 (#253396):
* ChangeLog is under /usr/share/doc/packages/wpa_supplicant/ChangeLog
-------------------------------------------------------------------
Mon Nov 6 16:29:14 CET 2006 - jg@suse.de

View File

@ -1,84 +0,0 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -6,6 +6,8 @@ ifndef CFLAGS
CFLAGS = -MMD -O2 -Wall -g
endif
+MADWIFI_SOURCE=$(shell echo /usr/include/madwifi-*)
+
# Include directories for CVS version
CFLAGS += -I. -I../utils -I../hostapd
@@ -79,7 +81,7 @@ CONFIG_WIRELESS_EXTENSION=y
endif
ifdef CONFIG_DRIVER_MADWIFI
-CFLAGS += -DCONFIG_DRIVER_MADWIFI
+CFLAGS += -DCONFIG_DRIVER_MADWIFI -I$(MADWIFI_SOURCE)
OBJS_d += driver_madwifi.o
CONFIG_WIRELESS_EXTENSION=y
endif
Index: driver_atmel.c
===================================================================
--- driver_atmel.c.orig
+++ driver_atmel.c
@@ -44,6 +44,7 @@
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <errno.h>
#include "wireless_copy.h"
Index: driver_hostap.c
===================================================================
--- driver_hostap.c.orig
+++ driver_hostap.c
@@ -17,6 +17,7 @@
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <errno.h>
#include "wireless_copy.h"
Index: driver_prism54.c
===================================================================
--- driver_prism54.c.orig
+++ driver_prism54.c
@@ -18,6 +18,7 @@
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <errno.h>
#include "wireless_copy.h"
Index: driver_madwifi.c
===================================================================
--- driver_madwifi.c.orig
+++ driver_madwifi.c
@@ -18,7 +18,9 @@
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <errno.h>
+#include <sys/socket.h>
#include "common.h"
#include "driver.h"
Index: driver_ipw.c
===================================================================
--- driver_ipw.c.orig
+++ driver_ipw.c
@@ -19,6 +19,7 @@
#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <errno.h>
#include "wireless_copy.h"

View File

@ -1,7 +1,7 @@
#
# spec file for package wpa_supplicant (Version 0.4.9)
# spec file for package wpa_supplicant (Version 0.5.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -15,19 +15,14 @@ BuildRequires: libdrm-devel libjpeg-devel openssl-devel qt3-devel readline-deve
%ifarch %ix86 x86_64
BuildRequires: madwifi-devel
%endif
URL: http://hostap.epitest.fi/
Version: 0.4.9
Release: 16
License: BSD License and BSD-like, GNU General Public License (GPL) - all versions
URL: http://hostap.epitest.fi/wpa_supplicant/
Version: 0.5.7
Release: 1
License: BSD License and BSD-like, GNU General Public License (GPL)
Group: Productivity/Networking/Other
Summary: WPA supplicant implementation
Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.bz2
Source1: config
Patch0: wpa_supplicant.dif
Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
Patch2: wpa_supplicant-driver-ssid-len.patch
Patch3: wpa_supplicant-wep_key_fix.dif
Patch4: wpa_supplicant-iw_encode_temp.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -59,16 +54,12 @@ Authors:
%prep
%setup -n wpa_supplicant-%{version}
%patch0
%patch1
%patch2
%patch3 -p1
%patch4 -p1
cp %{SOURCE1} .config
%build
%ifarch %ix86 x86_64
echo CONFIG_DRIVER_MADWIFI=y >>.config
echo "CFLAGS += -I/usr/include/madwifi-0.9.2.1" >> .config
%endif
CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs}
cd wpa_gui
@ -93,7 +84,10 @@ install -m 755 wpa_gui/wpa_gui %{buildroot}%{_sbindir}
%defattr(-,root,root)
/usr/sbin/wpa_gui
%changelog -n wpa_supplicant
%changelog
* Sat Mar 10 2007 - dmueller@suse.de
- update to 0.5.7 (#253396):
* ChangeLog is under /usr/share/doc/packages/wpa_supplicant/ChangeLog
* Mon Nov 06 2006 - jg@suse.de
- set IW_ENCODE_TEMP flag (needed to use dynamic WEP with airo
driver, bug 185528)