webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next

Browse Source 
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.ru
	doc/language_issues.tr
	doc/language_missings
This commit is contained in:
Michael Tremer
2014-03-20 23:14:13 +01:00
parent 2d6ac13175 0d0df35ca2
commit dd29d563a6
54 changed files with 1170 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
config/cfgroot/general-functions.pl
View File

@@ -506,24 +506,46 @@ sub validipandmask
sub checksubnets
{
my %ccdconfhash=();
my @ccdconf=();
my $ccdname=$_[0];
my $ccdnet=$_[1];
my %ccdconfhash=();
my %ovpnconfhash=();
my %vpnconf=();
my %ipsecconf=();
my %ownnet=();
my %ovpnconf=();
my @ccdconf=();
my $ccdname=$_[0];
my $ccdnet=$_[1];
my $ownnet=$_[2];
my $errormessage;
my ($ip,$cidr)=split(/\//,$ccdnet);
$cidr=&iporsubtocidr($cidr);
#get OVPN-Subnet (dynamic range)
my %ovpnconf=();
&readhash("${General::swroot}/ovpn/settings", \%ovpnconf);
my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'});
$ovpncidr=&iporsubtocidr($ovpncidr);
#check if we try to use same network as ovpn server
if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") {
$errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>";
return $errormessage;
}
#check if we use a network-name/subnet that already exists
#check if we try to use same network as another ovpn N2N
if($ownnet ne 'ovpn'){
&readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfhash);
foreach my $key (keys %ovpnconfhash) {
if ($ovpnconfhash{$key}[3] eq 'net'){
my @ovpnnet=split (/\//,$ovpnconfhash{$key}[11]);
if (&IpInSubnet($ip,$ovpnnet[0],&iporsubtodec($ovpnnet[1]))){
$errormessage=$errormessage.$Lang::tr{'ccd err isovpnn2n'}." $ovpnconfhash{$key}[1] <br>";
return $errormessage;
}
}
}
}
#check if we use a network-name/subnet (static-ovpn) that already exists
&readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash);
foreach my $key (keys %ccdconfhash) {
@ccdconf=split(/\//,$ccdconfhash{$key}[1]);
@@ -535,32 +557,45 @@ sub checksubnets
my ($newip,$newsub) = split(/\//,$ccdnet);
if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1])))
{
$errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";
$errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}." $ccdconfhash{$key}[0]<br>";
return $errormessage;
}
}
#check if we use a ipsec right network which is already defined
my %ipsecconf=();
&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
foreach my $key (keys %ipsecconf){
if ($ipsecconf{$key}[11] ne ''){
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
$ipsecsub=&iporsubtodec($ipsecsub);
if($ipsecconf{$key}[1] ne $ccdname){
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
return $errormessage;
if($ownnet ne 'ipsec'){
&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
foreach my $key (keys %ipsecconf){
if ($ipsecconf{$key}[11] ne ''){
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
$ipsecsub=&iporsubtodec($ipsecsub);
if($ipsecconf{$key}[1] ne $ccdname){
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
return $errormessage;
}
}
}
}
}
#check if we use the ipsec RW Network (if defined)
&readhash("${General::swroot}/vpn/settings", \%vpnconf);
if ($vpnconf{'RW_NET'} ne ''){
my ($ipsecrwnet,$ipsecrwsub)=split (/\//, $vpnconf{'RW_NET'});
if (&IpInSubnet($ip,$ipsecrwnet,&iporsubtodec($ipsecrwsub)))
{
$errormessage=$errormessage.$Lang::tr{'ccd err isipsecrw'}."<br>";
return $errormessage;
}
}
#check if we use one of ipfire's networks (green,orange,blue)
my %ownnet=();
&readhash("${General::swroot}/ethernet/settings", \%ownnet);
if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
}

2
config/cfgroot/graphs.pl
View File

@@ -1140,7 +1140,6 @@ sub updateentropygraph {
"-t $Lang::tr{'entropy'}",
"-v $Lang::tr{'bit'}",
"DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
"CDEF:entropytrend=entropy,43200,TREND",
"LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
"VDEF:entrmin=entropy,MINIMUM",
"VDEF:entrmax=entropy,MAXIMUM",
@@ -1148,7 +1147,6 @@ sub updateentropygraph {
"GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
"GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
"GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
"LINE3:entropytrend#000000",
);
RRDs::graph (@command);

3
config/cron/crontab
View File

@@ -50,9 +50,6 @@ HOME=/
%weekly * 3-5 /var/ipfire/updatexlrator/autocheck/cron.weekly
%monthly * 3-5 * /var/ipfire/updatexlrator/autocheck/cron.monthly
# Reset Dialup Statistics
&bootrun 0 0 1 * * /usr/local/bin/dialctrl.pl reset
# fireinfo
%nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1

115
config/firewall/rules.pl
View File

@@ -39,6 +39,7 @@ my $CHAIN_NAT_SOURCE = "NAT_SOURCE";
my $CHAIN_NAT_DESTINATION = "NAT_DESTINATION";
my $CHAIN_MANGLE_NAT_DESTINATION_FIX = "NAT_DESTINATION";
my @VALID_CHAINS = ($CHAIN_INPUT, $CHAIN_FORWARD, $CHAIN_OUTPUT);
my @ANY_ADDRESSES = ("0.0.0.0/0.0.0.0", "0.0.0.0/0", "0/0");
my @PROTOCOLS = ("tcp", "udp", "icmp", "igmp", "ah", "esp", "gre", "ipv6", "ipip");
my @PROTOCOLS_WITH_PORTS = ("tcp", "udp");
@@ -255,6 +256,16 @@ sub buildrules {
# Skip invalid rules.
next if (!$source || !$destination || ($destination eq "none"));
# Sanitize source.
if ($source ~~ @ANY_ADDRESSES) {
$source = "";
}
# Sanitize destination.
if ($destination ~~ @ANY_ADDRESSES) {
$destination = "";
}
# Array with iptables arguments.
my @options = ();
@@ -268,12 +279,15 @@ sub buildrules {
my @source_options = ();
if ($source =~ /mac/) {
push(@source_options, $source);
} else {
} elsif ($source) {
push(@source_options, ("-s", $source));
}
# Prepare destination options.
my @destination_options = ("-d", $destination);
my @destination_options = ();
if ($destination) {
push(@destination_options, ("-d", $destination));
}
# Add time constraint options.
push(@options, @time_options);
@@ -285,7 +299,7 @@ sub buildrules {
# Process NAT rules.
if ($NAT) {
my $nat_address = &get_nat_address($$hash{$key}[29]);
my $nat_address = &get_nat_address($$hash{$key}[29], $source);
# Skip NAT rules if the NAT address is unknown
# (i.e. no internet connection has been established, yet).
@@ -294,7 +308,10 @@ sub buildrules {
# Destination NAT
if ($NAT_MODE eq "DNAT") {
# Make port-forwardings useable from the internal networks.
&add_dnat_mangle_rules($nat_address, @options);
my @internal_addresses = &get_internal_firewall_ip_addresses(1);
unless ($nat_address ~~ @internal_addresses) {
&add_dnat_mangle_rules($nat_address, @options);
}
my @nat_options = @options;
push(@nat_options, @source_options);
@@ -380,9 +397,25 @@ sub get_alias {
sub get_nat_address {
my $zone = shift;
my $source = shift;
# Any static address of any zone.
if ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") {
if ($zone eq "AUTO") {
if ($source) {
my $firewall_ip = &get_internal_firewall_ip_address($source, 1);
if ($firewall_ip) {
return $firewall_ip;
}
$firewall_ip = &get_matching_firewall_address($source, 1);
if ($firewall_ip) {
return $firewall_ip;
}
}
return &get_external_address();
} elsif ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") {
return $defaultNetworks{$zone . "_ADDRESS"};
} elsif ($zone eq "Default IP") {
@@ -795,23 +828,77 @@ sub make_log_limit_options {
return @options;
}
sub firewall_is_in_subnet {
my $subnet = shift;
sub get_internal_firewall_ip_addresses {
my $use_orange = shift;
my ($net_address, $net_mask) = split("/", $subnet);
if (!$net_mask) {
return 0;
my @zones = ("GREEN", "BLUE");
if ($use_orange) {
push(@zones, "ORANGE");
}
# ORANGE is missing here, because nothing may ever access
# the firewall from this network.
foreach my $zone ("GREEN", "BLUE") {
my @addresses = ();
for my $zone (@zones) {
next unless (exists $defaultNetworks{$zone . "_ADDRESS"});
my $zone_address = $defaultNetworks{$zone . "_ADDRESS"};
push(@addresses, $zone_address);
}
return @addresses;
}
sub get_internal_firewall_ip_address {
my $subnet = shift;
my $use_orange = shift;
my ($net_address, $net_mask) = split("/", $subnet);
if ((!$net_mask) || ($net_mask ~~ ["32", "255.255.255.255"])) {
return 0;
}
my @addresses = &get_internal_firewall_ip_addresses($use_orange);
foreach my $zone_address (@addresses) {
if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) {
return 1;
return $zone_address;
}
}
return 0;
}
sub firewall_is_in_subnet {
my $subnet = shift;
# ORANGE is missing here, because nothing may ever access
# the firewall from this network.
my $address = &get_internal_firewall_ip_address($subnet, 0);
if ($address) {
return 1;
}
return 0;
}
sub get_matching_firewall_address {
my $addr = shift;
my $use_orange = shift;
my ($address, $netmask) = split("/", $addr);
my @zones = ("GREEN", "BLUE");
if ($use_orange) {
push(@zones, "ORANGE");
}
foreach my $zone (@zones) {
next unless (exists $defaultNetworks{$zone . "_ADDRESS"});
my $zone_subnet = $defaultNetworks{$zone . "_NETADDRESS"};
my $zone_mask = $defaultNetworks{$zone . "_NETMASK"};
if (&General::IpInSubnet($address, $zone_subnet, $zone_mask)) {
return $defaultNetworks{$zone . "_ADDRESS"};
}
}

7
config/hostapd/config
View File

@@ -142,3 +142,10 @@ CONFIG_IEEE80211N=y
# This can be used to reduce the size of the hostapd considerably if debugging
# code is not needed.
CONFIG_NO_STDOUT_DEBUG=y
# IEEE 802.11ac (Very High Throughput) support
CONFIG_IEEE80211AC=y
# Enable AUTO_CHANNEL_SELECTION
# This is needed for dfs (radar detection) channels
CONFIG_ACS=y

3
config/kernel/kernel.config.i586-ipfire
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.30-ipfire Kernel Configuration
# Linux/x86 3.10.33 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -658,6 +658,7 @@ CONFIG_EISA_NAMES=y
CONFIG_SCx200=m
CONFIG_SCx200HR_TIMER=m
# CONFIG_OLPC is not set
CONFIG_APULED=y
CONFIG_ALIX=y
CONFIG_NET5501=y
CONFIG_GEOS=y

3
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.30-ipfire Kernel Configuration
# Linux/x86 3.10.33 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -670,6 +670,7 @@ CONFIG_EISA_PCI_EISA=y
CONFIG_EISA_VIRTUAL_ROOT=y
CONFIG_EISA_NAMES=y
# CONFIG_SCx200 is not set
CONFIG_APULED=y
# CONFIG_ALIX is not set
# CONFIG_NET5501 is not set
# CONFIG_GEOS is not set

6
config/menu/20-status.menu
View File

@@ -46,6 +46,12 @@
'title' => "$Lang::tr{'hardware graphs'}",
'enabled' => 1,
};
$substatus->{'61.entropy'} = {
'caption' => "$Lang::tr{'entropy'}",
'uri' => '/cgi-bin/entropy.cgi',
'title' => "$Lang::tr{'entropy graphs'}",
'enabled' => 1,
};
$substatus->{'71.connections'} = {
'caption' => $Lang::tr{'connections'},
'uri' => '/cgi-bin/connections.cgi',

2
config/rootfiles/common/armv5tel/initscripts
View File

@@ -74,7 +74,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/20-RL-firewall
etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
@@ -89,7 +88,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe

2
config/rootfiles/common/i586/initscripts
View File

@@ -76,7 +76,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/20-RL-firewall
etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
@@ -91,7 +90,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe

1
config/rootfiles/common/stage2
View File

@@ -81,7 +81,6 @@ usr/local/bin/backupiso
usr/local/bin/connscheduler
usr/local/bin/consort.sh
usr/local/bin/convert-ovpn
usr/local/bin/dialctrl.pl
usr/local/bin/hddshutdown
usr/local/bin/httpscert
usr/local/bin/makegraphs

79
config/rootfiles/common/sudo
View File

@@ -1,10 +1,77 @@
etc/sudoers
etc/sudoers.d
usr/bin/sudo
usr/bin/sudoedit
usr/lib/sudo_noexec.la
usr/lib/sudo_noexec.so
#usr/man/man5/sudoers.5
#usr/man/man8/sudo.8
#usr/man/man8/sudoedit.8
#usr/man/man8/visudo.8
usr/bin/sudoreplay
#usr/include/sudo_plugin.h
usr/lib/sudo
usr/lib/sudo/group_file.so
usr/lib/sudo/sudo_noexec.so
usr/lib/sudo/sudoers.so
usr/lib/sudo/system_group.so
usr/sbin/visudo
#usr/share/doc/sudo
#usr/share/doc/sudo/CONTRIBUTORS
#usr/share/doc/sudo/ChangeLog
#usr/share/doc/sudo/HISTORY
#usr/share/doc/sudo/LICENSE
#usr/share/doc/sudo/NEWS
#usr/share/doc/sudo/README
#usr/share/doc/sudo/TROUBLESHOOTING
#usr/share/doc/sudo/UPGRADE
#usr/share/doc/sudo/sample.pam
#usr/share/doc/sudo/sample.sudo.conf
#usr/share/doc/sudo/sample.sudoers
#usr/share/doc/sudo/sample.syslog.conf
#usr/share/locale/ca/LC_MESSAGES/sudo.mo
#usr/share/locale/cs/LC_MESSAGES/sudo.mo
#usr/share/locale/cs/LC_MESSAGES/sudoers.mo
#usr/share/locale/da/LC_MESSAGES/sudo.mo
#usr/share/locale/da/LC_MESSAGES/sudoers.mo
#usr/share/locale/de/LC_MESSAGES/sudo.mo
#usr/share/locale/de/LC_MESSAGES/sudoers.mo
#usr/share/locale/eo/LC_MESSAGES/sudo.mo
#usr/share/locale/eo/LC_MESSAGES/sudoers.mo
#usr/share/locale/es/LC_MESSAGES/sudo.mo
#usr/share/locale/eu/LC_MESSAGES/sudo.mo
#usr/share/locale/eu/LC_MESSAGES/sudoers.mo
#usr/share/locale/fi/LC_MESSAGES/sudo.mo
#usr/share/locale/fi/LC_MESSAGES/sudoers.mo
#usr/share/locale/fr/LC_MESSAGES/sudo.mo
#usr/share/locale/gl/LC_MESSAGES/sudo.mo
#usr/share/locale/hr/LC_MESSAGES/sudo.mo
#usr/share/locale/hr/LC_MESSAGES/sudoers.mo
#usr/share/locale/it/LC_MESSAGES/sudo.mo
#usr/share/locale/it/LC_MESSAGES/sudoers.mo
#usr/share/locale/ja/LC_MESSAGES/sudo.mo
#usr/share/locale/ja/LC_MESSAGES/sudoers.mo
#usr/share/locale/lt/LC_MESSAGES/sudoers.mo
#usr/share/locale/nl/LC_MESSAGES/sudo.mo
#usr/share/locale/nl/LC_MESSAGES/sudoers.mo
#usr/share/locale/pl/LC_MESSAGES/sudo.mo
#usr/share/locale/pl/LC_MESSAGES/sudoers.mo
#usr/share/locale/pt_BR/LC_MESSAGES/sudo.mo
#usr/share/locale/pt_BR/LC_MESSAGES/sudoers.mo
#usr/share/locale/ru/LC_MESSAGES/sudo.mo
#usr/share/locale/sl/LC_MESSAGES/sudo.mo
#usr/share/locale/sl/LC_MESSAGES/sudoers.mo
#usr/share/locale/sr/LC_MESSAGES/sudo.mo
#usr/share/locale/sr/LC_MESSAGES/sudoers.mo
#usr/share/locale/sv/LC_MESSAGES/sudo.mo
#usr/share/locale/sv/LC_MESSAGES/sudoers.mo
#usr/share/locale/tr/LC_MESSAGES/sudo.mo
#usr/share/locale/tr/LC_MESSAGES/sudoers.mo
#usr/share/locale/uk/LC_MESSAGES/sudo.mo
#usr/share/locale/uk/LC_MESSAGES/sudoers.mo
#usr/share/locale/vi/LC_MESSAGES/sudo.mo
#usr/share/locale/vi/LC_MESSAGES/sudoers.mo
#usr/share/locale/zh_CN/LC_MESSAGES/sudo.mo
#usr/share/locale/zh_CN/LC_MESSAGES/sudoers.mo
#usr/share/man/man5/sudo.conf.5
#usr/share/man/man5/sudoers.5
#usr/share/man/man8/sudo.8
#usr/share/man/man8/sudo_plugin.8
#usr/share/man/man8/sudoedit.8
#usr/share/man/man8/sudoreplay.8
#usr/share/man/man8/visudo.8
var/lib/sudo

32
config/rootfiles/common/tzdata
View File

@@ -281,6 +281,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/Asia/Kashgar
#usr/share/zoneinfo/Asia/Kathmandu
#usr/share/zoneinfo/Asia/Katmandu
#usr/share/zoneinfo/Asia/Khandyga
#usr/share/zoneinfo/Asia/Kolkata
#usr/share/zoneinfo/Asia/Krasnoyarsk
#usr/share/zoneinfo/Asia/Kuala_Lumpur
@@ -304,9 +305,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/Asia/Qyzylorda
#usr/share/zoneinfo/Asia/Rangoon
#usr/share/zoneinfo/Asia/Riyadh
#usr/share/zoneinfo/Asia/Riyadh87
#usr/share/zoneinfo/Asia/Riyadh88
#usr/share/zoneinfo/Asia/Riyadh89
#usr/share/zoneinfo/Asia/Saigon
#usr/share/zoneinfo/Asia/Sakhalin
#usr/share/zoneinfo/Asia/Samarkand
@@ -325,6 +323,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/Asia/Ulaanbaatar
#usr/share/zoneinfo/Asia/Ulan_Bator
#usr/share/zoneinfo/Asia/Urumqi
#usr/share/zoneinfo/Asia/Ust-Nera
#usr/share/zoneinfo/Asia/Vientiane
#usr/share/zoneinfo/Asia/Vladivostok
#usr/share/zoneinfo/Asia/Yakutsk
@@ -440,6 +439,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/Europe/Brussels
#usr/share/zoneinfo/Europe/Bucharest
#usr/share/zoneinfo/Europe/Budapest
#usr/share/zoneinfo/Europe/Busingen
#usr/share/zoneinfo/Europe/Chisinau
#usr/share/zoneinfo/Europe/Copenhagen
#usr/share/zoneinfo/Europe/Dublin
@@ -524,10 +524,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/Mexico/BajaNorte
#usr/share/zoneinfo/Mexico/BajaSur
#usr/share/zoneinfo/Mexico/General
#usr/share/zoneinfo/Mideast
#usr/share/zoneinfo/Mideast/Riyadh87
#usr/share/zoneinfo/Mideast/Riyadh88
#usr/share/zoneinfo/Mideast/Riyadh89
#usr/share/zoneinfo/NZ
#usr/share/zoneinfo/NZ-CHAT
#usr/share/zoneinfo/Navajo
@@ -886,6 +882,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Asia/Kashgar
#usr/share/zoneinfo/posix/Asia/Kathmandu
#usr/share/zoneinfo/posix/Asia/Katmandu
#usr/share/zoneinfo/posix/Asia/Khandyga
#usr/share/zoneinfo/posix/Asia/Kolkata
#usr/share/zoneinfo/posix/Asia/Krasnoyarsk
#usr/share/zoneinfo/posix/Asia/Kuala_Lumpur
@@ -909,9 +906,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Asia/Qyzylorda
#usr/share/zoneinfo/posix/Asia/Rangoon
#usr/share/zoneinfo/posix/Asia/Riyadh
#usr/share/zoneinfo/posix/Asia/Riyadh87
#usr/share/zoneinfo/posix/Asia/Riyadh88
#usr/share/zoneinfo/posix/Asia/Riyadh89
#usr/share/zoneinfo/posix/Asia/Saigon
#usr/share/zoneinfo/posix/Asia/Sakhalin
#usr/share/zoneinfo/posix/Asia/Samarkand
@@ -930,6 +924,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Asia/Ulaanbaatar
#usr/share/zoneinfo/posix/Asia/Ulan_Bator
#usr/share/zoneinfo/posix/Asia/Urumqi
#usr/share/zoneinfo/posix/Asia/Ust-Nera
#usr/share/zoneinfo/posix/Asia/Vientiane
#usr/share/zoneinfo/posix/Asia/Vladivostok
#usr/share/zoneinfo/posix/Asia/Yakutsk
@@ -1045,6 +1040,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Europe/Brussels
#usr/share/zoneinfo/posix/Europe/Bucharest
#usr/share/zoneinfo/posix/Europe/Budapest
#usr/share/zoneinfo/posix/Europe/Busingen
#usr/share/zoneinfo/posix/Europe/Chisinau
#usr/share/zoneinfo/posix/Europe/Copenhagen
#usr/share/zoneinfo/posix/Europe/Dublin
@@ -1093,7 +1089,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Europe/Zagreb
#usr/share/zoneinfo/posix/Europe/Zaporozhye
#usr/share/zoneinfo/posix/Europe/Zurich
#usr/share/zoneinfo/posix/Factory
#usr/share/zoneinfo/posix/GB
#usr/share/zoneinfo/posix/GB-Eire
#usr/share/zoneinfo/posix/GMT
@@ -1129,10 +1124,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/Mexico/BajaNorte
#usr/share/zoneinfo/posix/Mexico/BajaSur
#usr/share/zoneinfo/posix/Mexico/General
#usr/share/zoneinfo/posix/Mideast
#usr/share/zoneinfo/posix/Mideast/Riyadh87
#usr/share/zoneinfo/posix/Mideast/Riyadh88
#usr/share/zoneinfo/posix/Mideast/Riyadh89
#usr/share/zoneinfo/posix/NZ
#usr/share/zoneinfo/posix/NZ-CHAT
#usr/share/zoneinfo/posix/Navajo
@@ -1491,6 +1482,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Asia/Kashgar
#usr/share/zoneinfo/right/Asia/Kathmandu
#usr/share/zoneinfo/right/Asia/Katmandu
#usr/share/zoneinfo/right/Asia/Khandyga
#usr/share/zoneinfo/right/Asia/Kolkata
#usr/share/zoneinfo/right/Asia/Krasnoyarsk
#usr/share/zoneinfo/right/Asia/Kuala_Lumpur
@@ -1514,9 +1506,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Asia/Qyzylorda
#usr/share/zoneinfo/right/Asia/Rangoon
#usr/share/zoneinfo/right/Asia/Riyadh
#usr/share/zoneinfo/right/Asia/Riyadh87
#usr/share/zoneinfo/right/Asia/Riyadh88
#usr/share/zoneinfo/right/Asia/Riyadh89
#usr/share/zoneinfo/right/Asia/Saigon
#usr/share/zoneinfo/right/Asia/Sakhalin
#usr/share/zoneinfo/right/Asia/Samarkand
@@ -1535,6 +1524,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Asia/Ulaanbaatar
#usr/share/zoneinfo/right/Asia/Ulan_Bator
#usr/share/zoneinfo/right/Asia/Urumqi
#usr/share/zoneinfo/right/Asia/Ust-Nera
#usr/share/zoneinfo/right/Asia/Vientiane
#usr/share/zoneinfo/right/Asia/Vladivostok
#usr/share/zoneinfo/right/Asia/Yakutsk
@@ -1650,6 +1640,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Europe/Brussels
#usr/share/zoneinfo/right/Europe/Bucharest
#usr/share/zoneinfo/right/Europe/Budapest
#usr/share/zoneinfo/right/Europe/Busingen
#usr/share/zoneinfo/right/Europe/Chisinau
#usr/share/zoneinfo/right/Europe/Copenhagen
#usr/share/zoneinfo/right/Europe/Dublin
@@ -1698,7 +1689,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Europe/Zagreb
#usr/share/zoneinfo/right/Europe/Zaporozhye
#usr/share/zoneinfo/right/Europe/Zurich
#usr/share/zoneinfo/right/Factory
#usr/share/zoneinfo/right/GB
#usr/share/zoneinfo/right/GB-Eire
#usr/share/zoneinfo/right/GMT
@@ -1734,10 +1724,6 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/Mexico/BajaNorte
#usr/share/zoneinfo/right/Mexico/BajaSur
#usr/share/zoneinfo/right/Mexico/General
#usr/share/zoneinfo/right/Mideast
#usr/share/zoneinfo/right/Mideast/Riyadh87
#usr/share/zoneinfo/right/Mideast/Riyadh88
#usr/share/zoneinfo/right/Mideast/Riyadh89
#usr/share/zoneinfo/right/NZ
#usr/share/zoneinfo/right/NZ-CHAT
#usr/share/zoneinfo/right/Navajo

1
config/rootfiles/core/76/exclude
View File

@@ -9,6 +9,7 @@ etc/shadow
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules

1
config/rootfiles/core/76/filelists/beep Symbolic link
View File

@@ -0,0 +1 @@
../../../common/beep

1
config/rootfiles/core/76/filelists/tzdata Symbolic link
View File

@@ -0,0 +1 @@
../../../common/tzdata

1
config/rootfiles/core/76/filelists/wpa_supplicant Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wpa_supplicant

11
config/rootfiles/core/76/update.sh
View File

@@ -110,6 +110,9 @@ add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
add_to_backup etc/inittab
add_to_backup etc/fstab
add_to_backup usr/share/usb_modeswitch
add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
add_to_backup usr/local/bin/dialctrl.pl
# Backup the files
tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
@@ -140,6 +143,14 @@ rm -rf /lib/modules
# Remove old usb_modeswitch_data
rm -rf /usr/share/usb_modeswitch
# Remove old tzdata
rm -rf /usr/share/zoneinfo
# Remove dialctrl.pl script
rm -f \
/etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \
/etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \
/usr/local/bin/dialctrl.pl
#
# Remove old udev rules.

4
doc/language_issues.de
View File

@@ -57,6 +57,7 @@ WARNING: translation string unused: alt vpn
WARNING: translation string unused: and
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup config floppy
WARNING: translation string unused: backup configuration
@@ -117,6 +118,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: description
@@ -133,6 +135,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -525,6 +528,7 @@ WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
WARNING: translation string unused: tor exit country
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad

4
doc/language_issues.en
View File

@@ -58,6 +58,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -136,6 +137,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: description
@@ -154,6 +156,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -557,6 +560,7 @@ WARNING: translation string unused: tor accounting period weekly
WARNING: translation string unused: tor bridge enabled
WARNING: translation string unused: tor errmsg invalid node id
WARNING: translation string unused: tor exit country
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad

18
doc/language_issues.es
View File

@@ -54,6 +54,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -494,6 +496,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -589,6 +592,8 @@ WARNING: untranslated string: ccd err invalidname
WARNING: untranslated string: ccd err invalidnet
WARNING: untranslated string: ccd err irouteexist
WARNING: untranslated string: ccd err isipsecnet
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd err isovpnnet
WARNING: untranslated string: ccd err issubnet
WARNING: untranslated string: ccd err name
@@ -611,9 +616,13 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
@@ -637,6 +646,7 @@ WARNING: untranslated string: drop outgoing
WARNING: untranslated string: emerging rules
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
WARNING: untranslated string: fireinfo is enabled
@@ -656,6 +666,7 @@ WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -725,6 +736,7 @@ WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
@@ -801,6 +813,7 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -814,6 +827,7 @@ WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
@@ -868,6 +882,8 @@ WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting

18
doc/language_issues.fr
View File

@@ -54,6 +54,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -505,6 +507,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -599,6 +602,8 @@ WARNING: untranslated string: ccd err invalidname
WARNING: untranslated string: ccd err invalidnet
WARNING: untranslated string: ccd err irouteexist
WARNING: untranslated string: ccd err isipsecnet
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd err isovpnnet
WARNING: untranslated string: ccd err issubnet
WARNING: untranslated string: ccd err name
@@ -621,9 +626,13 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
@@ -648,6 +657,7 @@ WARNING: untranslated string: drop outgoing
WARNING: untranslated string: emerging rules
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
WARNING: untranslated string: fireinfo is enabled
@@ -667,6 +677,7 @@ WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -736,6 +747,7 @@ WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
@@ -812,6 +824,7 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -825,6 +838,7 @@ WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: ntp common settings
@@ -876,6 +890,8 @@ WARNING: untranslated string: snort working
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting

18
doc/language_issues.nl
View File

@@ -54,6 +54,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -150,6 +151,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -510,6 +512,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -587,9 +590,15 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd iroute2
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
@@ -612,8 +621,10 @@ WARNING: untranslated string: drop forward
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -683,6 +694,7 @@ WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
@@ -759,6 +771,7 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -771,6 +784,7 @@ WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
@@ -795,6 +809,8 @@ WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: ssh
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes

18
doc/language_issues.pl
View File

@@ -54,6 +54,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -494,6 +496,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -589,6 +592,8 @@ WARNING: untranslated string: ccd err invalidname
WARNING: untranslated string: ccd err invalidnet
WARNING: untranslated string: ccd err irouteexist
WARNING: untranslated string: ccd err isipsecnet
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd err isovpnnet
WARNING: untranslated string: ccd err issubnet
WARNING: untranslated string: ccd err name
@@ -611,9 +616,13 @@ WARNING: untranslated string: ccd none
WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
@@ -637,6 +646,7 @@ WARNING: untranslated string: drop outgoing
WARNING: untranslated string: emerging rules
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: fireinfo ipfire version
WARNING: untranslated string: fireinfo is disabled
WARNING: untranslated string: fireinfo is enabled
@@ -656,6 +666,7 @@ WARNING: untranslated string: fireinfo why read more
WARNING: untranslated string: fireinfo your profile id
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -725,6 +736,7 @@ WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
@@ -801,6 +813,7 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
@@ -814,6 +827,7 @@ WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
@@ -868,6 +882,8 @@ WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: system information
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting

18
doc/language_issues.ru
View File

@@ -54,6 +54,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -147,6 +148,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -499,6 +501,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -592,6 +595,8 @@ WARNING: untranslated string: ccd err invalidname
WARNING: untranslated string: ccd err invalidnet
WARNING: untranslated string: ccd err irouteexist
WARNING: untranslated string: ccd err isipsecnet
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd err isovpnnet
WARNING: untranslated string: ccd err issubnet
WARNING: untranslated string: ccd err name
@@ -615,9 +620,13 @@ WARNING: untranslated string: ccd routes
WARNING: untranslated string: ccd subnet
WARNING: untranslated string: ccd used
WARNING: untranslated string: community rules
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: deprecated fs warn
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
@@ -642,6 +651,7 @@ WARNING: untranslated string: drop outgoing
WARNING: untranslated string: emerging rules
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: extrahd because there is already a device mounted
WARNING: untranslated string: extrahd cant umount
WARNING: untranslated string: extrahd install or load driver
@@ -651,6 +661,7 @@ WARNING: untranslated string: extrahd to root
WARNING: untranslated string: extrahd you cant mount
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
@@ -720,6 +731,7 @@ WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
@@ -796,6 +808,7 @@ WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: incoming traffic in bytes per second
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
@@ -810,6 +823,7 @@ WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn default
@@ -858,6 +872,8 @@ WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: ssh
WARNING: untranslated string: static routes
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes

72
doc/language_issues.tr
View File

@@ -59,6 +59,7 @@ WARNING: translation string unused: and
WARNING: translation string unused: ansi t1.483
WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: attemps
WARNING: translation string unused: available updates
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -137,6 +138,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: description
@@ -155,6 +157,7 @@ WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -214,6 +217,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
WARNING: translation string unused: forwarding rule updated
@@ -243,7 +247,6 @@ WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost addrule
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
WARNING: translation string unused: fwhost changeremark
@@ -303,6 +306,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
@@ -554,6 +558,7 @@ WARNING: translation string unused: tor accounting period weekly
WARNING: translation string unused: tor bridge enabled
WARNING: translation string unused: tor errmsg invalid node id
WARNING: translation string unused: tor exit country
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
WARNING: translation string unused: traffic calc time bad
@@ -629,76 +634,39 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: default ip
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns servers
WARNING: untranslated string: downlink
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
WARNING: untranslated string: drop action1
WARNING: untranslated string: drop action2
WARNING: untranslated string: drop forward
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: fwdfw dnat extport
WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw hint mac
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: flag
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: hardware support
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name
WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: ssh
WARNING: untranslated string: support donation
WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: uplink
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: upload dh key
WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: wlan clients

56
doc/language_missings
View File

@@ -39,6 +39,8 @@
< ccd err iroute
< ccd err irouteexist
< ccd err isipsecnet
< ccd err isipsecrw
< ccd err isovpnn2n
< ccd err isovpnnet
< ccd err issubnet
< ccd err name
@@ -63,8 +65,13 @@
< ccd routes
< ccd subnet
< ccd used
< count
< countries
< countrycode
< country codes and flags
< default ip
< deprecated fs warn
< details
< dh
< dh key warn
< dh name is invalid
@@ -86,6 +93,7 @@
< drop outgoing
< encryption
< entropy
< entropy graphs
< fireinfo ipfire version
< fireinfo is disabled
< fireinfo is enabled
@@ -104,6 +112,7 @@
< fireinfo why read more
< fireinfo your profile id
< firewall rules
< flag
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -186,6 +195,7 @@
< fwdfw use nat
< fwdfw use srcport
< fwdfw use srv
< fwdfw warn1
< fwdfw wd_fri
< fwdfw wd_mon
< fwdfw wd_sat
@@ -281,6 +291,7 @@
< gen dh
< generate dh key
< grouptype
< hardware support
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -295,6 +306,7 @@
< minute
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< ntp common settings
@@ -346,6 +358,8 @@
< ssh
< static routes
< support donation
< system has hwrng
< system has rdrand
< system information
< tor
< tor 0 = disabled
@@ -497,6 +511,8 @@
< ccd err iroute
< ccd err irouteexist
< ccd err isipsecnet
< ccd err isipsecrw
< ccd err isovpnn2n
< ccd err isovpnnet
< ccd err issubnet
< ccd err name
@@ -521,8 +537,13 @@
< ccd routes
< ccd subnet
< ccd used
< count
< countries
< countrycode
< country codes and flags
< default ip
< deprecated fs warn
< details
< dh
< dh key warn
< dh name is invalid
@@ -543,6 +564,7 @@
< drop outgoing
< encryption
< entropy
< entropy graphs
< fireinfo ipfire version
< fireinfo is disabled
< fireinfo is enabled
@@ -561,6 +583,7 @@
< fireinfo why read more
< fireinfo your profile id
< firewall rules
< flag
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -643,6 +666,7 @@
< fwdfw use nat
< fwdfw use srcport
< fwdfw use srv
< fwdfw warn1
< fwdfw wd_fri
< fwdfw wd_mon
< fwdfw wd_sat
@@ -738,6 +762,7 @@
< gen dh
< generate dh key
< grouptype
< hardware support
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -752,6 +777,7 @@
< minute
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< openvpn default
@@ -819,6 +845,8 @@
< ssh
< static routes
< support donation
< system has hwrng
< system has rdrand
< system information
< tor
< tor 0 = disabled
@@ -946,6 +974,8 @@
< ccd err iroute
< ccd err irouteexist
< ccd err isipsecnet
< ccd err isipsecrw
< ccd err isovpnn2n
< ccd err isovpnnet
< ccd err issubnet
< ccd err name
@@ -970,8 +1000,13 @@
< ccd routes
< ccd subnet
< ccd used
< count
< countries
< countrycode
< country codes and flags
< default ip
< deprecated fs warn
< details
< dh
< dh key warn
< dh name is invalid
@@ -992,6 +1027,7 @@
< drop outgoing
< encryption
< entropy
< entropy graphs
< extrahd because there is already a device mounted
< extrahd cant umount
< extrahd install or load driver
@@ -1002,6 +1038,7 @@
< extrahd unable to write
< extrahd you cant mount
< firewall rules
< flag
< forward firewall
< fw default drop
< fwdfw ACCEPT
@@ -1084,6 +1121,7 @@
< fwdfw use nat
< fwdfw use srcport
< fwdfw use srv
< fwdfw warn1
< fwdfw wd_fri
< fwdfw wd_mon
< fwdfw wd_sat
@@ -1179,6 +1217,7 @@
< gen dh
< generate dh key
< grouptype
< hardware support
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
@@ -1193,6 +1232,7 @@
< minute
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< openvpn default
@@ -1245,6 +1285,8 @@
< ssh
< static routes
< support donation
< system has hwrng
< system has rdrand
< tor
< tor 0 = disabled
< tor accounting
@@ -1372,6 +1414,8 @@
< ccd err iroute
< ccd err irouteexist
< ccd err isipsecnet
< ccd err isipsecrw
< ccd err isovpnn2n
< ccd err isovpnnet
< ccd err issubnet
< ccd err name
@@ -1396,9 +1440,14 @@
< ccd routes
< ccd subnet
< ccd used
< count
< countries
< countrycode
< country codes and flags
< day-graph
< default ip
< deprecated fs warn
< details
< dh
< dh key warn
< dh name is invalid
@@ -1421,6 +1470,7 @@
< Edit an existing route
< encryption
< entropy
< entropy graphs
< extrahd because there is already a device mounted
< extrahd cant umount
< extrahd install or load driver
@@ -1431,6 +1481,7 @@
< extrahd unable to write
< extrahd you cant mount
< firewall rules
< flag
< forward firewall
< frequency
< fw default drop
@@ -1514,6 +1565,7 @@
< fwdfw use nat
< fwdfw use srcport
< fwdfw use srv
< fwdfw warn1
< fwdfw wd_fri
< fwdfw wd_mon
< fwdfw wd_sat
@@ -1609,6 +1661,7 @@
< gen dh
< generate dh key
< grouptype
< hardware support
< hour-graph
< incoming traffic in bytes per second
< integrity
@@ -1626,6 +1679,7 @@
< month-graph
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< openvpn default
@@ -1675,6 +1729,8 @@
< ssh
< static routes
< support donation
< system has hwrng
< system has rdrand
< tor
< tor 0 = disabled
< tor accounting

59
html/cgi-bin/country.cgi
View File

@@ -36,18 +36,18 @@ require "${General::swroot}/header.pl";
&Header::showhttpheaders();
&Header::openpage('Country Codes', 1, '');
&Header::openbigbox('100%', 'LEFT');
&Header::openpage($Lang::tr{'countries'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:');
print "<TABLE WIDTH='100%' border='0' class='tbl'>";
print "<tr><th width='5%'><b>Flag</b></th>";
print "<th width='5%'><b>Code</b></th>";
print "<th width='40%'><b>$Lang::tr{'country'}</b></th>";
print "<th><b>&nbsp;</b></th>";
print "<th width='5%'><b>Flag</b></th>";
print "<th width='5%'><b>Code</b></th>";
print "<th width='40%'><b>$Lang::tr{'country'}</b></th></tr>";
&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
print "<table class='tbl'>";
print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
print "<th>&nbsp;</th>";
print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
@flaglist = <$flagdir/*>;
@@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles)
if($fcode eq 'tp') { $country = 'East Timor'; }
if($fcode eq 'yu') { $country = 'Yugoslavia'; }
if ($lines % 2) {
print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td></tr>\n";
}
else {
$lines2++;
if($lines2 % 2) {
print "<tr>";
$col="bgcolor='${Header::table2colour}'";
} else {
print "<tr>";
$col="bgcolor='${Header::table1colour}'";
}
print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td>";
print "<td $col>&nbsp;</td>";
else {
$lines2++;
if($lines2 % 2) {
$col="style='background-color:${Header::table2colour};'";
} else {
$col="style='background-color:${Header::table1colour};'";
}
print "<tr>";
print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td>";
print "<td $col>&nbsp;</td>";
}
}
print "</TABLE>";
print "</table>";
&Header::closebox();
&Header::closebigbox();
print <<END
<div align='center'>
<table width='80%'>
<tr>
<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
</tr>
</table>
<div style='text-align:center'>
<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
</div>
END
;

36
html/cgi-bin/entropy.cgi
View File

@@ -48,6 +48,42 @@ if ( $querry[0] ne~ "") {
&Graphs::makegraphbox("entropy.cgi", "day", '', 350);
&Header::closebox();
# Check for hardware support.
my $message;
my $message_colour = $Header::colourred;
if (&has_hwrng()) {
$message = $Lang::tr{'system has hwrng'};
$message_colour = $Header::colourgreen;
} elsif (&has_rdrand()) {
$message = $Lang::tr{'system has rdrand'};
$message_colour = $Header::colourgreen;
} else {
$message = $Lang::tr{'no hardware random number generator'};
}
&Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
print <<EOF;
<p style="color: $message_colour; text-align: center;">$message</p>
EOF
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
}
sub has_hwrng() {
return (-c "/dev/hwrng");
}
sub has_rdrand() {
open(FILE, "/proc/cpuinfo") or return 0;
my @cpuinfo = <FILE>;
close(FILE);
my @result = grep(/rdrand/, @cpuinfo);
if (@result) {
return 1;
}
return 0;
}

64
html/cgi-bin/firewall.cgi
View File

@@ -1540,6 +1540,7 @@ sub newrule
$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
$selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected';
}
}
$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1632,25 +1633,28 @@ END
</td>
END
if (%aliases) {
print <<END;
print <<END;
<td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
<td width='30%'>
<select name='dnat' style='width: 100%;'>
<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
<option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($redip)</option>
END
if (%aliases) {
foreach my $alias (sort keys %aliases) {
print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
print "</select>";
} else {
print <<END;
<td colspan="2" width='55%'>
<input type='hidden' name='dnat' value='Default IP'>
</td>
END
}
#DNAT Dropdown
foreach my $network (sort keys %defaultNetworks)
{
if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{'dnat'} eq $defaultNetworks{$network}{'NAME'});
print ">$network ($defaultNetworks{$network}{'NET'})</option>";
}
}
print "</select>";
print "</tr>";
#SNAT
@@ -1671,19 +1675,14 @@ END
foreach my $alias (sort keys %aliases) {
print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
# XXX this is composed in a very ugly fashion
# SNAT Dropdown
foreach my $network (sort keys %defaultNetworks) {
next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
next if($defaultNetworks{$network}{'NAME'} eq "ALL");
next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
print ">$network ($defaultNetworks{$network}{'NET'})</option>";
if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{'snat'} eq $defaultNetworks{$network}{'NAME'});
print ">$network ($defaultNetworks{$network}{'NET'})</option>";
}
}
print <<END;
</select>
</td>
@@ -2375,26 +2374,18 @@ END
if($$hash{$key}[3] eq 'ipsec_net_src'){
if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[3] eq 'ovpn_net_src'){
if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[3] eq 'ovpn_n2n_src'){
if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[3] eq 'ovpn_host_src'){
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}
}
@@ -2402,26 +2393,18 @@ END
if($$hash{$key}[5] eq 'ipsec_net_tgt'){
if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){
if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){
if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}
}
@@ -2429,15 +2412,11 @@ END
foreach my $netgroup (sort keys %customgrp){
if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}
foreach my $srvgroup (sort keys %customservicegrp){
if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){
$coloryellow='on';
&disable_rule($key);
$$hash{$key}[2]='';
}
}
$$hash{'ACTIVE'}=$$hash{$key}[2];
@@ -2573,6 +2552,7 @@ END
END
#Is this a DNAT rule?
if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
if ($$hash{$key}[29] eq 'Default IP'){$$hash{$key}[29]=$Lang::tr{'red1'};}
print "Firewall ($$hash{$key}[29])";
if($$hash{$key}[30] ne ''){
$$hash{$key}[30]=~ tr/|/,/;

89
html/cgi-bin/fwhosts.cgi
View File

@@ -21,7 +21,8 @@
use strict;
# enable only the following on debugging purpose
use warnings;
#use warnings;
use Sort::Naturally;
use CGI::Carp 'fatalsToBrowser';
no warnings 'uninitialized';
@@ -1235,7 +1236,7 @@ END
<tr><form method='post' style='display:inline'>
<td>$Lang::tr{'remark'}:</td>
<td colspan='2' style='width:98%;'><input type='TEXT' name='newrem' value='$fwhostsettings{'remark'}' style='width:98%;'></td>
<td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td>
<td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='grp' value='$fwhostsettings{'grp_name'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td>
</tr>
</table></form>
<br><br>
@@ -1255,7 +1256,7 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='DEFAULT_SRC_ADR' style='min-width:16em;'>
<select name='DEFAULT_SRC_ADR' style='width:16em;'>
END
foreach my $network (sort keys %defaultNetworks)
{
@@ -1284,7 +1285,7 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='CUST_SRC_NET' style='min-width:16em;'>";
<select name='CUST_SRC_NET' style='width:16em;'>";
END
foreach my $key (sort { ncmp($customnetwork{$a}[0],$customnetwork{$b}[0]) } keys %customnetwork) {
print"<option>$customnetwork{$key}[0]</option>";
@@ -1301,7 +1302,7 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='CUST_SRC_HOST' style='min-width:16em;'>";
<select name='CUST_SRC_HOST' style='width:16em;'>";
END
foreach my $key (sort { ncmp($customhost{$a}[0],$customhost{$b}[0]) } keys %customhost) {
print"<option>$customhost{$key}[0]</option>";
@@ -1321,7 +1322,7 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='OVPN_CCD_NET' style='min-width:16em;'>";
<select name='OVPN_CCD_NET' style='width:16em;'>";
END
foreach my $key (sort { ncmp($ccdnet{$a}[0],$ccdnet{$b}[0]) } keys %ccdnet)
{
@@ -1330,10 +1331,17 @@ END
print"</select></td></tr>";
}
#OVPN clients
my @ovpn_clients=();
foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost)
{
if ($ccdhost{$key}[33] ne ''){
print<<END;
$show='1';
push (@ovpn_clients,$ccdhost{$key}[1]);
}
}
if ($show eq '1'){
$show='';
print<<END;
<td style='width:15em;'>
<label>
<input type='radio' name='grp2' value='ovpn_host' $checked{'grp2'}{'ovpn_host'}>
@@ -1341,17 +1349,24 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='OVPN_CCD_HOST' style='min-width:16em;'>" if ($show eq '');
<select name='OVPN_CCD_HOST' style='width:16em;'>" if ($show eq '');
END
$show='1';
print"<option value='$ccdhost{$key}[1]'>$ccdhost{$key}[1]</option>";
foreach(@ovpn_clients){
print"<option value='$_'>$_</option>";
}
print"</select></td></tr>";
}
if ($show eq '1'){$show='';print"</select></td></tr>";}
#OVPN n2n networks
my @OVPN_N2N=();
foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) {
if($ccdhost{$key}[3] eq 'net'){
print<<END;
$show='1';
push (@OVPN_N2N,$ccdhost{$key}[1]);
}
}
if ($show eq '1'){
$show='';
print<<END;
<td style='width:15em;'>
<label>
<input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}>
@@ -1359,17 +1374,24 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='OVPN_N2N' style='min-width:16em;'>"
<select name='OVPN_N2N' style='width:16em;'>"
END
$show='1';
print"<option>$ccdhost{$key}[1]</option>";
foreach(@OVPN_N2N){
print"<option>$_</option>";
}
print"</select></td></tr>";
}
if ($show eq '1'){$show='';print"</select></td></tr>";}
#IPsec networks
my @IPSEC_N2N=();
foreach my $key (sort { ncmp($ipsecconf{$a}[0],$ipsecconf{$b}[0]) } keys %ipsecconf) {
if ($ipsecconf{$key}[3] eq 'net'){
print<<END;
$show='1';
push (@IPSEC_N2N,$ipsecconf{$key}[1]);
}
}
if ($show eq '1'){
$show='';
print<<END;
<td style='width:15em;'>
<label>
<input type='radio' name='grp2' id='IPSEC_NET' value='ipsec_net' $checked{'grp2'}{'ipsec_net'}>
@@ -1377,13 +1399,13 @@ END
</label>
</td>
<td style='text-align:right;'>
<select name='IPSEC_NET' style='min-width:16em;'>"
<select name='IPSEC_NET' style='width:16em;'>"
END
$show='1';
print"<option value='$ipsecconf{$key}[1]'>$ipsecconf{$key}[1]</option>";
foreach(@IPSEC_N2N){
print"<option value='$_'>$_</option>";
}
}
if ($show eq '1'){$show='';print"</select></td></tr>";}
print"</select></td></tr>";
print"</table>";
print"</td></tr></table>";
print"<br><br>";
@@ -1478,9 +1500,28 @@ END
print<<END;
<table width='100%'><form method='post' style='display:inline'>
<tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='text' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}' size='14'></td><td align='left'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvgrpname' value='$fwhostsettings{'oldsrvgrpname'}'><input type='hidden' name='ACTION' value='changesrvgrpname'></td><td width='3%'></td></form></tr>
<tr><form method='post'><td width='10%'>$Lang::tr{'remark'}:</td><td colspan='2'><input type='text' name='newsrvrem' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='changesrvgrpremark' ></td></tr>
<tr><td colspan='4'><br></td></td></tr>
</table></form>
<tr>
<form method='post'>
<td width='10%'>
$Lang::tr{'remark'}:
</td>
<td colspan='2'>
<input type='text' name='newsrvrem' value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'>
</td>
<td align='right'>
<input type='submit' value='$Lang::tr{'fwhost change'}'>
<input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'>
<input type='hidden' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}'>
<input type='hidden' name='ACTION' value='changesrvgrpremark' >
</td>
</tr>
<tr>
<td colspan='4'>
<br>
</td>
</tr>
</table>
</form>
END
}
if($fwhostsettings{'updatesrvgrp'} eq 'on'){

2
html/cgi-bin/index.cgi
View File

@@ -228,8 +228,6 @@ END
#Dial profiles
if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
# The dialctrl.pl script outputs html
print `/usr/local/bin/dialctrl.pl show`;
if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
print <<END;
<br/>

10
html/cgi-bin/logs.cgi/firewalllogip.dat
View File

@@ -397,9 +397,9 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
print "<table align='center'><tr><td>";
print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
print "</td></tr></table>";
print "</div>";
}
print <<END
@@ -408,7 +408,7 @@ print <<END
<th width='10%' align='center' class='boldbase'></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'ip address'}</b></th>
<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
<th width='10%' align='center' class='boldbase'><b>Count</b></th>
<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -439,10 +439,10 @@ for($s=0;$s<$lines;$s++)
my $fcode = lc($ccode);
$color++;
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></td>";
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
if ( $fcode ne "" ){
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";}
else {
print "<td align='center' $col></td>";}
print "<td align='center' $col>$value[$s]</td>";

10
html/cgi-bin/logs.cgi/firewalllogport.dat
View File

@@ -400,17 +400,17 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
print "<table align='center'><tr><td>";
print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-port$imagerandom.png'>";
print "</td></tr></table>";
print "</div>";
}
print <<END
<table width='100%' CLASS='tbl'>
<table width='100%' class='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'port'}</b></th>
<th width='33%' align='center' class='boldbase'><b>count</b></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++)
print "<tr>";
$color++;
print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col>$key[$s]</td>";
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";

21
html/cgi-bin/ovpnmain.cgi
View File

@@ -2357,7 +2357,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
} else {
$errormessage = $Lang::tr{'invalid key'};
}
&General::firewall_reload();
###
### Download PKCS12 file
@@ -3756,8 +3756,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
goto VPNCONF_ERROR;
}
}
#Check if remote subnet is used elsewhere
my ($n2nip,$n2nsub)=split("/",$cgiparams{'REMOTE_SUBNET'});
$warnmessage=&General::checksubnets('',$n2nip,'ovpn');
if ($warnmessage){
$warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) <br>".$warnmessage;
}
}
# if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
@@ -4896,6 +4901,16 @@ END
&Header::closebox();
}
if ($warnmessage) {
&Header::openbox('100%', 'LEFT', $Lang::tr{'warning messages'});
print "$warnmessage<br>";
print "$Lang::tr{'fwdfw warn1'}<br>";
&Header::closebox();
print"<center><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'ok'}' style='width: 5em;'></form>";
&Header::closepage();
exit 0;
}
my $sactive = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='50%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'stopped'}</font></b></td></tr></table>";
my $srunning = "no";
my $activeonrun = "";

27
html/cgi-bin/vpnmain.cgi
View File

@@ -1225,7 +1225,7 @@ END
} else {
$errormessage = $Lang::tr{'invalid key'};
}
&General::firewall_reload();
###
### Choose between adding a host-net or net-net connection
###
@@ -1407,14 +1407,13 @@ END
goto VPNCONF_ERROR;
}
#temporary disabled (BUG 10294)
# if ($cgiparams{'TYPE'} eq 'net'){
# $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
# if ($errormessage ne ''){
# goto VPNCONF_ERROR;
# }
#
# }
if ($cgiparams{'TYPE'} eq 'net'){
$warnmessage=&General::checksubnets('',$cgiparams{'REMOTE_SUBNET'},'ipsec');
if ($warnmessage ne ''){
$warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) <br>".$warnmessage;
}
}
if ($cgiparams{'AUTH'} eq 'psk') {
if (! length($cgiparams{'PSK'}) ) {
$errormessage = $Lang::tr{'pre-shared key is too short'};
@@ -2612,6 +2611,16 @@ EOF
&Header::closebox();
}
if ($warnmessage) {
&Header::openbox('100%', 'left', $Lang::tr{'warning messages'});
print "$warnmessage<br>";
print "$Lang::tr{'fwdfw warn1'}<br>";
&Header::closebox();
print"<center><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'ok'}' style='width: 5em;'></form>";
&Header::closepage();
exit 0;
}
&Header::openbox('100%', 'left', $Lang::tr{'global settings'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>

68
html/cgi-bin/wlanap.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -258,7 +258,25 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
$monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'};
}
my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
my @channellist_cmd;
my @channellist;
if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`;
chomp $wiphy;
@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`;
# get available channels
my @temp;
foreach (@channellist_cmd){
$_ =~ /(.*) \[(\d+)(.*)\]/;
$channel = $2;chomp $channel;
if ( $channel =~ /\d+/ ){push(@temp,$channel);}
}
@channellist = @temp;
} else {
@channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
# get available channels
my @temp;
@@ -267,7 +285,8 @@ $_ =~ /(.*)Channel (\d+)(.*):/;
$channel = $2;chomp $channel;
if ( $channel =~ /\d+/ ){push(@temp,$channel);}
}
my @channellist = @temp;
@channellist = @temp;
}
my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
# get available country codes
@@ -488,12 +507,12 @@ print <<END
</table>
END
;
my @status;
if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
$status = `wlanconfig $wlanapsettings{'INTERFACE'} list`;
@status = `wlanconfig $wlanapsettings{'INTERFACE'} list`;
}
if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
$status = `iw dev $wlanapsettings{'INTERFACE'} station dump`;
@status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump`;
}
print <<END
<br />
@@ -501,33 +520,37 @@ print <<END
<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++;
}
for (my $i=0;$i<$#status;$i++){
if (@status[$i]=~"^Station ") { $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++;
print"<tr><td colspan='3' $col><pre>@status[$i]</pre></td></tr>";
if (! @status[$i]=~"^/t" ) { $count++; }
}
for (my $i=0;$i<$#txpower_cmd;$i=$i+4){
next if (@txpower_cmd[$i] =~ /mon/i);
$count++;
foreach my $nr (@channellist_cmd){
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>";
print"<tr><td colspan='3' $col>$nr</td></tr>";
$count++;
}
for (my $i=0;$i<$#txpower_cmd;$i=$i+2){
if ($count % 2){
$col="bgcolor='$color{'color20'}'";
}else{
$col="bgcolor='$color{'color22'}'";
}
print "<tr><td $col>@txpower_cmd[$i]</td></tr>";
$count++;
}
print "</table><br>";
@@ -557,6 +580,7 @@ driver=$wlanapsettings{'DRIVER_HOSTAPD'}
interface=$wlanapsettings{'INTERFACE'}
country_code=$wlanapsettings{'COUNTRY'}
ieee80211d=1
ieee80211h=1
channel=$wlanapsettings{'CHANNEL'}
END
;

2
html/html/themes/ipfire/include/functions.pl
View File

@@ -110,7 +110,7 @@ sub openpage {
&genmenu();
my $headline = "IPFire";
if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
$headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
}

20
langs/de/cgi-bin/de.pl
View File

@@ -480,8 +480,10 @@
'ccd err iroute' => 'Netzadresse für Route ungültig.',
'ccd err irouteexist' => 'Diese Route wird bereits verwendet.',
'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.',
'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!',
'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.',
'ccd err isipsecrw' => 'Diese Subnetzadresse wird bereits für das IPsec-RW Netz verwendet.',
'ccd err isovpnn2n' => 'Die Subnetzadresse wird für bereits für eine OpenVPN Netz-zu-Netz-Verbindung verwendet.',
'ccd err isovpnnet' => 'Die Subnetzadresse wird für bereits für den OpenVPN-Server verwendet.',
'ccd err issubnet' => 'Die Subnetzadresse wird bereits verwendet.',
'ccd err name' => 'Es muss ein Name angegeben werden.',
'ccd err nameexist' => 'Name existiert bereits.',
'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.',
@@ -563,7 +565,11 @@
'could not open installed updates file' => 'Datei mit Update-Liste konnte nicht geöffnet werden',
'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
'count' => 'Anzahl',
'countries' => 'Länder',
'country' => 'Land',
'country codes and flags' => 'Länder und Länderkennungen',
'countrycode' => 'Kennung',
'cpu frequency per' => 'CPU-Frequenz pro',
'cpu idle usage' => 'Leerlauf CPU-Nutzung',
'cpu interrupt usage' => 'Interrupt CPU-Nutzung',
@@ -643,6 +649,7 @@
'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.',
'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.',
'detail level' => 'Detaillierungsgrad',
'details' => 'Mehr',
'device' => 'Gerät',
'devices on blue' => 'Geräte auf Blau',
'dh' => 'Diffie-Hellman Key',
@@ -702,7 +709,7 @@
'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu',
'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
'dnat address' => 'Externe IP-Adresse',
'dnat address' => 'Firewall-Interface',
'dns address deleted' => 'Erfolgreich gelöscht! ',
'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',
@@ -813,6 +820,7 @@
'enter ack class' => 'Legen Sie hier die ACK-Klasse fest <br /> und klicken Sie danach auf <i>Speichern</i>.',
'enter data' => 'Geben Sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
'entropy' => 'Entropie',
'entropy graphs' => 'Entropiegraphen',
'err bk 1' => 'Fehler beim Erzeugen des Archivs',
'err bk 10 password' => 'Fehler beim Datensicherungs-Passwort',
'err bk 2 key' => 'Fehler beim Erzeugen der Schlüsseldatei',
@@ -897,6 +905,7 @@
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
'flag' => 'Flagge',
'force update' => 'Aktualisierung erzwingen',
'force user' => 'Standardbenutzer für das UNIX Dateisystem',
'forward firewall' => 'Firewall',
@@ -1004,6 +1013,7 @@
'fwdfw use srcport' => 'Quellport:',
'fwdfw use srv' => 'Zielport:',
'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.',
'fwdfw warn1' => 'Dies kann dazu führen, dass Firewallregeln auf Netze angewendet werden, für die sie nicht gedacht sind.',
'fwdfw wd_fri' => 'Fr',
'fwdfw wd_mon' => 'Mo',
'fwdfw wd_sat' => 'Sa',
@@ -1132,6 +1142,7 @@
'harddisk temperature' => 'Festplattentemperatur',
'harddisk temperature graphs' => 'HDD-Diagramme',
'hardware graphs' => 'Hardware-Diagramme',
'hardware support' => 'Hardware-Unterstützung',
'hdd temperature in' => 'Festplattentemperatur in',
'help' => 'Hilfe',
'high' => 'Hoch',
@@ -1507,6 +1518,7 @@
'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.',
'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.',
'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.',
'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.',
'no information available' => 'Keine Informationen verfügbar.',
'no log selected' => 'kein Log ausgewählt',
'no modem selected' => 'Kein Modem ausgewählt',
@@ -1987,6 +1999,8 @@
'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro',
'system' => 'System',
'system graphs' => 'System-Diagramme',
'system has hwrng' => 'Dieses System hat einen Hardware-Zufallszahlengenerator.',
'system has rdrand' => 'Dieses System unterstützt Intel(R) RDRAND.',
'system information' => 'Systeminformationen',
'system log viewer' => 'Betrachter der System-Logdateien',
'system logs' => 'System-Logdateien',

20
langs/en/cgi-bin/en.pl
View File

@@ -498,8 +498,10 @@
'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.',
'ccd err iroute' => 'Network address for route is invalid.',
'ccd err irouteexist' => 'This route is already in use.',
'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.',
'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.',
'ccd err isipsecnet' => 'The given subnet address is already used by an IPsec network.',
'ccd err isipsecrw' => 'The given subnet address is already used by the IPsec rw network.',
'ccd err isovpnn2n' => 'The subnet address is already in use for an OpenVPN net-to-net connection.',
'ccd err isovpnnet' => 'The subnet address is already in use for the OpenVPN server.',
'ccd err issubnet' => 'Subnet address already in use.',
'ccd err name' => 'Please choose a name.',
'ccd err nameexist' => 'Name already exists.',
@@ -584,7 +586,11 @@
'could not open installed updates file' => 'Could not open installed updates file',
'could not open update information file' => 'Could not open update information file. The update file is corrupt.',
'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
'count' => 'Count',
'countries' => 'Countries',
'country' => 'Country',
'country codes and flags' => 'Country Codes and Flags:',
'countrycode' => 'Code',
'cpu frequency per' => 'CPU frequency per',
'cpu idle usage' => 'Idle CPU Usage',
'cpu interrupt usage' => 'Interrupt CPU Usage',
@@ -665,6 +671,7 @@
'destination port numbers' => 'Destination port must be a valid port number or port range.',
'destination port overlaps' => 'Destination port range overlaps an existing port range.',
'detail level' => 'Detail level',
'details' => 'Details',
'device' => 'Device',
'devices on blue' => 'Devices on BLUE',
'dh' => 'Diffie-Hellman Key',
@@ -726,7 +733,7 @@
'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
'dnat address' => 'External IP address',
'dnat address' => 'Firewall Interface',
'dns address deleted' => 'Successfully deleted!',
'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
'dns address done' => 'The DNS-Server address settings are going to be saved.',
@@ -839,6 +846,7 @@
'enter ack class' => 'Enter the ACK- Class <br /> and then press <i>Save</i>.',
'enter data' => 'Enter your settings <br /> and then press <i>Save</i>.',
'entropy' => 'Entropy',
'entropy graphs' => 'Entropy Graphs',
'err bk 1' => 'Error creating archive',
'err bk 10 password' => 'Error with backup password',
'err bk 2 key' => 'Error creating key file',
@@ -923,6 +931,7 @@
'fixed ip lease added' => 'Fixed IP lease added',
'fixed ip lease modified' => 'Fixed IP lease modified',
'fixed ip lease removed' => 'Fixed IP lease removed',
'flag' => 'Flag',
'force update' => 'Force update',
'force user' => 'force all new file to user',
'forward firewall' => 'Firewall',
@@ -1030,6 +1039,7 @@
'fwdfw use srcport' => 'Source port:',
'fwdfw use srv' => 'Destination port:',
'fwdfw useless rule' => 'This rule is useless.',
'fwdfw warn1' => 'This might lead to firewallrules which are applied to networks for which they are not intended to be.',
'fwdfw wd_fri' => 'Fri',
'fwdfw wd_mon' => 'Mon',
'fwdfw wd_sat' => 'Sat',
@@ -1160,6 +1170,7 @@
'harddisk temperature' => 'Harddisk Temperature',
'harddisk temperature graphs' => 'HDD Graphs',
'hardware graphs' => 'Hardware Graphs',
'hardware support' => 'Hardware Support',
'hdd temperature in' => 'Harddisk temperature in',
'help' => 'Help',
'high' => 'High',
@@ -1536,6 +1547,7 @@
'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
'no filter pass' => 'Enter the standard class for non-filtered packets.',
'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.',
'no hardware random number generator' => 'This system has no source for entropy.',
'no information available' => 'No information available.',
'no log selected' => 'No log selected',
'no modem selected' => 'No modem selected',
@@ -2022,6 +2034,8 @@
'swap usage per' => 'Swap usage per',
'system' => 'System',
'system graphs' => 'System Graphs',
'system has hwrng' => 'This system has got a hardware random number generator.',
'system has rdrand' => 'This system has got support for Intel(R) RDRAND.',
'system information' => 'System Information',
'system log viewer' => 'System Log Viewer',
'system logs' => 'System Logs',

299
langs/tr/cgi-bin/tr.pl
View File

File diff suppressed because it is too large Load Diff

4
lfs/beep
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.2.2
VER = 1.3
THISAPP = beep-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d541419fd7e5642952d7b48cbb40c712
$(DL_FILE)_MD5 = 49c340ceb95dbda3f97b2daafac7892a
install : $(TARGET)

8
lfs/hostapd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 = 2.0
VER = 2.1
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 = 26
PAK_VER = 28
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee
$(DL_FILE)_MD5 = bb9c50e87c5af6f89f387e63911effac
install : $(TARGET)

4
lfs/initscripts
View File

@@ -185,13 +185,9 @@ $(TARGET) :
/etc/rc.d/init.d/networking/red.up/23-RS-snort
ln -sf ../../../../../usr/local/bin/qosctrl \
/etc/rc.d/init.d/networking/red.up/24-RS-qos
ln -sf ../../../../../usr/local/bin/dialctrl.pl \
/etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
ln -sf ../../../../../usr/local/bin/dialctrl.pl \
/etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
for i in green blue orange; do \
ln -sf any /etc/rc.d/init.d/networking/$$i; \

6
lfs/linux
View File

@@ -127,9 +127,6 @@ ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
endif
# Disable pcspeaker autoload
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.30-no-pcspkr-modalias.patch
# Remove ACPI Blacklist message
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-silence-acpi-blacklist.patch
@@ -150,6 +147,9 @@ endif
# cs5535audio spams syslog if no ac97 was present (geos router)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
# Add PC Engines APU led support
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch
# Fix uevent PHYSDEVDRIVER
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch

4
lfs/openssh
View File

@@ -24,7 +24,7 @@
include Config
VER = 6.5p1
VER = 6.6p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a084e7272b8cbd25afe0f5dce4802fef
$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
install : $(TARGET)

8
lfs/samba
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 = 3.6.22
VER = 3.6.23
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 56
PAK_VER = 57
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 59add4bb178ebc188d857bc13a508c0b
$(DL_FILE)_MD5 = 2f7aee1dc5d31aefcb364600915b31dc
install : $(TARGET)

18
lfs/sudo
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.6.8p12
VER = 1.8.10p1
THISAPP = sudo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b29893c06192df6230dd5f340f3badf5
$(DL_FILE)_MD5 = 1d9c2bc5aaf02608343d17b9a666e8e1
install : $(TARGET)
@@ -70,10 +70,16 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-envvar_fix-1.patch
cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-noargs-shell --with-ignore-dot --with-all-insults \
--enable-shell-sets-home && \
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
--libexecdir=/usr/lib \
--with-logging=syslog \
--with-logfac=authpriv \
--with-env-editor \
--with-ignore-dot \
--with-tty-tickets \
--with-passpromt="[sudo] password for %p: "
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

34
lfs/tzdata
View File

@@ -24,15 +24,18 @@
include Config
VER = 2012h
TZDATA_VER = 2012h
TZCODE_VER = 2012h
VER = 2014a
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
THISAPP = tzdata-$(VER)
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
FILES = africa antarctica asia australasia europe \
northamerica southamerica pacificnew etcetera backward
###############################################################################
# Top-level Rules
###############################################################################
@@ -42,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz_MD5 = b937335e087fb85b7f8e3ce33e69184b
tzcode$(TZCODE_VER).tar.gz_MD5 = 44b3b6c3e50240ac44f16437040a7ba2
tzdata$(TZDATA_VER).tar.gz_MD5 = 423a11bcffc10dda578058cf1587d048
tzcode$(TZCODE_VER).tar.gz_MD5 = 77ccbb720f0f2076f12dff6ded70eb98
install : $(TARGET)
@@ -77,16 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)
tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)
cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
TZDIR=/usr/share/zoneinfo all
cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
TZDIR=/usr/share/zoneinfo install
cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right}
cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \
-L /dev/null -p GMT $(FILES)
cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \
-L /dev/null $(FILES)
cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \
-L /dev/null $(FILES)
rm -rf /usr/share/zoneinfo
cd $(DIR_APP) && cp -prd zoneinfo /usr/share
cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \
/usr/share/zoneinfo
-mkdir -pv /usr/share/zoneinfo
mv -v /usr/share/zoneinfo-posix /usr/share/zoneinfo/posix
mv -v /usr/share/zoneinfo-leaps /usr/share/zoneinfo/right
rm -vf /usr/share/zoneinfo/localtime
cp -vf /usr/share/zoneinfo/GMT /etc/localtime
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/wpa_supplicant
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 = 2.0
VER = 2.1
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 = 3be2ebfdcced52e00eda0afe2889839d
$(DL_FILE)_MD5 = e96b8db5a8171cd17a5b2012d6ad7cc7
install : $(TARGET)

11
src/initscripts/init.d/leds
View File

@@ -65,6 +65,11 @@ case "${1}" in
setup_netdev_trigger alix:2 ${RED_DEV} rx
setup_netdev_trigger alix:3 ${RED_DEV} tx
# Apu LED start
setup_heartbeat_trigger apu:1
setup_netdev_trigger apu:2 ${RED_DEV} rx
setup_netdev_trigger apu:3 ${RED_DEV} tx
# Geos LED start
setup_heartbeat_trigger geos:1
setup_netdev_trigger geos:2 ${RED_DEV} rx
@@ -97,6 +102,12 @@ case "${1}" in
disable_led_trigger alix:2
disable_led_trigger alix:3
# Apu LED stop
disable_led_trigger apu:1
enable_led apu:1
disable_led_trigger apu:2
disable_led_trigger apu:3
# Geos LED stop
disable_led_trigger geos:1
enable_led geos:1

12
src/patches/linux-2.6.30-no-pcspkr-modalias.patch
View File

@@ -1,12 +0,0 @@
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 34f4d2e..3e40c70 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -24,7 +24,6 @@
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
MODULE_DESCRIPTION("PC Speaker beeper driver");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:pcspkr");
static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{

215
src/patches/linux-3.10-apu_leds.patch Normal file
View File

@@ -0,0 +1,215 @@
diff -Naur linux-3.10.33.org/arch/x86/Kconfig linux-3.10.33/arch/x86/Kconfig
--- linux-3.10.33.org/arch/x86/Kconfig 2014-03-07 06:58:45.000000000 +0100
+++ linux-3.10.33/arch/x86/Kconfig 2014-03-17 17:02:46.703135023 +0100
@@ -2199,6 +2199,12 @@
- AC adapter status updates
- Battery status updates
+config APULED
+ bool "PCEngines APU Led Support"
+ depends on DMI
+ ---help---
+ This option enables system support for the PCEngines APU.
+
config ALIX
bool "PCEngines ALIX System Support (LED setup)"
select GPIOLIB
diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/x86/platform/apu/apu-led.c
--- linux-3.10.33.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.10.33/arch/x86/platform/apu/apu-led.c 2014-03-17 17:00:36.187188456 +0100
@@ -0,0 +1,181 @@
+/*
+ * LEDs driver for PCEngines apu
+ *
+ * Copyright (C) 2013 Christian Herzog <daduke@daduke.org>, based on
+ * Petr Leibman's leds-alix
+ * Hardware presence check added by Arne Fitzenreiter <arne_f@ipfire.org>
+ * Based on leds-wrap.c
+ * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGuide.pdf
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/err.h>
+#include <asm/io.h>
+#include <linux/dmi.h>
+
+#define DRVNAME "apu-led"
+#define BASEADDR (0xFED801BD)
+#define LEDON (0x8)
+#define LEDOFF (0xC8)
+
+static struct platform_device *pdev;
+unsigned int *p1;
+unsigned int *p2;
+unsigned int *p3;
+
+static void apu_led_set_1(struct led_classdev *led_cdev,
+ enum led_brightness value) {
+ if (value)
+ iowrite8(LEDON, p1);
+ else
+ iowrite8(LEDOFF, p1);
+}
+
+static void apu_led_set_2(struct led_classdev *led_cdev,
+ enum led_brightness value) {
+ if (value)
+ iowrite8(LEDON, p2);
+ else
+ iowrite8(LEDOFF, p2);
+}
+
+static void apu_led_set_3(struct led_classdev *led_cdev,
+ enum led_brightness value) {
+ if (value)
+ iowrite8(LEDON, p3);
+ else
+ iowrite8(LEDOFF, p3);
+}
+
+static struct led_classdev apu_led_1 = {
+ .name = "apu:1",
+ .brightness_set = apu_led_set_1,
+};
+
+static struct led_classdev apu_led_2 = {
+ .name = "apu:2",
+ .brightness_set = apu_led_set_2,
+};
+
+static struct led_classdev apu_led_3 = {
+ .name = "apu:3",
+ .brightness_set = apu_led_set_3,
+};
+
+
+#ifdef CONFIG_PM
+static int apu_led_suspend(struct platform_device *dev,
+ pm_message_t state)
+{
+ led_classdev_suspend(&apu_led_1);
+ led_classdev_suspend(&apu_led_2);
+ led_classdev_suspend(&apu_led_3);
+ return 0;
+}
+
+static int apu_led_resume(struct platform_device *dev)
+{
+ led_classdev_resume(&apu_led_1);
+ led_classdev_resume(&apu_led_2);
+ led_classdev_resume(&apu_led_3);
+ return 0;
+}
+#else
+#define apu_led_suspend NULL
+#define apu_led_resume NULL
+#endif
+
+static int apu_led_probe(struct platform_device *pdev)
+{
+ int ret;
+
+ ret = led_classdev_register(&pdev->dev, &apu_led_1);
+ if (ret == 0)
+ {
+ ret = led_classdev_register(&pdev->dev, &apu_led_2);
+ if (ret >= 0)
+ {
+ ret = led_classdev_register(&pdev->dev, &apu_led_3);
+ if (ret < 0)
+ led_classdev_unregister(&apu_led_2);
+ }
+ if (ret < 0)
+ led_classdev_unregister(&apu_led_1);
+ }
+ return ret;
+}
+
+static int apu_led_remove(struct platform_device *pdev)
+{
+ led_classdev_unregister(&apu_led_1);
+ led_classdev_unregister(&apu_led_2);
+ led_classdev_unregister(&apu_led_3);
+ return 0;
+}
+
+static struct platform_driver apu_led_driver = {
+ .probe = apu_led_probe,
+ .remove = apu_led_remove,
+ .suspend = apu_led_suspend,
+ .resume = apu_led_resume,
+ .driver = {
+ .name = DRVNAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init apu_led_init(void)
+{
+ int ret=0;
+ const char *vendor, *product;
+
+ vendor = dmi_get_system_info(DMI_SYS_VENDOR);
+ if (!vendor || strcmp(vendor, "PC Engines"))
+ goto out;
+
+ product = dmi_get_system_info(DMI_PRODUCT_NAME);
+ if (!product || strcmp(product, "APU"))
+ goto out;
+
+ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
+ KBUILD_MODNAME, vendor, product);
+
+ ret = platform_driver_register(&apu_led_driver);
+ if (ret < 0)
+ goto out;
+
+ pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+ if (IS_ERR(pdev)) {
+ ret = PTR_ERR(pdev);
+ platform_driver_unregister(&apu_led_driver);
+ goto out;
+ }
+
+ p1 = ioremap(BASEADDR, 1);
+ p2 = ioremap(BASEADDR+1, 1);
+ p3 = ioremap(BASEADDR+2, 1);
+
+out:
+ return ret;
+}
+
+static void __exit apu_led_exit(void)
+{
+ platform_device_unregister(pdev);
+ platform_driver_unregister(&apu_led_driver);
+}
+
+module_init(apu_led_init);
+module_exit(apu_led_exit);
+
+MODULE_AUTHOR("Christian Herzog");
+MODULE_DESCRIPTION("PCEngines apu LED driver");
+MODULE_LICENSE("GPL");
diff -Naur linux-3.10.33.org/arch/x86/platform/apu/Makefile linux-3.10.33/arch/x86/platform/apu/Makefile
--- linux-3.10.33.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.10.33/arch/x86/platform/apu/Makefile 2014-03-17 17:05:19.245651480 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_APULED) += apu-led.o
diff -Naur linux-3.10.33.org/arch/x86/platform/Makefile linux-3.10.33/arch/x86/platform/Makefile
--- linux-3.10.33.org/arch/x86/platform/Makefile 2014-03-07 06:58:45.000000000 +0100
+++ linux-3.10.33/arch/x86/platform/Makefile 2014-03-17 14:53:15.078571307 +0100
@@ -1,4 +1,5 @@
# Platform specific code goes here
+obj-y += apu/
obj-y += ce4100/
obj-y += efi/
obj-y += geode/

201
src/scripts/dialctrl.pl
View File

@@ -1,201 +0,0 @@
#!/usr/bin/perl
#
# Dialup Statistics for IPFire
# based on SilverStar's work on
# http://goodymuc.go.funpic.de
#
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime();
$jahr=$year;
$monat=$mon+1;
$tag=$mday;
$jahr=$year;
$jahr=$year +1900;
if (length($monat) == 1)
{
$monat="0$monat";
}
if(length($tag) == 1)
{
$tag="0$tag";
}
if(length($hour) == 1)
{
$hour="0$hour";
}
if(length($min) == 1)
{
$min="0$min";
}
if(length($sec) == 1)
{
$sec="0$sec";
}
my $s_date = $tag."/".$monat."/".$jahr;
my $s_time = $hour.":".$min.":".$sec;
my $file_log = "/var/log/counter/dialup.log";
my $file_connect = "/var/log/counter/connect";
my $file_reset = "/var/log/counter/reset";
if ($ARGV[0] eq 'up') {
if (! -e "$file_log") {
&new;
} else {
open(CONNECT,">$file_connect");
close(CONNECT);
open(COUNTER,"<$file_log");
$line = <COUNTER>;
($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
close(COUNTER);
$up++;
$update = $s_date." on ".$s_time;
open(COUNTER,">$file_log");
print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
close(COUNTER);
}
}
if ($ARGV[0] eq 'down') {
if (! -e "$file_log") {
&new;
} else {
open(COUNTER,"<$file_log");
$line = <COUNTER>;
($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
close(COUNTER);
$on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
$d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4;
$con = &General::age("$file_connect");
$con =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
$d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4;
$sum_d = ($d1 + $d2) * 86400;
$sum_h = ($h1 + $h2) * 3600;
$sum_m = ($m1 + $m2) * 60;
$sum_s = ($s1 + $s2);
$sum_1 = $sum_d + $sum_h + $sum_m + $sum_s;
$d = int($sum_1 / 86400);
$totalhours = int($sum_1 / 3600);
$h = $totalhours % 24;
$totalmins = int($sum_1 / 60);
$m = $totalmins % 60;
$s = $sum_1 % 60;
$on = "${d}d ${h}h ${m}m ${s}s";
$down++;
$update = $s_date." on ".$s_time;
open(COUNTER,">$file_log");
print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
close(COUNTER);
}
}
if ($ARGV[0] eq 'rec') {
if (! -e "$file_log") {
&new;
} else {
open(COUNTER,"<$file_log");
$line = <COUNTER>;
($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
close(COUNTER);
$rec++;
$update = $s_date." on ".$s_time;
open(COUNTER,">$file_log");
print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
close(COUNTER);
}
}
elsif ($ARGV[0] eq 'show') {
if (! -e "$file_log") {
&new;
}
else {
open(COUNTER,"<$file_log");
$line = <COUNTER>;
($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
$on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
$d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4;
close(COUNTER);
if ( ! -e "${General::swroot}/red/active") {
$timecon = "0d 0h 0m 0s";
} else {
$timecon = &General::age("$file_connect");
}
$timecon =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
$d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4;
$timeres = &General::age("$file_reset");
$timeres =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
$d3 = $1; $h3 = $2; $m3 = $3; $s3 = $4;
$sum_d1 = ($d1 + $d2) * 86400;
$sum_h1 = ($h1 + $h2) * 3600;
$sum_m1 = ($m1 + $m2) * 60;
$sum_s1 = ($s1 + $s2);
$sum_1 = $sum_d1 + $sum_h1 + $sum_m1 + $sum_s1;
$sum_d2 = $d3 * 86400;
$sum_h2 = $h3 * 3600;
$sum_m2 = $m3 * 60;
$sum_s2 = $s3;
$sum_2 = $sum_d2 + $sum_h2 + $sum_m2 + $sum_s2;
$d = int($sum_1 / 86400);
$totalhours = int($sum_1 / 3600);
$h = $totalhours % 24;
$totalmins = int($sum_1 / 60);
$m = $totalmins % 60;
$s = $sum_1 % 60;
$current = "${d}d ${h}h ${m}m ${s}s";
$ontime = ( $sum_1 * 100 ) / $sum_2;
if ($ontime >= 99.95) {
$ontime = sprintf("%.0f", $ontime);
}
elsif ($ontime <= 0.05) {
$ontime = sprintf("%.0f", $ontime);
}
else {
$ontime = sprintf("%.1f", $ontime);
}
print <<END
<br />$Lang::tr{'since'} $update
<table style='width:60%'>
<tr><td>$Lang::tr{'connections'}: $up</td><td>$Lang::tr{'disconnects'}: $down</td><td>$Lang::tr{'attemps'}: $rec</td></tr>
<tr><td><b>$Lang::tr{'total connection time'}:</b><td>$current</td><td> ~ $ontime%</td></tr>
</table>
END
;
}
}
elsif ($ARGV[0] eq 'reset') {
&new;
}
elsif ($ARGV[0] eq '') {
print "\nDont run on the console...\n\n";
}
exit 0;
sub new {
open(COUNTER,">$file_log");
$start = $s_date." on ".$s_time;
$update = "&#8249;no action since clearing&#8250;";
$up = "0";
$down = "0";
$rec = "0";
$on = "0d 0h 0m";
$bit = "0";
print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
close(COUNTER);
open(CONNECT,">$file_connect");
print CONNECT "0";
close(CONNECT);
open(RESET,">$file_reset");
print RESET "0";
close(RESET);
}