* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0
@ 2014-01-29 16:57 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-01-29 16:57 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 42750 bytes --]
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 <michael.tremer(a)ipfire.org>
Date: Wed Jan 29 17:34:01 2014 +0100
Update translations.
commit 1dd6ae72d95ee2d6ab2ad67bb7f01a05af17d4be
Merge: 8af8d5d 0cd7141
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 29 17:32:59 2014 +0100
Merge remote-tracking branch 'amarx/wlanap' into next
commit 8af8d5d127f91c19795fff9661615f7a0332e800
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 29 17:22:48 2014 +0100
rng-tools: New package.
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.
If no HW RNG is available, a warning will be printed
at boot time.
commit dabf764ee2df21b55594a3c2fcb8fb40dceef01c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 29 15:49:29 2014 +0100
kernel: Enable Geode AES module again.
This has successfully been tested with an ALIX board.
Fixes #10123.
commit 0dff6b5b85e1bf30b33bc7d02da36c7c33dc3997
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 29 15:01:57 2014 +0100
strongswan: Enable dhcp and farp plugin (#10467).
commit 0cd7141da9eec4d1cbb6a1b6e980cfa28cdfdd8e
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Thu Jan 23 16:45:46 2014 +0100
wlanap: mon-device no longer displayed
commit 3827d1f6bf2c6b01080bc44ae41009ead9bbcfc7
Author: Alexander Marx <amarx(a)ipfire.org>
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 => 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 => 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/common/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/i586/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/strongswan
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 reaches
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 reaches
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 reaches
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 reaches
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 reaches
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 reaches
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 = 0;
my $status = '';
my $errormessage = '';
-my $status_started = "<td align='center' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td></tr>";
-my $status_stopped = "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td></tr>";
-
+my $status_started = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td>";
+my $status_stopped = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td>";
+my $count=0;
+my $col='';
# get rid of used only once warnings
my @onlyonce = ( $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=0;
-}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){
- system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
- pid();
}
-&Header::openpage('Wireless LAN', 1, '', '');
+&Header::openpage('', 1, '', '');
&Header::openbigbox('100%', 'left', '', $errormessage);
if ( $errormessage ){
@@ -260,7 +258,7 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
$monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'};
}
-my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`;
+my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
# get available channels
my @temp;
@@ -306,64 +304,48 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
#
&Header::openbox('100%', 'center', "WLAN AP");
print <<END
-<table width='95%' cellspacing='0'>
+<table width='80%' cellspacing='1' class='tbl'>
END
;
if ( $wlan_card_status ne '' ){
- print "<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'wlanap wlan services'}</strong></td></tr>";
- print "<tr><td colspan='1' class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>";
+ print "<tr><th align='left' width='50%'><strong>$Lang::tr{'service'}</strong></th><th width='22%'>Status</th><th width='10%'>PID</th><th width='15%'>$Lang::tr{'memory'}</th><th colspan='2'width='5%'>$Lang::tr{'action'}</th></tr>";
+ print "<tr><td class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>";
print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
- print "<tr><td colspan='1' class='base'>$Lang::tr{'wlanap access point'}</td>";
+ print"<td colspan='4'></td></tr>";
+ print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap access point'}</td>";
print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
+ if ( ($memory != 0) && (@pid[0] ne "///") ){
+ print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
+ print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td>";
+ print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>";
+ print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>";
+ }else{
+ print"<td colspan='2' bgcolor='$color{'color22'}'></td>";
+ print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>";
+ print "<td bgcolor='$color{'color22'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>";
+ }
}else{
- print "<tr><td colspan='2' class='base'>$message";
+ print "<tr><td class='base'>$message";
}
print "</table>";
-if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){
- print "<table width='95%' cellspacing='0' border='0'>";
- print "<tr>";
- print "<td align='center'></td>";
- print "<td bgcolor='$color{'color20'}' align='center'><strong>PID</strong></td>";
- print "<td bgcolor='$color{'color20'}' align='center'><strong>$Lang::tr{'memory'}</strong></td>";
+if ( $wlan_card_status eq '' ){
+ print "<br />";
+ print "<table width='80%' cellspacing='0' border='0'>";
+ print "<tr align='center'>";
+ print "<td colspan='4'></td>";
print "</tr>";
- print "<tr>";
- print "<td width='35%' align='right'><strong>hostapd</strong> </td>";
- print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
- print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td>";
+ print "<tr align='center'>";
+ print "<td width='40%'> </td>";
+ print "<td width='20%'><form method='post' action='/cgi-bin/wlanap.cgi'><input type='submit' name='ACTION' value='$Lang::tr{'wlanap del interface'}' /></form></td>";
+ print "<td width='20%'></td>";
+ print "<td width='20%'></td>";
print "</tr>";
print "</table>";
}
-if ( $wlan_card_status ne '' ){
-print "<br />";
-print "<table width='95%' cellspacing='0' border='0'>";
-print "<tr align='center'>";
-print "</tr>";
-print "<tr align='center'>";
-print "<td width='40%'> </td>";
-print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'start'}' /><input type='image' alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' /></form></td>";
-print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'stop'}' /><input type='image' alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' /></form></td>";
-print "<td width='20%'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='$Lang::tr{'restart'}' /><input type='image' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' src='/images/view-refresh.png' /></form></td>";
-print "</tr>";
-print "</table>";
-}else{
-print "<br />";
-print "<table width='95%' cellspacing='0' border='0'>";
-print "<tr align='center'>";
-print "<td colspan='4'><hr size='1'></td>";
-print "</tr>";
-print "<tr align='center'>";
-print "<td width='40%'> </td>";
-print "<td width='20%'><form method='post' action='/cgi-bin/wlanap.cgi'><input type='submit' name='ACTION' value='$Lang::tr{'wlanap del interface'}' /></form></td>";
-print "<td width='20%'></td>";
-print "<td width='20%'></td>";
-print "</tr>";
-print "</table>";
-}
-
if ( $wlan_card_status eq '' ){
&Header::closebox();
&Header::closebigbox();
@@ -371,13 +353,25 @@ if ( $wlan_card_status eq '' ){
exit 0;
}
print <<END
-<br />
+<br><br>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong>
-<tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr>
+<table width='80%' cellspacing='0' class='tbl' border='0'>
+<tr><th bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong></th></tr>
+<tr><td colspan='4'><br></td></tr>
+<tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
<!--SSID Broadcast: on => HIDESSID: off -->
<tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr>
+
+
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'>
+ <select name='COUNTRY'>
+END
+;
+foreach $country (@countrylist){
+ print "<option $selected{'COUNTRY'}{$country}>$country</option>";
+}
+print<<END
+</select></td></tr>
<tr><td width='25%' class='base'>HW Mode: </td><td class='base' colspan='3'>
<select name='HW_MODE'>
<option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option>
@@ -387,15 +381,6 @@ print <<END
<option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
</select>
</td></tr>
-
-<tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}: </td><td class='base' colspan='3'>
- <select name='ENC'>
- <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>
END
;
@@ -417,18 +402,22 @@ END
END
;
}
-
-print <<END
-<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'>
- <select name='COUNTRY'>
+print<<END
+<tr><td colspan='4'><br></td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}: </td><td class='base' colspan='3'>
+ <select name='ENC'>
+ <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'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
+<tr><td colspan='4'><br></td></tr>
END
;
-foreach $country (@countrylist){
- print "<option $selected{'COUNTRY'}{$country}>$country</option>";
-}
-
print <<END
-</select></td></tr>
+<tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'>
END
;
@@ -443,8 +432,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
}
print <<END
-<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%'>
<select name='SYSLOGLEVEL'>
<option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
@@ -463,13 +450,17 @@ print <<END
<option value='4' $selected{'DEBUG'}{'4'}>4 ($Lang::tr{'wlanap warnings'})</option>
</select>
</td></tr>
+<tr><td colspan='4'><br></td></tr>
</table>
END
;
if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
print <<END
<br />
-<table width='95%' cellspacing='0'>
+<table width='80%' cellspacing='0' class='tbl' border='1'>
+<tr>
+ <th colspan='3' align='left'>$Lang::tr{'mac filter'}</th>
+</tr>
<td width='25%' class='base'>Mac Filter: </td><td class='base' width='25%'>
<select name='MACMODE'>
<option value='0' $selected{'MACMODE'}{'0'}>0 (off)</option>
@@ -488,7 +479,7 @@ END
}
print <<END
<br />
-<table width='95%' cellspacing='0'>
+<table width='80%' cellspacing='0'>
<tr><td align='center'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
@@ -506,16 +497,47 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
}
print <<END
<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></td></tr>
-<tr><td><pre>@channellist_cmd</pre></td><td><pre>@txpower_cmd</pre></td></tr>
-<tr><td colspan='2'><pre>$status</pre></td></tr>
-</table>
+<table width='80%' cellspacing='0' class='tbl'>
+<tr><th colspan='3' bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></th></tr>
+END
+;
+foreach my $nr (@channellist_cmd){
+ my ($chan,$freq) = split(':',$nr);
+ if ($count % 2){
+ $col="bgcolor='$color{'color20'}'";
+ }else{
+ $col="bgcolor='$color{'color22'}'";
+ }
+ print"<tr><td $col>$chan</td><td $col>:</td><td $col>$freq</td></tr>";
+ $count++;
+}
+if ($count % 2){
+ $col="bgcolor='$color{'color20'}'";
+ }else{
+ $col="bgcolor='$color{'color22'}'";
+ }
+if ($status){
+ print"<tr><td colspan='3' $col><pre>$status</pre></td></tr>";
+ $count++;
+}
+for (my $i=0;$i<$#txpower_cmd;$i=$i+4){
+ next if (@txpower_cmd[$i] =~ /mon/i);
+ if ($count % 2){
+ $col="bgcolor='$color{'color20'}'";
+ }else{
+ $col="bgcolor='$color{'color22'}'";
+ }
+ print "<tr><td $col>@txpower_cmd[$i]</td><td $col>@txpower_cmd[$i+1]</td><td $col>@txpower_cmd[$i+2]</td></tr>";
+ $count++;
+}
+print "</table><br>";
+print <<END
<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' align='left'><strong>WLan Clients</strong></td></tr>
+<table width='80%' cellspacing='0' class='tbl' border='0'>
+<tr><td bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlan clients'}</strong></td></tr>
<tr><td> <a href="/cgi-bin/wireless.cgi">$Lang::tr{'wlanap link wireless'}</a></td></tr>
<tr><td> <a href="/cgi-bin/dhcp.cgi">$Lang::tr{'wlanap link dhcp'}</a></td></tr>
+<tr><td><br></td></tr>
</table>
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' => 'Die MAC-Adresse wurde erfolgreich gespeichert. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'mac address title' => 'MAC Adresse zuweisen',
'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.',
+'mac filter' => 'MAC-Filter',
'mac new' => 'Neue MAC-Adresse:',
'mac1 new' => 'Neue MAC-Adresse 1 (vdsl-inet):',
'mac2 new' => 'Neue MAC-Adresse 2 (vdsl-iptv):',
@@ -2509,6 +2510,7 @@
'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',
'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
+'wlan clients' => 'WLAN-Clients',
'wlanap access point' => 'Access Point',
'wlanap channel' => 'Kanal',
'wlanap country' => 'Ländercode',
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' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
'mac address title' => 'Assign MAC Address',
'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
+'mac filter' => 'MAC filter',
'mac new' => 'new MAC address:',
'mac1 new' => 'new MAC address 1 (vdsl-inet):',
'mac2 new' => 'new MAC address 2 (vdsl-iptv):',
@@ -2548,6 +2549,7 @@
'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',
'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
+'wlan clients' => 'Wireless clients',
'wlanap access point' => 'Access Point',
'wlanap channel' => 'Channel',
'wlanap country' => '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=1" > /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.ko.off
endif
@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 <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 4
+
+THISAPP = rng-tools-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 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=/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="/usr" \
--sysconfdir="/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 <michael.tremer(a)ipfire.org>
+#
+########################################################################
+
+. /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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-29 16:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-29 16:57 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox