From 6889d835572a0087f17aefe8b5a4a4cd4d94d349 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 23 Oct 2005 12:22:13 +0000 Subject: update wpa_supplicant to latest development release (v0.4.5), add drivers for hostap, madwifi and generic wext. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2275 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/wpa_supplicant/Makefile | 6 +-- openwrt/package/wpa_supplicant/files/config | 3 ++ .../wpa_supplicant/patches/101-ldflags.patch | 24 +++++++++++ .../wpa_supplicant/patches/102-opt_cflags.patch | 12 ++++++ .../wpa_supplicant/patches/103-madwifi.patch | 50 ++++++++++++++++++++++ .../package/wpa_supplicant/patches/ldflags.patch | 24 ----------- .../wpa_supplicant/patches/opt_cflags.patch | 12 ------ 7 files changed, 92 insertions(+), 39 deletions(-) create mode 100644 openwrt/package/wpa_supplicant/patches/101-ldflags.patch create mode 100644 openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch create mode 100644 openwrt/package/wpa_supplicant/patches/103-madwifi.patch delete mode 100644 openwrt/package/wpa_supplicant/patches/ldflags.patch delete mode 100644 openwrt/package/wpa_supplicant/patches/opt_cflags.patch (limited to 'openwrt/package/wpa_supplicant') diff --git a/openwrt/package/wpa_supplicant/Makefile b/openwrt/package/wpa_supplicant/Makefile index 70792fe4ec..e7a10165c0 100644 --- 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.9 +PKG_VERSION:=0.4.5 PKG_RELEASE:=1 -PKG_MD5SUM:=113873aafc4fcaa0515841a6f0a17fd0 +PKG_MD5SUM:=28347563119f09fc963bcdf9d16265a3 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 -I$(STAGING_DIR)/usr/include/madwifi" \ 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 fe7d269da0..19a0fd3294 100644 --- a/openwrt/package/wpa_supplicant/files/config +++ b/openwrt/package/wpa_supplicant/files/config @@ -1,5 +1,8 @@ # rather important CONFIG_DRIVER_BROADCOM=y +CONFIG_DRIVER_HOSTAP=y +CONFIG_DRIVER_MADWIFI=y +CONFIG_DRIVER_WEXT=y CONFIG_IEEE8021X_EAPOL=y CONFIG_CTRL_IFACE=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 index 0000000000..b8b6f66610 --- /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 index 0000000000..ec38b733e9 --- /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/103-madwifi.patch b/openwrt/package/wpa_supplicant/patches/103-madwifi.patch new file mode 100644 index 0000000000..3a3119f8a6 --- /dev/null +++ b/openwrt/package/wpa_supplicant/patches/103-madwifi.patch @@ -0,0 +1,50 @@ +diff -ruN wpa_supplicant-0.4.5-old/driver_madwifi.c wpa_supplicant-0.4.5-new/driver_madwifi.c +--- wpa_supplicant-0.4.5-old/driver_madwifi.c 2005-09-17 07:36:33.000000000 +0200 ++++ wpa_supplicant-0.4.5-new/driver_madwifi.c 2005-10-23 14:08:45.000000000 +0200 +@@ -27,11 +27,19 @@ + #include "wpa_supplicant.h" + #include "wpa.h" + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ + #include + #include + #ifdef WME_NUM_AC +-/* Assume this is built against BSD branch of madwifi driver. */ +-#define MADWIFI_BSD + #include + #endif /* WME_NUM_AC */ + #include +@@ -78,19 +86,19 @@ + "ioctl[IEEE80211_IOCTL_SETKEY]", + "ioctl[IEEE80211_IOCTL_GETKEY]", + "ioctl[IEEE80211_IOCTL_DELKEY]", +- NULL, ++ "ioctl[IEEE80211_IOCTL_SETWMMPARAMS]", + "ioctl[IEEE80211_IOCTL_SETMLME]", +- NULL, ++ "ioctl[IEEE80211_IOCTL_GETCHANINFO]", + "ioctl[IEEE80211_IOCTL_SETOPTIE]", + "ioctl[IEEE80211_IOCTL_GETOPTIE]", + "ioctl[IEEE80211_IOCTL_ADDMAC]", + NULL, + "ioctl[IEEE80211_IOCTL_DELMAC]", +- NULL, +- "ioctl[IEEE80211_IOCTL_CHANLIST]", ++ "ioctl[IEEE80211_IOCTL_GETCHANLIST]", ++ "ioctl[IEEE80211_IOCTL_SETCHANLIST]", + }; + if (IEEE80211_IOCTL_SETPARAM <= op && +- op <= IEEE80211_IOCTL_CHANLIST) ++ op <= IEEE80211_IOCTL_SETCHANLIST) + perror(opnames[op - SIOCIWFIRSTPRIV]); + else + perror("ioctl[unknown???]"); diff --git a/openwrt/package/wpa_supplicant/patches/ldflags.patch b/openwrt/package/wpa_supplicant/patches/ldflags.patch deleted file mode 100644 index b8b6f66610..0000000000 --- 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 index ec38b733e9..0000000000 --- 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 -- cgit v1.2.3