This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 50f696157ff447b332b92588588dbfa5cf98fef3 (commit) via 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3 (commit) via 324cae81712b7b1b7b80333ad92e369cac28b6ce (commit) via 3bb552552806066293fcfbedb8a41458393cfcd0 (commit) via bab14e7ee263c0d19028130061b8376f7ed17fbc (commit) via 83db6800ddea7be6553fb9fd3ee8f4641f1f69f5 (commit) via 4507470068e2fcecde6ebc522b977156e964846f (commit) via 29e453bcce26da749901ffefe28b9f81348f0d26 (commit) from c331896e29394556a9e620147212d52cf55e70d5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 50f696157ff447b332b92588588dbfa5cf98fef3 Merge: c331896 499bc00 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 10 22:01:28 2010 +0100
Merge commit 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/bzip2 | 2 +- config/rootfiles/packages/ipfireseeder | 2 +- html/cgi-bin/wlanap.cgi | 14 ++++++++++---- lfs/ipfireseeder | 6 +++--- lfs/mISDN | 1 + src/patches/mISDN_hfc-s_add_id.patch | 28 ++++++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 src/patches/mISDN_hfc-s_add_id.patch
Difference in files: diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index b91b89d..4292fd3 100644 --- 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 bacd4dd..e67f850 100644 --- 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 0301895..cd5bda3 100644 --- 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: </td><td class='base' colspan='3'><select name='TXPOWER'> +<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'> END ; -foreach $txpower (@txpower){ - print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm"; + +if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ + print "<select name='TXPOWER'>"; + foreach $txpower (@txpower){ + print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> 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: </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: </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): </td><td class='base' width='25%'> diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index b2a65ca..7d7a3c2 100644 --- 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 349f260..8eec207 100644 --- 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 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]}, + {}, + }; +
hooks/post-receive -- IPFire 2.x development tree