From 5c85ed4bb842a4918fc9d2024ca857007492ccd4 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 22 Nov 2005 03:13:26 +0000
Subject: [PATCH] update wpa_supplicant to new upstream stable release (v0.4.7)

SVN-Revision: 2544
---
 openwrt/package/wpa_supplicant/Makefile       |  4 +-
 .../patches/103-madwifi-ng.patch              | 50 -------------------
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch

diff --git a/openwrt/package/wpa_supplicant/Makefile b/openwrt/package/wpa_supplicant/Makefile
index e7a10165c0..34e9fcfdd4 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.4.5
+PKG_VERSION:=0.4.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=28347563119f09fc963bcdf9d16265a3
+PKG_MD5SUM:=1345730f15d5f93f2f083096ddc903eb
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch b/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch
deleted file mode 100644
index 3a3119f8a6..0000000000
--- a/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 <sys/types.h>
-+#include <sys/socket.h>
-+#include <linux/types.h>
-+#include <linux/socket.h>
-+#include <linux/if.h>
-+#include <stdint.h>
-+#include <linux/if_packet.h>
-+#include <linux/netlink.h>
-+#include <linux/rtnetlink.h>
-+
- #include <include/compat.h>
- #include <net80211/ieee80211.h>
- #ifdef WME_NUM_AC
--/* Assume this is built against BSD branch of madwifi driver. */
--#define MADWIFI_BSD
- #include <net80211/_ieee80211.h>
- #endif /* WME_NUM_AC */
- #include <net80211/ieee80211_crypto.h>
-@@ -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???]");