X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fwpa_supplicant;h=1172e602e87e9b9ee7f5331ac7ae8541b2786df0;hp=1ba5e29d65581c86142ef374cd0d452340805804;hb=ad4ce45ae29bfa931ba5fb88bc99dccaccc48303;hpb=13704e5b1c27dee12c68daf48adb663f12b6f14d

diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 1ba5e29d6..1172e602e 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.10
+VER        = 2.0
 
 THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wpa_supplicant
-PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9e7b99da67c47d81121368c6d580d069
+$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d
 
 install : $(TARGET)
 
@@ -75,9 +74,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config
-	cd $(DIR_APP) && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile
-	cd $(DIR_APP) && sed -e "s@/usr/local@/usr@g" -i Makefile
-	cd $(DIR_APP) && make && make install
+	cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config
+	cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile
+	cd $(DIR_APP)/wpa_supplicant && sed -e "s@/usr/local@/usr@g" -i Makefile
+	cd $(DIR_APP)/wpa_supplicant && make && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)