Updated madwifi to svn3841

diff --git a/config/rootfiles/common/madwifi b/config/rootfiles/common/madwifi
index b1282de5b4a95eb5d2a54c4cc96789d7922febd8..c684ea932725fe56bc06d7e3da55ee4160eaf146 100644 (file)
--- a/config/rootfiles/common/madwifi
+++ b/config/rootfiles/common/madwifi
@@ -1,19 +1,4 @@
 etc/madwifi.conf
-#lib/modules/2.6.20.21-ipfire/net
-#lib/modules/2.6.20.21-ipfire/net/ath_hal.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_pci.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_amrr.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_minstrel.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_onoe.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_sample.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_acl.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_ccmp.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_scan_ap.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_scan_sta.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_tkip.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_wep.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_xauth.ko
 usr/local/bin/80211debug
 usr/local/bin/80211stats
 usr/local/bin/ath_info
@@ -22,13 +7,16 @@ usr/local/bin/athctrl
 usr/local/bin/athdebug
 usr/local/bin/athkey
 usr/local/bin/athstats
+usr/local/bin/madwifi-unload
 usr/local/bin/wlanconfig
+usr/local/bin/wpakey
+#usr/local/man/man8
 #usr/local/man/man8/80211debug.8
 #usr/local/man/man8/80211stats.8
-#usr/local/man/man8/ath_info.8
 #usr/local/man/man8/athchans.8
 #usr/local/man/man8/athctrl.8
 #usr/local/man/man8/athdebug.8
 #usr/local/man/man8/athkey.8
 #usr/local/man/man8/athstats.8
 #usr/local/man/man8/wlanconfig.8
+#usr/local/share/man/man8/ath_info.8

diff --git a/config/rootfiles/updater/filelists/madwifi b/config/rootfiles/updater/filelists/madwifi
index b1282de5b4a95eb5d2a54c4cc96789d7922febd8..c684ea932725fe56bc06d7e3da55ee4160eaf146 100644 (file)
--- a/config/rootfiles/updater/filelists/madwifi
+++ b/config/rootfiles/updater/filelists/madwifi
@@ -1,19 +1,4 @@
 etc/madwifi.conf
-#lib/modules/2.6.20.21-ipfire/net
-#lib/modules/2.6.20.21-ipfire/net/ath_hal.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_pci.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_amrr.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_minstrel.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_onoe.ko
-#lib/modules/2.6.20.21-ipfire/net/ath_rate_sample.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_acl.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_ccmp.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_scan_ap.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_scan_sta.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_tkip.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_wep.ko
-#lib/modules/2.6.20.21-ipfire/net/wlan_xauth.ko
 usr/local/bin/80211debug
 usr/local/bin/80211stats
 usr/local/bin/ath_info
@@ -22,13 +7,16 @@ usr/local/bin/athctrl
 usr/local/bin/athdebug
 usr/local/bin/athkey
 usr/local/bin/athstats
+usr/local/bin/madwifi-unload
 usr/local/bin/wlanconfig
+usr/local/bin/wpakey
+#usr/local/man/man8
 #usr/local/man/man8/80211debug.8
 #usr/local/man/man8/80211stats.8
-#usr/local/man/man8/ath_info.8
 #usr/local/man/man8/athchans.8
 #usr/local/man/man8/athctrl.8
 #usr/local/man/man8/athdebug.8
 #usr/local/man/man8/athkey.8
 #usr/local/man/man8/athstats.8
 #usr/local/man/man8/wlanconfig.8
+#usr/local/share/man/man8/ath_info.8

diff --git a/lfs/madwifi b/lfs/madwifi
index 187758d3cf0d5094aa30085d59ae0fe71520bae8..1ea024f12d7272c5ce88f65ac69e26dc2ec0eb46 100644 (file)
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 0.9.4
+VER        = svn3841
 
 THISAPP    = madwifi-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(SMP)" ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 399d20de8d855a59f20058857c2178ad
+$(DL_FILE)_MD5 = 60c8ce7553b55eff618b49aeee3bc3b5
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i -e "s/\/sbin\/depmod -ae//" Makefile
        cd $(DIR_APP) && sed -i -e "94,96d" Makefile
        # workaround for build on lfs