webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-11-10 22:01:28 +01:00
parent c331896e29 499bc000ff
commit 50f696157f
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/bzip2
View File

@@ -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

2
config/rootfiles/packages/ipfireseeder
View File

@@ -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

14
html/cgi-bin/wlanap.cgi
View File

@@ -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%'>

6
lfs/ipfireseeder
View File

@@ -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)

1
lfs/mISDN
View File

@@ -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) \

28
src/patches/mISDN_hfc-s_add_id.patch Normal file
View File

@@ -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]},
{},
};