update wpa_supplicant to latest stable upstream release (v0.4.7), enable LEAP support...

SVN-Revision: 2548

diff --git a/openwrt/package/wpa_supplicant/Makefile b/openwrt/package/wpa_supplicant/Makefile
index cfb6e873d6261a7603770760748d27f9644726ee..0ed11b1703ab9dbffad582696548126bdcf52075 100644 (file)
--- a/openwrt/package/wpa_supplicant/Makefile
+++ b/openwrt/package/wpa_supplicant/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
-PKG_VERSION:=0.3.8
-PKG_RELEASE:=2
-PKG_MD5SUM:=c9ced104f0322f834a84336c293b4b57
+PKG_VERSION:=0.4.7
+PKG_RELEASE:=1
+PKG_MD5SUM:=1345730f15d5f93f2f083096ddc903eb
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -24,7 +24,7 @@ $(PKG_BUILD_DIR)/.configured:
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               CPPFLAGS="-I$(TOPDIR)/package/openwrt/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                OPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL=$(LINUX_DIR) \

diff --git a/openwrt/package/wpa_supplicant/files/config b/openwrt/package/wpa_supplicant/files/config
index fe7d269da0037e2dbd1113025b01a78dcceea455..bc553c8286201eef4b227f8c91a34fe081096b98 100644 (file)
--- a/openwrt/package/wpa_supplicant/files/config
+++ b/openwrt/package/wpa_supplicant/files/config
@@ -1,5 +1,10 @@
 # rather important
 CONFIG_DRIVER_BROADCOM=y
+# CONFIG_DRIVER_HOSTAP is not set
+# CONFIG_DRIVER_MADWIFI is not set
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_WIRED=y
+
 CONFIG_IEEE8021X_EAPOL=y
 CONFIG_CTRL_IFACE=y
 
@@ -10,5 +15,6 @@ CONFIG_EAP_MD5=y
 # optional
 CONFIG_MSCHAPV2=y
 CONFIG_EAP_TLS=y
+CONFIG_EAP_LEAP=y
 CONFIG_EAP_PEAP=y
 CONFIG_EAP_TTLS=y

diff --git a/openwrt/package/wpa_supplicant/patches/101-ldflags.patch b/openwrt/package/wpa_supplicant/patches/101-ldflags.patch
new file mode 100644 (file)
index 0000000..b8b6f66
--- /dev/null
+++ b/openwrt/package/wpa_supplicant/patches/101-ldflags.patch
@@ -0,0 +1,24 @@
+--- wpa_supplicant-0.3.8/Makefile.orig 2005-05-22 12:37:28.000000000 +0200
++++ wpa_supplicant-0.3.8/Makefile      2005-05-22 12:40:04.000000000 +0200
+@@ -304,7 +304,7 @@
+ OBJS += wpa_supplicant.o wpa.o l2_packet.o drivers.o
+ 
+ wpa_supplicant: .config $(OBJS)
+-      $(CC) -o wpa_supplicant $(OBJS) $(LIBS)
++      $(CC) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS)
+ 
+ eapol_test: .config $(OBJS_t)
+       $(CC) -o eapol_test $(OBJS_t) $(LIBS)
+@@ -313,10 +313,10 @@
+       $(CC) -o preauth_test $(OBJS_t2) $(LIBS)
+ 
+ wpa_passphrase: $(OBJS_p)
+-      $(CC) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
++      $(CC) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
+ 
+ wpa_cli: $(OBJS_c)
+-      $(CC) -o wpa_cli $(OBJS_c) $(LIBS_c)
++      $(CC) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
+ 
+ win_if_list: win_if_list.c
+       $(CC) -o $@ win_if_list.c $(CFLAGS) $(LIBS_w)

diff --git a/openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch b/openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch
new file mode 100644 (file)
index 0000000..ec38b73
--- /dev/null
+++ b/openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch
@@ -0,0 +1,12 @@
+--- wpa_supplicant-0.3.8/Makefile.orig 2005-02-14 02:55:47.000000000 +0100
++++ wpa_supplicant-0.3.8/Makefile      2005-05-21 21:06:03.000000000 +0200
+@@ -3,7 +3,8 @@
+ endif
+ 
+ ifndef CFLAGS
+-CFLAGS = -MMD -O2 -Wall -g
++OPT_FLAGS = -O2 -g
++CFLAGS = -MMD $(OPT_FLAGS) -Wall
+ endif
+ 
+ # Include directories for CVS version

diff --git a/openwrt/package/wpa_supplicant/patches/driver_broadcom-memleak.patch b/openwrt/package/wpa_supplicant/patches/driver_broadcom-memleak.patch
deleted file mode 100644 (file)
index 3d295f5..0000000
--- a/openwrt/package/wpa_supplicant/patches/driver_broadcom-memleak.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fixes some memory leaks in driver_broadom.c
-
-  http://openwrt.org/forum/viewtopic.php?pid=8217#p8217
-
-Thanks Greg (framer99)
-
---- wpa_supplicant-0.3.8/driver_broadcom.c.orig        2005-01-22 05:35:13.000000000 +0100
-+++ wpa_supplicant-0.3.8/driver_broadcom.c     2005-06-10 08:50:14.000000000 +0200
-@@ -289,6 +289,7 @@
-                          wwh->type);
-               break;
-       }
-+      free(data.assoc_info.resp_ies);
- }     
- 
- static void * wpa_driver_broadcom_init(void *ctx, const char *ifname)
-@@ -449,8 +450,10 @@
-       wsr->count = 0;
- 
-       if (broadcom_ioctl(drv, WLC_SCAN_RESULTS, buf, WLC_IOCTL_MAXLEN) <
--          0)
-+          0) {
-+              free(buf);
-               return -1;
-+      }
- 
-       memset(results, 0, max_size * sizeof(struct wpa_scan_result));
- 
-@@ -490,6 +493,7 @@
-       wpa_printf(MSG_MSGDUMP, "Received %d bytes of scan results (%d BSSes)",
-                  wsr->buflen, ap_num);
- 
-+      free(buf);
-       return ap_num;
- }
- 

diff --git a/openwrt/package/wpa_supplicant/patches/ldflags.patch b/openwrt/package/wpa_supplicant/patches/ldflags.patch
deleted file mode 100644 (file)
index b8b6f66..0000000
--- a/openwrt/package/wpa_supplicant/patches/ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- wpa_supplicant-0.3.8/Makefile.orig 2005-05-22 12:37:28.000000000 +0200
-+++ wpa_supplicant-0.3.8/Makefile      2005-05-22 12:40:04.000000000 +0200
-@@ -304,7 +304,7 @@
- OBJS += wpa_supplicant.o wpa.o l2_packet.o drivers.o
- 
- wpa_supplicant: .config $(OBJS)
--      $(CC) -o wpa_supplicant $(OBJS) $(LIBS)
-+      $(CC) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS)
- 
- eapol_test: .config $(OBJS_t)
-       $(CC) -o eapol_test $(OBJS_t) $(LIBS)
-@@ -313,10 +313,10 @@
-       $(CC) -o preauth_test $(OBJS_t2) $(LIBS)
- 
- wpa_passphrase: $(OBJS_p)
--      $(CC) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
-+      $(CC) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p)
- 
- wpa_cli: $(OBJS_c)
--      $(CC) -o wpa_cli $(OBJS_c) $(LIBS_c)
-+      $(CC) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
- 
- win_if_list: win_if_list.c
-       $(CC) -o $@ win_if_list.c $(CFLAGS) $(LIBS_w)

diff --git a/openwrt/package/wpa_supplicant/patches/opt_cflags.patch b/openwrt/package/wpa_supplicant/patches/opt_cflags.patch
deleted file mode 100644 (file)
index ec38b73..0000000
--- a/openwrt/package/wpa_supplicant/patches/opt_cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- wpa_supplicant-0.3.8/Makefile.orig 2005-02-14 02:55:47.000000000 +0100
-+++ wpa_supplicant-0.3.8/Makefile      2005-05-21 21:06:03.000000000 +0200
-@@ -3,7 +3,8 @@
- endif
- 
- ifndef CFLAGS
--CFLAGS = -MMD -O2 -Wall -g
-+OPT_FLAGS = -O2 -g
-+CFLAGS = -MMD $(OPT_FLAGS) -Wall
- endif
- 
- # Include directories for CVS version