Merge commit 'origin/master' into next

diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2
index b91b89d799d215b7b3f908bd81be1ddd5df0b92d..4292fd305444dc87180c337400f6c9a037c77804 100644 (file)
--- a/config/rootfiles/common/bzip2
+++ b/config/rootfiles/common/bzip2
@@ -14,7 +14,7 @@ usr/bin/bzip2
 usr/bin/bzip2recover
 usr/bin/bzless
 usr/bin/bzmore
-usr/include/bzlib.h
+#usr/include/bzlib.h
 #usr/lib/libbz2.a
 #usr/lib/libbz2.so
 #usr/man/man1/bzcmp.1

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index bacd4dda611cf127b0da6de081bbf67cd70ac8a2..e67f850a922a556d3af0614890e32f895ab06497 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core41.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 03018952e67f388b85ce06b89ac80ed6c8573477..cd5bda3e87c7eed5826eee5bfc3a6a0107cbf380 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -371,14 +371,20 @@ foreach $channel (@channellist){
 
 print <<END
 </select></td></tr>
-<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><select name='TXPOWER'>
+<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>
 END
 ;
-foreach $txpower (@txpower){
-       print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
+
+if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
+       print "<select name='TXPOWER'>";
+       foreach $txpower (@txpower){
+               print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
+       }
+       print " </select></td></tr>";
+} else {
+       print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
 }
 print <<END
-       </select></td></tr>
 <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr>
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='63' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index b2a65ca0fa6e3bf3137193ca436d96a1e353b1a0..7d7a3c2c660351c6f14678df0c24112a178cc563 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.7.i586-full-core40.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core41.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 15
+PAK_VER    = 16
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
+$(DL_FILE)_MD5 = de05c43a1bc513eae06f16fcc2a8f94b
 
 install : $(TARGET)
 

diff --git a/lfs/mISDN b/lfs/mISDN
index 349f260fb9f597640da2d1ed95bb94825f8734d1..8eec207819a077c801b469c78ce83cc2d1837535 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+       cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
        cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \

diff --git a/src/patches/mISDN_hfc-s_add_id.patch b/src/patches/mISDN_hfc-s_add_id.patch
new file mode 100644 (file)
index 0000000..d544b1f
--- /dev/null
+++ b/src/patches/mISDN_hfc-s_add_id.patch
@@ -0,0 +1,28 @@
+diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
+--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c     2010-05-25 10:41:29.000000000 +0200
++++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2010-10-31 11:19:05.000000000 +0100
+@@ -88,6 +88,7 @@
+       HFC_DIGI_DF_M_A,
+       HFC_ABOCOM_2BD1,
+       HFC_SITECOM_DC105V2,
++      HFC_NONAME_1AE7_0520,
+ };
+ 
+ struct hfcPCI_hw {
+@@ -2182,6 +2183,7 @@
+       {HFC_DIGI_DF_M_A, 0,
+           "Digi International DataFire Micro V (North America)"},
+       {HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
++      {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
+       {},
+ };
+ 
+@@ -2233,6 +2235,8 @@
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
+       {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
++      {0x1ae7, 0x0520,
++              PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[23]},
+       {},
+ };
+