From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0 Date: Wed, 29 Jan 2014 17:57:42 +0100 Message-ID: <20140129165743.1707D20201@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0602877522153575267==" List-Id: --===============0602877522153575267== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0 (commit) via 1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be (commit) via 8af8d5d127f91c19795fff9661615f7a0332e800 (commit) via dabf764ee2df21b55594a3c2fcb8fb40dceef01c (commit) via 0dff6b5b85e1bf30b33bc7d02da36c7c33dc3997 (commit) via 0cd7141da9eec4d1cbb6a1b6e980cfa28cdfdd8e (commit) via 3827d1f6bf2c6b01080bc44ae41009ead9bbcfc7 (commit) from c724c483e00b325b9b1ab98b9c8ad427ca31c41a (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 c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0 Author: Michael Tremer Date: Wed Jan 29 17:34:01 2014 +0100 Update translations. commit 1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be Merge: 8af8d5d 0cd7141 Author: Michael Tremer Date: Wed Jan 29 17:32:59 2014 +0100 Merge remote-tracking branch 'amarx/wlanap' into next commit 8af8d5d127f91c19795fff9661615f7a0332e800 Author: Michael Tremer Date: Wed Jan 29 17:22:48 2014 +0100 rng-tools: New package. =20 The rng daemon will be installed by default and will also be installed when a hardware random number generator is found. It will then read random data from the hardware random number generator and will feed it into the kernel's entropy pool. =20 If no HW RNG is available, a warning will be printed at boot time. commit dabf764ee2df21b55594a3c2fcb8fb40dceef01c Author: Michael Tremer Date: Wed Jan 29 15:49:29 2014 +0100 kernel: Enable Geode AES module again. =20 This has successfully been tested with an ALIX board. =20 Fixes #10123. commit 0dff6b5b85e1bf30b33bc7d02da36c7c33dc3997 Author: Michael Tremer Date: Wed Jan 29 15:01:57 2014 +0100 strongswan: Enable dhcp and farp plugin (#10467). commit 0cd7141da9eec4d1cbb6a1b6e980cfa28cdfdd8e Author: Alexander Marx Date: Thu Jan 23 16:45:46 2014 +0100 wlanap: mon-device no longer displayed commit 3827d1f6bf2c6b01080bc44ae41009ead9bbcfc7 Author: Alexander Marx Date: Thu Jan 23 14:15:12 2014 +0100 WLANAP: layout changes for WUI ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/i586/linux | 2 +- config/rootfiles/common/rng-tools | 4 + config/rootfiles/common/strongswan | 2 + config/rootfiles/core/76/filelists/rng-tools | 1 + config/rootfiles/packages/linux-pae | 2 +- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 3 + doc/language_issues.fr | 3 +- doc/language_issues.nl | 3 + doc/language_issues.pl | 3 + doc/language_issues.ru | 3 + doc/language_issues.tr | 3 + doc/language_missings | 8 ++ html/cgi-bin/wlanap.cgi | 188 +++++++++++++++----------= -- langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 2 + lfs/initscripts | 1 + lfs/linux | 4 - lfs/{libpng =3D> rng-tools} | 10 +- lfs/strongswan | 2 + make.sh | 1 + src/initscripts/init.d/rngd | 47 +++++++ 25 files changed, 203 insertions(+), 95 deletions(-) create mode 100644 config/rootfiles/common/rng-tools create mode 120000 config/rootfiles/core/76/filelists/rng-tools copy lfs/{libpng =3D> rng-tools} (93%) create mode 100644 src/initscripts/init.d/rngd Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/= common/armv5tel/initscripts index 1b8fbda..d25af18 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -225,6 +225,7 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S90sysctl etc/rc.d/rcsysinit.d/S91network-vlans +etc/rc.d/rcsysinit.d/S92rngd etc/rc.d/rc3.d/S15fireinfo #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/comm= on/i586/initscripts index ca47f80..3d82d40 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -232,6 +232,7 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S90sysctl etc/rc.d/rcsysinit.d/S91network-vlans +etc/rc.d/rcsysinit.d/S92rngd etc/rc.d/rc3.d/S15fireinfo #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i58= 6/linux index 93ed567..d662516 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -245,7 +245,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto -#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko.off +#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-aes.ko #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-sha.ko diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/common/rng-= tools new file mode 100644 index 0000000..596a911 --- /dev/null +++ b/config/rootfiles/common/rng-tools @@ -0,0 +1,4 @@ +usr/bin/rngtest +usr/sbin/rngd +#usr/share/man/man1/rngtest.1 +#usr/share/man/man8/rngd.8 diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str= ongswan index 0e18580..c33769f 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -43,6 +43,7 @@ usr/lib/ipsec/plugins/libstrongswan-attr.so usr/lib/ipsec/plugins/libstrongswan-cmac.so usr/lib/ipsec/plugins/libstrongswan-constraints.so usr/lib/ipsec/plugins/libstrongswan-curl.so +usr/lib/ipsec/plugins/libstrongswan-dhcp.so usr/lib/ipsec/plugins/libstrongswan-des.so usr/lib/ipsec/plugins/libstrongswan-dnskey.so usr/lib/ipsec/plugins/libstrongswan-eap-identity.so @@ -51,6 +52,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-peap.so usr/lib/ipsec/plugins/libstrongswan-eap-radius.so usr/lib/ipsec/plugins/libstrongswan-eap-tls.so usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so +usr/lib/ipsec/plugins/libstrongswan-farp.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so diff --git a/config/rootfiles/core/76/filelists/rng-tools b/config/rootfiles/= core/76/filelists/rng-tools new file mode 120000 index 0000000..a7853e4 --- /dev/null +++ b/config/rootfiles/core/76/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/= linux-pae index b1973b9..a7eaf40 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -243,7 +243,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_stats.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto -#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off +#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-sha.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/dca diff --git a/doc/language_issues.de b/doc/language_issues.de index 11ae4bc..2376b0e 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -591,6 +591,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph diff --git a/doc/language_issues.en b/doc/language_issues.en index 55f395f..5e3eef1 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -625,6 +625,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph diff --git a/doc/language_issues.es b/doc/language_issues.es index 83e1328..066ea50 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -562,6 +562,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -802,6 +803,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice @@ -933,4 +935,5 @@ WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp tkip WARNING: untranslated string: wlan client wpa mode tkip tkip +WARNING: untranslated string: wlan clients WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index ced3bf8..42e1479 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -814,6 +814,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice @@ -945,6 +946,7 @@ WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp tkip WARNING: untranslated string: wlan client wpa mode tkip tkip +WARNING: untranslated string: wlan clients WARNING: untranslated string: wlanap access point WARNING: untranslated string: wlanap channel WARNING: untranslated string: wlanap country @@ -963,6 +965,5 @@ WARNING: untranslated string: wlanap select interface WARNING: untranslated string: wlanap verbose WARNING: untranslated string: wlanap warnings WARNING: untranslated string: wlanap wlan card -WARNING: untranslated string: wlanap wlan services WARNING: untranslated string: wlanap wlan settings WARNING: untranslated string: wlanap wlan status diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8bd7f1c..aa8c5b6 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -578,6 +578,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -760,6 +761,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: most preferred WARNING: untranslated string: notice WARNING: untranslated string: openvpn network @@ -857,3 +859,4 @@ WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp tkip WARNING: untranslated string: wlan client wpa mode tkip tkip +WARNING: untranslated string: wlan clients diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 83e1328..066ea50 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -562,6 +562,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -802,6 +803,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice @@ -933,4 +935,5 @@ WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp tkip WARNING: untranslated string: wlan client wpa mode tkip tkip +WARNING: untranslated string: wlan clients WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4aad65c..0e00e5e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -566,6 +566,7 @@ WARNING: translation string unused: vpn watch WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits @@ -798,6 +799,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice @@ -922,4 +924,5 @@ WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp tkip WARNING: untranslated string: wlan client wpa mode tkip tkip +WARNING: untranslated string: wlan clients WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a260ff2..a21d735 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -593,6 +593,7 @@ WARNING: translation string unused: warn when traffic rea= ches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits +WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph @@ -766,6 +767,7 @@ WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime +WARNING: untranslated string: mac filter WARNING: untranslated string: most preferred WARNING: untranslated string: notice WARNING: untranslated string: openvpn network @@ -785,3 +787,4 @@ WARNING: untranslated string: support donation WARNING: untranslated string: tor directory port WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: urlfilter redirect template +WARNING: untranslated string: wlan clients diff --git a/doc/language_missings b/doc/language_missings index 8b4ad3d..b588cae 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -281,6 +281,7 @@ < ipsec no connections < least preferred < lifetime +< mac filter < minute < most preferred < notice @@ -432,6 +433,7 @@ < wlan client pairwise key algorithm < wlan client pairwise key group key < wlan client psk +< wlan clients < wlan client ssid < wlan client tkip < wlan client wpa mode @@ -714,6 +716,7 @@ < ipsec no connections < least preferred < lifetime +< mac filter < minute < most preferred < notice @@ -858,6 +861,7 @@ < wlan client pairwise key algorithm < wlan client pairwise key group key < wlan client psk +< wlan clients < wlan client ssid < wlan client tkip < wlan client wpa mode @@ -1131,6 +1135,7 @@ < ipsec no connections < least preferred < lifetime +< mac filter < minute < most preferred < notice @@ -1259,6 +1264,7 @@ < wlan client pairwise key algorithm < wlan client pairwise key group key < wlan client psk +< wlan clients < wlan client ssid < wlan client tkip < wlan client wpa mode @@ -1539,6 +1545,7 @@ < ipsec no connections < least preferred < lifetime +< mac filter < minute < month-graph < most preferred @@ -1666,6 +1673,7 @@ < wlan client pairwise key algorithm < wlan client pairwise key group key < wlan client psk +< wlan clients < wlan client ssid < wlan client tkip < wlan client wpa mode diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 58c6376..79bd025 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -35,9 +35,10 @@ require '/var/ipfire/header.pl'; my $debug =3D 0; my $status =3D ''; my $errormessage =3D ''; -my $status_started =3D "$Lang::tr{'running'}= "; -my $status_stopped =3D "$Lang::tr{'stopped'}"; - +my $status_started =3D "$Lang::tr{'running'}"; +my $status_stopped =3D "$Lang::tr{'stopped'}"; +my $count=3D0; +my $col=3D''; # get rid of used only once warnings my @onlyonce =3D ( $Header::colourgreen, $Header::colourred ); undef @onlyonce; @@ -151,12 +152,9 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); $memory=3D0; -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ - system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); - pid(); } =20 -&Header::openpage('Wireless LAN', 1, '', ''); +&Header::openpage('', 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); =20 if ( $errormessage ){ @@ -260,7 +258,7 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'= } ) { $monwlaninterface =3D 'mon.'.$wlanapsettings{'INTERFACE'}; } =20 -my @channellist_cmd =3D `iwlist $monwlaninterface channel 2>/dev/null`; +my @channellist_cmd =3D `iwlist $monwlaninterface channel|tail -n +2 2>/dev/= null`; # get available channels =20 my @temp; @@ -306,64 +304,48 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} =3D "selec= ted=3D'selected'"; # &Header::openbox('100%', 'center', "WLAN AP"); print < + END ; =20 if ( $wlan_card_status ne '' ){ - print ""; - print ""; + print ""; + print ""; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print ""; + print""; + print ""; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + if ( ($memory !=3D 0) && (@pid[0] ne "///") ){ + print ""; + print ""; + print ""; + print ""; + }else{ + print""; + print ""; + print ""; + } =20 }else{ - print "
<= strong>$Lang::tr{'wlanap wlan services'}
$Lang::tr{'wlanap wlan card'} (= $wlanapsettings{'DRIVER'})
$Lang::tr{'service'}StatusPID$Lang::tr{'memory'}$Lang::tr{'act= ion'}
$Lang::tr{'wlanap wlan card'} ($wlanapsetting= s{'DRIVER'})
$Lang::tr{'wlanap access point'= }
$Lang::tr{'wlan= ap access point'}@pid[0]$memory KB
$message"; + print "
$message"; } print "
"; =20 -if ( ($memory !=3D 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ - print ""; - print ""; - print ""; - print ""; - print ""; +if ( $wlan_card_status eq '' ){ + print "
"; + print "
PID$Lang::tr= {'memory'}
"; + print ""; + print ""; print ""; - print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; + print ""; print ""; print "
hostapd &nbs= p;  @pid[0]$memory KB
 
"; } =20 -if ( $wlan_card_status ne '' ){ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -}else{ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -} - if ( $wlan_card_status eq '' ){ &Header::closebox(); &Header::closebigbox(); @@ -371,13 +353,25 @@ if ( $wlan_card_status eq '' ){ exit 0; } print < +

- - +
$= Lang::tr{'wlanap wlan settings'} -
SSID: 
+ + + + + += - - END ; =20 @@ -417,18 +402,22 @@ END END ; } - -print <= + + + END ; -foreach $country (@countrylist){ - print ""; -} - print < +" } print < - +
$= Lang::tr{'wlanap wlan settings'}

SSID: 
SSID Broadcast: on | off
$Lang::tr{'wlanap country'}:  +
HW Mode: 
$Lang::tr{'wlanap encryption'}:  - -
$Lang::tr{'wlanap country'}:  -
$Lang::tr{'wlanap encryption'}:  + +
Passphrase: 

HT Caps: 
Tx Power:  END ; @@ -443,8 +432,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ print "
Passphrase: 
HT Caps: 
Loglevel (hostapd): 

END ; if ( $wlanapsettings{'INTERFACE'} =3D~ /green0/ ){ print < - +
+ + +
$Lang::tr{'mac filter'}
Mac Filter:  +
@@ -506,16 +497,47 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ } print < - - - - -
$= Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+ + +END +; +foreach my $nr (@channellist_cmd){ + my ($chan,$freq) =3D split(':',$nr); + if ($count % 2){ + $col=3D"bgcolor=3D'$color{'color20'}'"; + }else{ + $col=3D"bgcolor=3D'$color{'color22'}'"; + } + print""; + $count++; +} +if ($count % 2){ + $col=3D"bgcolor=3D'$color{'color20'}'"; + }else{ + $col=3D"bgcolor=3D'$color{'color22'}'"; + } +if ($status){ + print""; + $count++; +} +for (my $i=3D0;$i<$#txpower_cmd;$i=3D$i+4){ + next if (@txpower_cmd[$i] =3D~ /mon/i); + if ($count % 2){ + $col=3D"bgcolor=3D'$color{'color20'}'"; + }else{ + $col=3D"bgcolor=3D'$color{'color22'}'"; + } + print "@txpower_cmd[$i+2]"; + $count++; +} +print "
$= Lang::tr{'wlanap wlan status'}
$chan:$freq
$status
@txpower_cmd[$i]@txpower_cmd[$i+1]

"; +print < - - +
WLan Clients
+ +
$Lang::tr{'wlan= clients'}
 $Lang::tr{'wlanap link wirel= ess'}
 $Lang::tr{'wlanap link dhcp'}

END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6fa813a..9da517e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1361,6 +1361,7 @@ 'mac address saved txt' =3D> 'Die MAC-Adresse wurde erfolgreich gespeichert.= =C3=84nderungen werden jedoch erst nach einem Neustart oder einer Wiederverb= indung =C3=BCbernommen.', 'mac address title' =3D> 'MAC Adresse zuweisen', 'mac desc' =3D> 'Sie k=C3=B6nnen an dieser Stelle die MAC-Adresse von red0 = =C3=A4ndern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, ein= e g=C3=BCltige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.', +'mac filter' =3D> 'MAC-Filter', 'mac new' =3D> 'Neue MAC-Adresse:', 'mac1 new' =3D> 'Neue MAC-Adresse 1 (vdsl-inet):', 'mac2 new' =3D> 'Neue MAC-Adresse 2 (vdsl-iptv):', @@ -2509,6 +2510,7 @@ 'wlan client wpa mode ccmp ccmp' =3D> 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' =3D> 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' =3D> 'TKIP-TKIP', +'wlan clients' =3D> 'WLAN-Clients', 'wlanap access point' =3D> 'Access Point', 'wlanap channel' =3D> 'Kanal', 'wlanap country' =3D> 'L=C3=A4ndercode', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 173b8f0..3957b85 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1390,6 +1390,7 @@ 'mac address saved txt' =3D> 'The MAC address has been successfully saved, b= ut changes will only take effect after reboot or reconnection.', 'mac address title' =3D> 'Assign MAC Address', 'mac desc' =3D> 'Here you are able to change the MAC address on red0. The ad= dress must be entered in hexadecimal (0-9,a-f), a valid entry is
e.g. 0= 0-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.', +'mac filter' =3D> 'MAC filter', 'mac new' =3D> 'new MAC address:', 'mac1 new' =3D> 'new MAC address 1 (vdsl-inet):', 'mac2 new' =3D> 'new MAC address 2 (vdsl-iptv):', @@ -2548,6 +2549,7 @@ 'wlan client wpa mode ccmp ccmp' =3D> 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' =3D> 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' =3D> 'TKIP-TKIP', +'wlan clients' =3D> 'Wireless clients', 'wlanap access point' =3D> 'Access Point', 'wlanap channel' =3D> 'Channel', 'wlanap country' =3D> 'Country Code', diff --git a/lfs/initscripts b/lfs/initscripts index eae451b..6968ede 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -173,6 +173,7 @@ $(TARGET) : ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S90sysctl ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans + ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient diff --git a/lfs/linux b/lfs/linux index 52853c7..274657c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -278,10 +278,6 @@ ifeq "$(LASTKERNEL)" "1" # Disable ipv6 at runtime echo "options ipv6 disable_ipv6=3D1" > /etc/modprobe.d/ipv6.conf endif - - # Disable geode_aes modul if exist - -mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.k= o.off endif =20 @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs*= $(DIR_SRC)/netfilter-layer7-* diff --git a/lfs/rng-tools b/lfs/rng-tools new file mode 100644 index 0000000..8ca95cf --- /dev/null +++ b/lfs/rng-tools @@ -0,0 +1,77 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# = # +# 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 = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 4 + +THISAPP =3D rng-tools-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D ae89dbfcf08bdfbea19066cfbf599127 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(EXTRA_INSTALL) install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/strongswan b/lfs/strongswan index 5c411a3..7583c62 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -86,6 +86,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=3D"/usr" \ --sysconfdir=3D"/etc" \ --enable-curl \ + --enable-dhcp \ + --enable-farp \ --enable-openssl \ --enable-xauth-eap \ --enable-eap-radius \ diff --git a/make.sh b/make.sh index cb04763..186e65f 100755 --- a/make.sh +++ b/make.sh @@ -651,6 +651,7 @@ buildipfire() { ipfiremake sysstat ipfiremake vsftpd ipfiremake strongswan + ipfiremake rng-tools ipfiremake lsof ipfiremake br2684ctl ipfiremake pcmciautils diff --git a/src/initscripts/init.d/rngd b/src/initscripts/init.d/rngd new file mode 100644 index 0000000..cc1c10d --- /dev/null +++ b/src/initscripts/init.d/rngd @@ -0,0 +1,47 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/rngd +# +# Description : Random Number Generator Daemon +# +# Authors : Michael Tremer +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + if [ ! -e "/dev/hwrng" ]; then + boot_mesg "No Hardware Random Number Generator found..." ${WARNING} + echo_warning + exit 0 + fi + + boot_mesg "Starting Random Number Generator Daemon..." + loadproc /usr/sbin/rngd + ;; + + stop) + boot_mesg "Stopping Random Number Generator Daemon..." + killproc /usr/sbin/rngd + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/sbin/rngd + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/rngd hooks/post-receive -- IPFire 2.x development tree --===============0602877522153575267==--