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, thirteen has been updated via bbfb087e7d9537a0332b2cccc8678581043e277a (commit) via e62efbb73d871bea084b0dde6e6a25a67184bba3 (commit) via eb1951373c5c505d8aeeae27f083efd63de73894 (commit) via c6389bdab450ad3c09fab6ff234c11989840ae08 (commit) via bb2106531da0b9c814ee51387f4f3791e50e049c (commit) via afe5c82aee8c83057cc096ea78562142a3922489 (commit) via 3026d21825b782c68dc5370447ab6edc53196ce9 (commit) from 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc (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 bbfb087e7d9537a0332b2cccc8678581043e277a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 20:58:51 2012 +0100
installer: skip empty blockdevices.
commit e62efbb73d871bea084b0dde6e6a25a67184bba3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 20:57:19 2012 +0100
hostapd: add 5ghz "n" and wpa1+2 mode.
commit eb1951373c5c505d8aeeae27f083efd63de73894 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 20:56:21 2012 +0100
hostapd: updated to 1.0.
commit c6389bdab450ad3c09fab6ff234c11989840ae08 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 20:55:29 2012 +0100
wpa_supplicant: updated 1.0.
commit bb2106531da0b9c814ee51387f4f3791e50e049c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 15:01:32 2012 +0100
kernel: updated to 3.2.33.
commit afe5c82aee8c83057cc096ea78562142a3922489 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 15:00:50 2012 +0100
hdparm: updated to 9.42.
commit 3026d21825b782c68dc5370447ab6edc53196ce9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 31 15:00:25 2012 +0100
sdparm: updated to 1.07.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/sdparm | 2 +- html/cgi-bin/wlanap.cgi | 39 +++++++++++++++++++++++++++----- lfs/hdparm | 6 ++-- lfs/hostapd | 11 +++----- lfs/linux | 6 ++-- lfs/sdparm | 6 ++-- lfs/wpa_supplicant | 9 ++----- src/install+setup/install/mountdest.sh | 5 ++++ 8 files changed, 55 insertions(+), 29 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm index cf5caa5..1bfb6a9 100644 --- a/config/rootfiles/common/sdparm +++ b/config/rootfiles/common/sdparm @@ -1,2 +1,2 @@ usr/bin/sdparm -#usr/man/man8/sdparm.8 +#usr/share/man/man8/sdparm.8 diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 0bb42ae..99c77e3 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) 2005-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2005-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -123,7 +123,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc - if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2")){ + if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){ if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){ $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />"; } @@ -232,6 +232,11 @@ END } }
+# Change old "n" to "gn" +if ( $wlanapsettings{'HW_MODE'} eq 'n' ) { + $wlanapsettings{'HW_MODE'}='gn'; +} + $checked{'HIDESSID'}{'off'} = ''; $checked{'HIDESSID'}{'on'} = ''; $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'"; @@ -350,7 +355,8 @@ print <<END <option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option> <option value='b' $selected{'HW_MODE'}{'b'}>802.11b</option> <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option> - <option value='n' $selected{'HW_MODE'}{'n'}>802.11n</option> + <option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option> + <option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option> </select> </td></tr>
@@ -359,6 +365,7 @@ print <<END <option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option> <option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option> <option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option> + <option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option> </select> </td></tr> <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}: </td><td class='base' colspan='3'> @@ -478,7 +485,16 @@ driver=$wlanapsettings{'DRIVER_HOSTAPD'} channel=$wlanapsettings{'CHANNEL'} END ; - if ( $wlanapsettings{'HW_MODE'} eq 'n' ){ + if ( $wlanapsettings{'HW_MODE'} eq 'an' ){ + print CONFIGFILE <<END +hw_mode=a +ieee80211n=1 +wmm_enabled=1 +ht_capab=$wlanapsettings{'HTCAPS'} +END +; + + }elsif ( $wlanapsettings{'HW_MODE'} eq 'gn' ){ print CONFIGFILE <<END hw_mode=g ieee80211n=1 @@ -529,7 +545,7 @@ END wpa=1 wpa_passphrase=$wlanapsettings{'PWD'} wpa_key_mgmt=WPA-PSK -wpa_pairwise=CCMP TKIP +wpa_pairwise=TKIP END ; }elsif ( $wlanapsettings{'ENC'} eq 'wpa2'){ @@ -539,7 +555,18 @@ END wpa=2 wpa_passphrase=$wlanapsettings{'PWD'} wpa_key_mgmt=WPA-PSK -wpa_pairwise=CCMP TKIP +rsn_pairwise=CCMP +END +; + } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){ + print CONFIGFILE <<END +######################### wpa hostapd configuration ############################ +# +wpa=3 +wpa_passphrase=$wlanapsettings{'PWD'} +wpa_key_mgmt=WPA-PSK +wpa_pairwise=TKIP +rsn_pairwise=CCMP END ; } diff --git a/lfs/hdparm b/lfs/hdparm index 33a43d0..e4a44bf 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 8.9 +VER = 9.42
THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 19fa013956612581af7d00907990ac84 +$(DL_FILE)_MD5 = 0af5a38b212fe08f5afbe5e37f34b40b
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd index b7283c8..01768b8 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 0.7.3 +VER = 1.0
THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 21 +PAK_VER = 22
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 91a7c8d0f090b7104152d3455a84c112 +$(DL_FILE)_MD5 = 236247a7bbd4f60d5fa3e99849d1ffc9
install : $(TARGET)
@@ -82,9 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -cp /usr/src/linux/include/linux/netfilter/nfnetlink.h /usr/include/linux/netfilter/ -cp /usr/src/linux/include/linux/netfilter/nfnetlink_compat.h /usr/include/linux/netfilter/ cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config -ifeq "$(MACHINE_TYPE)" "arm" - cd $(DIR_APP)/hostapd && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config -endif cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/hostapd && make install diff --git a/lfs/linux b/lfs/linux index e7f48b6..b2ebd99 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 3.2.32 +VER = 3.2.33
RPI_PATCHES = linux-3.2.27-9245b4c
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =
-PAK_VER = 21 +PAK_VER = 22 DEPS = ""
VERSUFIX=ipfire$(KCFG) @@ -75,7 +75,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = d2a4562d8c451e5ec43547e0d8babe57 +$(DL_FILE)_MD5 = 486521c7b00a92fc99e122b84ae9f089 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = c20baa8dc2527ce89a302862c3fc7f58
install : $(TARGET) diff --git a/lfs/sdparm b/lfs/sdparm index f1c8bd0..daa94ff 100644 --- a/lfs/sdparm +++ b/lfs/sdparm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 1.01 +VER = 1.07
THISAPP = sdparm-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7c87e5e1ebba54b7dae40e45fd356ab9 +$(DL_FILE)_MD5 = c807f9db3dd7af175214be0d7fece494
install : $(TARGET)
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 177caf9..ef539df 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 0.7.3 +VER = 1.0
THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f516f191384a9a546e3f5145c08addda +$(DL_FILE)_MD5 = 8650f6aa23646ef634402552d0669640
install : $(TARGET)
@@ -75,9 +75,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config -ifeq "$(MACHINE_TYPE)" "arm" - cd $(DIR_APP)/wpa_supplicant && sed -e "s/^CONFIG_DRIVER_MADWIFI=y/#&/" -i .config -endif cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile cd $(DIR_APP)/wpa_supplicant && sed -e "s@/usr/local@/usr@g" -i Makefile cd $(DIR_APP)/wpa_supplicant && make && make install diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index 776962a..ccee691 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -95,6 +95,11 @@ for path in /sys/block/*; do continue fi
+ if [ $(cat /sys/block/${device}/size) == 0 ]; then + echo " is empty - skipping" + continue + fi + # Found it. echo " OK, this is it..." echo -n "${device}" > /tmp/dest_device
hooks/post-receive -- IPFire 2.x development tree