[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6e346fe0651118e27
From:       git () ipfire ! org (Christian Schmidt)
Date:       2010-08-29 6:27:52
Message-ID: 20100829062752.7F368206DB () argus ! ipfire ! org
[Download RAW message or body]

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, master has been updated
       via  6e346fe0651118e27d01c895e0b82dea8cf9aa3c (commit)
       via  e30c283719b9aa4e8623cb79688bc32dfb81cc8a (commit)
       via  ae23a606c8e22c64d18484e39f2ce61f23e2f1c1 (commit)
      from  aac0f7118f0630a1987324c4d29c642be06a9f94 (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 6e346fe0651118e27d01c895e0b82dea8cf9aa3c
Author: Christian Schmidt <christian.schmidt at ipfire.org>
Date:   Sun Aug 29 08:26:57 2010 +0200

    Added a better 802.11n support, wmm and htcaps are not available.
    This fixes bug #0000710.

commit e30c283719b9aa4e8623cb79688bc32dfb81cc8a
Author: Christian Schmidt <christian.schmidt at ipfire.org>
Date:   Sun Aug 29 08:21:13 2010 +0200

    Added the menu extension for imspector to configroot.

commit ae23a606c8e22c64d18484e39f2ce61f23e2f1c1
Author: Christian Schmidt <christian.schmidt at ipfire.org>
Date:   Sun Aug 29 08:19:59 2010 +0200

    This should fix the error when trying to upload sources.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/configroot |    1 +
 html/cgi-bin/wlanap.cgi            |    6 +++++-
 lfs/hostapd                        |    2 +-
 make.sh                            |    5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index d047104..abc1ee3 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -79,6 +79,7 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-apcupsd.menu
 #var/ipfire/menu.d/EX-asterisk.menu
 #var/ipfire/menu.d/EX-bluetooth.menu
+#var/ipfire/menu.d/EX-imspector.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tripwire.menu
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2e12a65..0301895 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  IPTifre Team                                       #
 #                                                                             #
 # 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        #
@@ -69,6 +69,7 @@ $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'MADWIFI';
+$wlanapsettings{'HTCAPS'} = '';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
@@ -379,6 +380,7 @@ foreach $txpower (@txpower){
 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%'>  <select \
name='SYSLOGLEVEL'>  <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 \
($Lang::tr{'wlanap verbose'})</option> @@ -474,6 +476,8 @@ END
 	print CONFIGFILE <<END
 hw_mode=g
 ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
 END
 ;
 
diff --git a/lfs/hostapd b/lfs/hostapd
index 1791593..90b35db 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 18
+PAK_VER    = 19
 
 DEPS       = ""
 
diff --git a/make.sh b/make.sh
index 4e72c00..41ede31 100755
--- a/make.sh
+++ b/make.sh
@@ -1018,11 +1018,12 @@ uploadsrc)
 		beautify message FAIL
 		exit 1
 	fi
+
 	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+	REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C \
${IPFIRE_USER}@${URL_SOURCE})  
 	cd $BASEDIR/cache/
-	for file in $(ls -1); do
+	for file in $(ls -1 --ignore=toolchains); do
 		grep -q "$file" <<<$REMOTE_FILES && continue
 		NEW_FILES="$NEW_FILES $file"
 	done


hooks/post-receive
--
IPFire 2.x development tree


[prev in list] [next in list] [prev in thread] [next in thread]