IPFire-SCM March 2014

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. da7a2208d3a3c4143ce9029665ad9d738e70d3b1
by git＠ipfire.org 17 Mar '14

17 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via da7a2208d3a3c4143ce9029665ad9d738e70d3b1 (commit) via 5cf8c8c12382d77b07fbcb1b8916d78d2806cc74 (commit) via c2a1af7545c52edc9354e778acecb6370ea15d48 (commit) from 2a07aa9d9c4c1968a1072147107d889a1a8aae5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit da7a2208d3a3c4143ce9029665ad9d738e70d3b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 17 18:03:00 2014 +0100 firewall: rules.pl: Code cleanup. commit 5cf8c8c12382d77b07fbcb1b8916d78d2806cc74 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 17 17:39:47 2014 +0100 firewall: Fix DNAT rules between internal zones. commit c2a1af7545c52edc9354e778acecb6370ea15d48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 17 15:47:28 2014 +0100 firewall: rules.pl: Sanitise source and destination IP addresses. Those variables are now empty if source or destination are unspecified. ----------------------------------------------------------------------- Summary of changes: config/firewall/rules.pl | 79 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 51ddb44..7a8e9ba 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -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,12 +397,21 @@ 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") { return $defaultNetworks{$zone . "_ADDRESS"}; } elsif ($zone eq "Default IP") { + if ($source) { + my $firewall_ip = &get_internal_firewall_ip_address($source, 1); + + if ($firewall_ip) { + return $firewall_ip; + } + } + return &get_external_address(); } else { @@ -795,25 +821,52 @@ 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) { + return; + } + + 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; } } +} + +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; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2a07aa9d9c4c1968a1072147107d889a1a8aae5e
by git＠ipfire.org 17 Mar '14

17 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2a07aa9d9c4c1968a1072147107d889a1a8aae5e (commit) via a72ae687c6779a280fe2da176550471b8b3b1771 (commit) via 17eabb6587e53570f518aa968e0f935dd5b3bb12 (commit) from 835a1e2863fac9065690b5a79c0ca120f398e533 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2a07aa9d9c4c1968a1072147107d889a1a8aae5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 17 14:17:44 2014 +0100 dialctrl: Remove defunct script. commit a72ae687c6779a280fe2da176550471b8b3b1771 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Mar 17 07:22:24 2014 +0100 Firewall: Bugfix: Remark in hostgroups and servicegroups was not changeable Another Bugfix: Layout of hostgroups was broken when more than 1 vpn connection is defined. There where dropdownboxes for every vpn connection instead of only one commit 17eabb6587e53570f518aa968e0f935dd5b3bb12 Author: Ersan Yildirim <yakazan(a)gmail.com> Date: Mon Mar 17 12:38:22 2014 +0100 Update Turkish translation. ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 3 - config/rootfiles/common/armv5tel/initscripts | 2 - config/rootfiles/common/i586/initscripts | 2 - config/rootfiles/common/stage2 | 1 - config/rootfiles/core/76/update.sh | 9 + doc/language_issues.tr | 54 +---- html/cgi-bin/fwhosts.cgi | 86 +++++--- html/cgi-bin/index.cgi | 2 - langs/tr/cgi-bin/tr.pl | 299 ++++++++++++++++----------- lfs/initscripts | 4 - src/scripts/dialctrl.pl | 201 ------------------ 11 files changed, 249 insertions(+), 414 deletions(-) delete mode 100644 src/scripts/dialctrl.pl Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index 3b70df4..92c3a78 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -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 diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index bf4dd52..4716b97 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -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 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 3b91181..07a39f4 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -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 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a2b1cfa..87649e9 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -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 diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index 150045b..43c4c3f 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -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 \ @@ -141,6 +144,12 @@ rm -rf /lib/modules # Remove old usb_modeswitch_data rm -rf /usr/share/usb_modeswitch +# 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. # diff --git a/doc/language_issues.tr b/doc/language_issues.tr index abcb6ee..93da78a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -214,6 +214,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 +244,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 +303,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 @@ -633,70 +634,19 @@ 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: ccd err isipsecrw WARNING: untranslated string: ccd err isovpnn2n -WARNING: untranslated string: dead peer detection -WARNING: untranslated string: default ip -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: entropy graphs -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: fwdfw warn1 WARNING: untranslated string: fwhost err hostip -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 -WARNING: untranslated string: ipsec -WARNING: untranslated string: ipsec network 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: notice -WARNING: untranslated string: openvpn network -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: 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 directory port -WARNING: untranslated string: tor errmsg invalid directory port -WARNING: untranslated string: uplink -WARNING: untranslated string: urlfilter redirect template -WARNING: untranslated string: wlan clients diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 2d128f5..042fdde 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1236,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> @@ -1256,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) { @@ -1285,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>"; @@ -1302,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>"; @@ -1322,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) { @@ -1331,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'}> @@ -1342,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'}> @@ -1360,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'}> @@ -1378,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>"; @@ -1479,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'){ diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 2ce4030..53adeac 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -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/> diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 6bb470a..0ea9593 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -89,6 +89,7 @@ 'add xtaccess' => 'Harici Erişim Ekle', 'add-route' => 'Basma ek yolu', 'added from dhcp lease list' => 'DHCP kira listeden eklendi', +'addons' => 'Eklentiler', 'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.', 'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı', 'administrator user password' => 'Admin kullanıcı parolası:', @@ -178,7 +179,7 @@ 'advproxy access' => 'Erişim', 'advproxy admin mail' => 'Önbellek yönetici e-postası', 'advproxy advanced proxy' => 'Gelişmiş Vekil Sunucu', -'advproxy advanced web proxy' => 'Gelişmiş Web Vekil Sunucusu', +'advproxy advanced web proxy' => 'Gelişmiş web vekil sunucusu', 'advproxy advanced web proxy configuration' => 'Gelişmiş web vekil sunucu ayarları', 'advproxy allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)', 'advproxy allowed web browsers' => 'Web erişimi için izin verilen istemciler', @@ -244,6 +245,7 @@ 'advproxy errmsg password length 1' => 'Parola en az olmalıdır ', 'advproxy errmsg password length 2' => ' karakter', 'advproxy errmsg passwords different' => 'Parolalar eşleşmiyor', +'advproxy errmsg proxy ports equal' => 'Vekil sunucu ve şeffaf bağlantı noktaları eşit olamaz.', 'advproxy errmsg radius port' => 'Geçersiz RADIUS bağlantı noktası numarası', 'advproxy errmsg radius secret' => 'RADIUS paylaşılan gizli kod gerekli', 'advproxy errmsg radius server' => 'RADIUS Sunucusu için geçersiz IP adresi', @@ -281,6 +283,7 @@ 'advproxy on' => 'Vekil sunucu', 'advproxy privacy' => 'Gizlilik', 'advproxy proxy port' => 'Vekil sunucu bağlantı noktası', +'advproxy proxy port transparent' => 'Şeffaf bağlantı noktası', 'advproxy ram cache size' => 'Bellek önbellek boyutu (MB)', 'advproxy redirector children' => 'Filtre işlemlerinin sayısı', 'advproxy reset' => 'Yeniden Başlat', @@ -314,7 +317,7 @@ 'advproxy update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü vardır. Daha fazla bilgi için <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> adresini ziyaret edebilirsiniz.', 'advproxy update notification' => 'Güncelleme bildirimi!', 'advproxy upstream password' => 'Gönderim parolası', -'advproxy upstream proxy' => 'Gönderim Vekili', +'advproxy upstream proxy' => 'Gönderim vekili', 'advproxy upstream proxy host:port' => 'Gönderim vekili (makine adı:bağlantı noktası)', 'advproxy upstream username' => 'Gönderim kullanıcı adı', 'advproxy url filter' => 'URL filtre', @@ -338,11 +341,11 @@ 'aliases not active' => 'KIRMIZI arabiriminiz STATİK olmadıkça takma adlar aktif olmayacaktır', 'all' => 'Tümü', 'all interfaces' => 'Tüm Arabirimler', -'all services' => 'Tüm Hizmetler', +'all services' => 'Tüm hizmetler', 'all updates installed' => 'Tüm güncellemeler kuruldu', 'allmsg' => 'tümünü göster', 'alt dialup' => 'Çevirmeli Bağlantı', -'alt home' => 'Ana sayfa', +'alt home' => 'Ana Sayfa', 'alt information' => 'Bilgi', 'alt logs' => 'Günlükler', 'alt ovpn' => 'OpenVPN', @@ -357,12 +360,12 @@ 'april' => 'Nisan', 'archive not exist' => 'Yapılandırma arşivi yok', 'are you sure' => 'Emin misiniz?', -'arp table entries' => 'ARP Tablosu Girdileri:', +'arp table entries' => 'ARP tablosu girdileri:', 'artist' => 'Sanatçı', 'attemps' => 'Girişim', 'attention' => 'DİKKAT', 'august' => 'Ağustos', -'authentication' => 'Kimlik Doğrulama:', +'authentication' => 'Kimlik doğrulama:', 'automatic' => 'Otomatik', 'available updates' => 'Mevcut güncellemeler:', 'average' => 'Ortalama', @@ -397,7 +400,7 @@ 'backup to floppy' => 'Diskete yedekle', 'backupaddon' => 'Eklenti Yedekleme', 'backupprofile' => 'Yeniden bağlanma başarısız durumda. Profile geçin', -'backups' => 'yedekler', +'backups' => 'Yedekler', 'backupwarning' => 'Eklenti yedeklemesi için lütfen önce geri yükleme yedeklemesi oluşturun. İndirme zamanı verilen orjinal dosya ile devam edin.', 'bad characters in' => 'Yablış karakterler ', 'bad characters in script field' => 'Komut alanındaki yanlış karakterler', @@ -409,11 +412,12 @@ 'bandwidth usage' => 'bant genişliği kullanımı (harici)', 'bandwitherror' => 'QoS aktifken bant genişliği ayarları değiştiremezsiniz. İlk önce QoS devre dışı bırakın.<p>', 'bandwithsettings' => 'Bant genişliği ayarları', -'basic options' => 'Temel Seçenekler', -'beep when ppp connects or disconnects' => 'IPFire bağlanırken veya kapatılırken beep sesi çıkar.', +'basic options' => 'Temel seçenekler', +'beep when ppp connects or disconnects' => 'IPFire bağlanırken veya kapatılırken ses çıkar.', 'behind a proxy' => 'Bir vekil sunucu arkasında:', 'bewan adsl pci st' => 'KALDIRILACAK', 'bewan adsl usb' => 'KALDIRILACAK', +'bit' => 'Bit', 'bitrate' => 'Bit hızı', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'MAVİ', @@ -436,7 +440,7 @@ 'cached swap' => 'takas alanı önbelleği', 'calamaris available reports' => 'Mevcut raporlar', 'calamaris byte unit' => 'Bayt birimi', -'calamaris create report' => 'Rapor oluştur', +'calamaris create report' => 'Rapor Oluştur', 'calamaris enable content report' => 'İçerik raporunu aktifleştir', 'calamaris enable distribution histogram' => 'Dağıtım histogramını aktifleştir', 'calamaris enable domain report' => 'Etki alanı raporunu aktifleştir', @@ -455,7 +459,7 @@ 'calamaris number of requesting hosts' => 'Talep eden ana bilgisayarların sayısı', 'calamaris performance options' => 'Performans seçenekleri', 'calamaris proxy reports' => 'Vekil Sunucu Raporları', -'calamaris refresh list' => 'Listeyi yenile', +'calamaris refresh list' => 'Listeyi Yenile', 'calamaris report interval (in minutes)' => 'Rapor aralığı (dakikada)', 'calamaris report options' => 'Rapor seçenekleri', 'calamaris report period' => 'Rapor süresi', @@ -513,7 +517,7 @@ 'ccd iroutehint' => 'Dikkat! Bu ayarları değiştirirseniz, değişikliklerin etkili olduğu OpenVPN sunucusunu yeniden başlatmanız gerekir!', 'ccd modify' => 'Ağı değiştir', 'ccd name' => 'Ad', -'ccd net' => 'Statik IP adres havuzu', +'ccd net' => 'Statik ip adres havuzu', 'ccd noaddnet' => 'OpenVPN sunucusu durdurulduğunda sadece yeni bir statik ağ ekleyebilirsiniz.', 'ccd none' => 'Yok', 'ccd routes' => 'Yönlendir:', @@ -521,7 +525,7 @@ 'ccd used' => 'Kullanılan adresler', 'cert' => 'Sertifika', 'certificate' => 'Sertifika', -'certificate authorities' => 'Sertifika Yetkilileri', +'certificate authorities' => 'Sertifika yetkilileri', 'certificate does not have a valid ca associated with it' => 'Sertifika ile ilişkili geçerli bir CA yok.', 'certificate file move failed' => 'Sertifika dosyası taşıması başarısız oldu', 'cfg restart' => 'Bir yeniden başlatma, yapılandırma arşivi geri yükledikten sonra önerilmektedir.', @@ -560,7 +564,7 @@ 'connection closed' => 'Bağlı değil...', 'connection debugging' => 'Hata ayıklama bağlantısı', 'connection status and controlc' => 'Bağlantı durumu ve kontrol:', -'connection tracking' => 'IPTablo Bağlantı Takibi', +'connection tracking' => 'IPTablo bağlantı takibi', 'connection type' => 'Bağlantı Türü', 'connection type is invalid' => 'Geçersiz bağlantı türü.', 'connections' => 'Bağlantılar', @@ -617,7 +621,7 @@ 'dat without key' => 'Şifreli bir arşiv anahtarı olmadan geri yüklenemez.', 'date' => 'Tarih', 'date not in logs' => 'Sorgulanan gün için hiçbir günlük yok', -'day' => 'gün', +'day' => 'Gün', 'day after' => 'Bir gün sonra', 'day before' => 'Bir gün önce', 'day-graph' => 'gün', @@ -631,12 +635,14 @@ 'ddns hostname removed' => 'Dinamik DNS ana bilgisayar adı kaldırıldı', 'ddns minimize updates' => 'Güncellemeleri azalt: Güncellemelerden önce, sunucu adı \'[host.]domain\' için dns IP adresini KIRMIZI IP ile karşılaştır.', 'ddns noip prefix' => 'Grup yönteminde ip-yok seçeneğini kullanmak için ana bilgisayar adı öneki: <b>%</b>', -'deactivate' => 'devre dışı', +'deactivate' => 'Devre dışı', 'deactivate user' => 'kullanıcı devre dışı', +'dead peer detection' => 'Sonlanmış Eş Algılama', 'debugme' => 'Henüz uygulanmadı', 'december' => 'Aralık', 'deep scan directories' => 'Ardışık tarama', 'def lease time' => 'Varsayılan Kira Zamanı', +'default ip' => 'Varsayılan IP adresi', 'default lease time' => 'Varsayılan kira zamanı (dakika):', 'default networks' => 'Varsayılan ağlar', 'default renewal time' => 'Varsayılan Yenileme Zamanı', @@ -669,7 +675,7 @@ 'dhcp advopt definition' => 'Açıklama', 'dhcp advopt definition exists' => 'Açıklama seçeneği zaten var. Bunu sadece düzenleyebilir veya kaldırabilirsiniz.', 'dhcp advopt edit' => 'DHCP seçeneğini düzenle', -'dhcp advopt help' => 'Liste seçenekleri', +'dhcp advopt help' => 'Liste Seçenekleri', 'dhcp advopt list' => 'Ek DHCP seçenekleri', 'dhcp advopt modified' => 'DHCP seçeneği düzeltildi', 'dhcp advopt name' => 'Seçenek adı', @@ -708,16 +714,17 @@ 'disk access per' => 'erişim başına disk', 'disk usage' => 'Disk kullanımı', 'display' => 'Görünüm', -'display charset' => 'Karakterleri Göster', +'display charset' => 'Karakterleri göster', 'display hostname in window title' => 'Pencere başlığında ana bilgisayar adını göster', 'display traffic at home' => 'Başlangıç sayfasının üzerinde hesaplanan trafiği göster', 'display webinterface effects' => 'Efektleri aktifleştir', 'dl client arch' => 'İstemci paketlerini indir (zip)', -'dmz' => 'Açık bölge', +'dmz' => 'AÇIK BÖLGE', 'dmz pinhole configuration' => 'Açık bölge yapılandırma', 'dmz pinhole rule added' => 'Açık bölge kuralı eklendi; Açık bölge yeniden başlatılıyor', 'dmz pinhole rule removed' => 'Açık bölge kuralı silindi; Açık bölge yeniden başlatılıyor', 'dmzpinholes for same net not necessary' => 'Açık bölge aynı ağ için gerekli değildir. Farklı kaynak veya hedef ağ seçin.', +'dnat address' => 'Harici IP adresi', 'dns address deleted' => 'Başarıyla silindi!', 'dns address deleted txt' => 'DNS-Sunucusu adresleri başarıyla silindi.<br />Değişikliklerin aktifleştirilmesi için yeniden başlatın!', 'dns address done' => 'DNS-Sunucusu adresi ayarları kaydedilecektir.', @@ -736,8 +743,9 @@ 'dns saved' => 'Başarıyla kaydedildi!', 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi.<br />Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!', 'dns server' => 'DNS Sunucusu', +'dns servers' => 'DNS sunucuları', 'dns title' => 'Etki Alanı Ad Sistemi', -'dnsforward' => 'DNS yönlendirmesi', +'dnsforward' => 'DNS Yönlendirmesi', 'dnsforward add a new entry' => 'Yeni bir kayıt ekle:', 'dnsforward configuration' => 'İleri DNS yapılandırması', 'dnsforward edit an entry' => 'Varolan bir kaydı düzenle:', @@ -745,8 +753,8 @@ 'dnsforward forward_server' => 'Ad sunucusu', 'dnsforward zone' => 'Bölge', 'do not log this port list' => 'Otorumdan hemen önce bu bağlantı noktaları listesini bırak (günlük boyutunu küçültür)', -'dod' => 'Çevirmeli Bağlantı Üzerinden Talep', -'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep:', +'dod' => 'Çevirmeli bağlantı üzerinden talep et', +'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep et:', 'dod not compatible with ddns' => 'Talep edilen çevirmeli ağ dinamik dns hizmetleri ile uyumlu değildir', 'dod waiting' => 'Çevirmeli bağlantı üzerindeki talep bekleniyor', 'domain' => 'Etki alanı', @@ -758,19 +766,26 @@ 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', 'donation-text' => '<strong>IPFire</strong> boş zamanlarında gönüllüer tarafından geliştirlmektedir. Bu projeyi ayakta tutmak için eğer bize destek olmak isterseniz küçük bir bağıştan mutluluk duyarız.', 'done' => 'Yap', -'dos charset' => 'DOS Karakterleri', +'dos charset' => 'DOS karakterleri', 'down and up speed' => 'Gönderme hızı düştüğünde <i>Kaydet</i> düğmesine basın.', +'downlink' => 'İndirme bağlantısı', 'downlink speed' => 'İndirme bağlantı hızı (kbit/san)', 'downlink std class' => 'Standart indirme bağlantısı sınıfı', 'download' => 'İndir', 'download ca certificate' => 'CA sertifikası indir', 'download certificate' => 'Sertifika indir', 'download host certificate' => 'Ana bilgisayar belgesi indir', -'download new ruleset' => 'Yeni kural kümesi indir', +'download new ruleset' => 'Yeni Kural Kümesi İndir', 'download pkcs12 file' => 'PKCS12 dosyasını indir', 'download root certificate' => 'Root sertifikasını indir', 'dpd action' => 'Hareketsiz eş algılama eylemi', +'dpd delay' => 'Gecikme', +'dpd timeout' => 'Zaman Aşımı', 'driver' => 'Sürücü', +'drop action' => '"Engellenmiş" biçimdeki (iletilen) güvenlik duvarının varsayılan davranışı', +'drop action1' => '"Engellenmiş" biçimdeki (giden) güvenlik duvarının varsayılan davranışı', +'drop action2' => 'Güvenlik duvarı (giriş) varsayılan davranışı', +'drop forward' => 'İletilen paket günlüklerini reddet', 'drop input' => 'Günlük giriş paketlerini reddet', 'drop newnotsyn' => 'Sync paketleri olmayan yeni günlükleri reddet', 'drop output' => 'Günlük çıkış paketlerini reddet', @@ -819,9 +834,11 @@ 'enabledtitle' => 'Aktif', 'encapsulation' => 'Kapsülleme', 'encrypted' => 'Şifre', +'encryption' => 'Şifreleme:', 'end address' => 'Bitiş adresi:', 'enter ack class' => 'ACK-Sınıfı girin <br />ve sonra <i>Kaydet</i> düğmesine basın.', 'enter data' => 'Ayarları girin <br />ve sonra <i>Kaydet</i> düğmesine basın.', +'entropy' => 'Entropy', 'err bk 1' => 'Arşiv oluşturma hatası', 'err bk 10 password' => 'Yedek parolası oluşturma hatası', 'err bk 2 key' => 'Anahtar dosyası oluşturulama hatası', @@ -849,7 +866,7 @@ 'expires' => 'Bitiş tarihi', 'export' => 'Dışarı Aktar', 'exportkey' => 'PSK dışarı aktar', -'external access' => 'Harici Erişim', +'external access' => 'Harici erişim', 'external access configuration' => 'Harici erişim yapılandırması', 'external access rule added' => 'Harici erişim kuralı eklendi. Erişim denetleyicisi yeniden başlatılıyor.', 'external access rule changed' => 'Harici erişim kuralı değiştirildi. Erişim denetleyicisi yeniden başlatılıyor.', @@ -858,7 +875,7 @@ 'extrahd' => 'Yedek Diskler', 'extrahd because there is already a device mounted' => ', çünkü bu aygıt bağlandı', 'extrahd cant umount' => 'Ayrılamadı', -'extrahd detected drives' => 'algılanan diskler', +'extrahd detected drives' => 'Algılanan diskler', 'extrahd install or load driver' => 'Aygıtınız buradaki listede yoksa sürücüsünü kurmanız veya yüklemeniz gerekir.<br /> Aygıtınızı görüyor fakat bölümlerini göremiyorsanız önce bunları oluşturmak zorundasınız.', 'extrahd maybe the device is in use' => '. Belki aygıt kullanımda', 'extrahd to' => '-', @@ -877,17 +894,17 @@ 'fireinfo is disabled' => 'Güvenlik duvarı bilgisi devre dışı', 'fireinfo is enabled' => 'Güvenlik duvarı bilgisi aktif', 'fireinfo is submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetine gönderildi.', -'fireinfo is submitted button' => 'Hayır artık profilimi göndermek istemiyorum', +'fireinfo is submitted button' => 'Hayır Artık Profilimi Göndermek İstemiyorum', 'fireinfo kernel version' => 'Çekirdek sürümü', 'fireinfo not submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetlerine henüz gönderilmemiştir.', -'fireinfo not submitted button' => 'Evet profilimi şimdi gönder', +'fireinfo not submitted button' => 'Evet Profilimi Şimdi Gönder', 'fireinfo pakfire version' => 'Pakfire sürümü', 'fireinfo please enable' => 'Lütfen güvenlik duvarı bilgi hizmetini aktifleştirin.', 'fireinfo settings' => 'Güvenlik duvarı bilgi ayarları', 'fireinfo system version' => 'Sistem sürümü', 'fireinfo why descr1' => 'Bu seçeneği aktifleştirmek IPFire gelişimi için çok önemlidir.', 'fireinfo why descr2' => 'Bunun ', -'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleştirmeliy im?', +'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleştirmeliyim?', 'fireinfo why read more' => 'nedenleri hakkında bilgi için tıklayın.', 'fireinfo your profile id' => 'Profil kimliğiniz', 'firewall' => 'Güvenlik Duvarı', @@ -899,14 +916,17 @@ 'firewall logs' => 'Güvenlik Duvarı Günlükleri', 'firewall logs ip' => 'Gd-Günlük Grafikleri (IP)', 'firewall logs port' => 'Gd-Günlük Grafikleri (Port)', +'firewall rules' => 'Güvenlik duvarı kuralları', 'firewallhits' => 'güvenlik duvarı kaydı', 'firmware' => 'Yazılım', 'firmware upload' => 'Yazılım/Sürücü Yükle', +'first' => 'İlk', 'fixed ip lease added' => 'Sabit IP kirası eklendi', 'fixed ip lease modified' => 'Sabit IP kirası güncellendi', 'fixed ip lease removed' => 'Sabit IP kirası kaldırıldı', 'force update' => 'Zorla güncelleştir', 'force user' => 'kullanıcıya tüm yeni dosyaları zorla', +'forward firewall' => 'Güvenlik Duvarı', 'forwarding rule added' => 'Yönlendirme kuralı eklendi. Yeniden başlatmayı gönder.', 'forwarding rule removed' => 'Yönlendirme kuralı kaldırıldı. Yeniden başlatmayı gönder.', 'forwarding rule updated' => 'Yönlendirme kuralı güncellendi. Yeniden başlatmayı gönder.', @@ -924,9 +944,9 @@ 'from email user' => 'Gönderen e-posta kullanıcısı', 'from warn email bad' => 'Gönderen e-posta adresi geçerli değil', 'fw blue' => 'MAVİ arabirim için güvenlik duvarı seçenekleri', -'fw default drop' => 'Güvenlik duvarı ilkesi', +'fw default drop' => 'Güvenlik duvarı yöntemleri', 'fw logging' => 'Güvenlik duvarı günlüğü', -'fw settings' => 'Düvenlik duvarı ayarları', +'fw settings' => 'Güvenlik duvarı ayarları', 'fw settings color' => 'Kural tablosunda renkleri göster', 'fw settings dropdown' => 'Kural oluşturulan sitedeki tüm ağları göster', 'fw settings remark' => 'Kural tablosunda açıklamaları göster', @@ -938,21 +958,24 @@ 'fwdfw REJECT' => 'REDDET', 'fwdfw action' => 'Eylem', 'fwdfw additional' => 'Ek ayarlar', -'fwdfw addrule' => 'Kural Ekle/Düzenle:', +'fwdfw addrule' => 'Kural Ekle/Düzenle::', 'fwdfw all icmp' => 'Tüm ICMP türleri', 'fwdfw change' => 'Güncelle', 'fwdfw copy' => 'Kopyala', 'fwdfw delete' => 'Sil', 'fwdfw dnat' => 'Hedef NAT (Bağlantı noktası yönlendirme)', 'fwdfw dnat error' => 'DNAT için bir tek ana bilgisayar seçmeniz gerekir. Gruplara veya ağlara izin verilmez.', -'fwdfw dnat porterr' => 'NAT için tek bir bağlantı noktası veya bağlantı noktası aralığı (tcp/udp) seçmek zorundasınız', +'fwdfw dnat extport' => 'Harici bağlantı noktası kaynak NAT kurallarını kullanırken boş olmak zorundadır.', +'fwdfw dnat nochoice' => 'Lütfen NAT bölümünden kaynak NAT veya hedef NAT seçin.', +'fwdfw dnat porterr' => 'NAT için tek bir bağlantı noktası veya bağlantı noktası aralığı (tcp/udp) seçmek zorundasınız.', +'fwdfw dnat porterr2' => 'Hiçbir hedef bağlantı noktası tanımlamdan harici bir bağlantı noktası (NAT) kullanamazsınız.', 'fwdfw edit' => 'Düzenle', 'fwdfw err nosrc' => 'Bir kaynak seçilmedi.', 'fwdfw err nosrcip' => 'Lütfen bir kaynak IP adresi belirtin.', 'fwdfw err notgt' => 'Bir hedef seçilmedi.', 'fwdfw err notgtip' => 'Lütfen bir hedef IP adresi belirtin.', 'fwdfw err prot_port' => 'Seçilen kuuralla kaynak veya hedef bağlantı noktasına izin verilmez', -'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef bağlantı noktası kullanırken seçmek zorunda ', +'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef bağlantı noktası kullanırken seçmek zorunda', 'fwdfw err remark' => 'Açıklama içinde geçersiz karakterler.', 'fwdfw err ruleexists' => 'Bu kural zaten var.', 'fwdfw err same' => 'Kaynak ve hedef aynı.', @@ -968,6 +991,7 @@ 'fwdfw from' => 'Kimden:', 'fwdfw hint ip1' => 'Son oluşturulan kurallar hiçbir zaman eşleşmemelidir çünkü kaynak ve hedefin alt ağları çakışabilir', 'fwdfw hint ip2' => 'Bu kuralın mantıklı olup olmadığını bir kez daha kontrol edin: ', +'fwdfw hint mac' => 'Kod oluşturma sırasında görmezden gelinecek MAC adresleri.', 'fwdfw iface' => 'Arayüz', 'fwdfw ipsec network' => 'IPsec ağları:', 'fwdfw log' => 'Günlük', @@ -977,18 +1001,17 @@ 'fwdfw movedown' => 'Aşağı taşı', 'fwdfw moveup' => 'Yukarı taşı', 'fwdfw natport used' => 'NAPT için verilen bağlantı noktası başka bir DNAT kural tarafından zaten kullanılıyor.', -'fwdfw newrule' => 'Yeni kural', +'fwdfw newrule' => 'Yeni Kural', 'fwdfw p2p txt' => 'P2P ağlarına erişim izni Ver/Verme.', 'fwdfw pol allow' => 'İzin Verildi', 'fwdfw pol block' => 'Engellendi', 'fwdfw pol text' => 'Yerel ağlardan bağlantılar için varsayılan günvenlik duvarı davranışını ayarlar. Tüm yeni bağlantılara izin verebilir veya varsayılan olarak engelleyebilirsiniz. Yerel ağlar arasındaki bağlantılar ayrıca sonraki biçimde engellenir.', -'fwdfw pol text1' => 'Güvenlik duvarı tarafından başlatılan bağlantıları için varsayılan güvenlik duvarı davranışını ayarlar. -Dikkat! Kendinizi engelleyebilirsiniz.', +'fwdfw pol text1' => 'Güvenlik duvarı tarafından başlatılan bağlantıları için varsayılan güvenlik duvarı davranışını ayarlar. Dikkat! Kendinizi engelleyebilirsiniz.', 'fwdfw pol title' => 'Varsayılan güvenlik duvarı davranışı', 'fwdfw prot41' => 'IPv6 Kuşatması (Kural 41)', 'fwdfw prot41 short' => 'IPv6 Kuşatması', 'fwdfw red' => 'KIRMIZI', -'fwdfw reread' => 'Değişiklikleri uygula', +'fwdfw reread' => 'Değişiklikleri Uygula', 'fwdfw rule action' => 'Eylem kuralı:', 'fwdfw rule activate' => 'Kuralı etkinleştir', 'fwdfw rulepos' => 'Kural konumu', @@ -998,13 +1021,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwdfw sourceip' => 'Kaynak adresi (MAC/IP adresi veya ağı):', 'fwdfw std network' => 'Standart ağlar:', 'fwdfw target' => 'Hedef', -'fwdfw targetip' => 'Hedef adresi (MAC/IP adresi veya ağ):', +'fwdfw targetip' => 'Hedef adres (MAC/IP adresi veya ağı):', 'fwdfw till' => 'Son zaman:', 'fwdfw time' => 'Zaman Kısıtlamaları', 'fwdfw timeframe' => 'Zaman kısıtlamalarını kullan', 'fwdfw toggle' => 'Etkinleştirin veya devre dışı bırakın', 'fwdfw togglelog' => 'Günlüğü etkinleştirin veya devre dışı bırakın', -'fwdfw use nat' => 'Ağ Adresi Çevirisi kullanın (NAT)', +'fwdfw use nat' => 'Ağ adres dönüştürücüsünü kullanın (NAT)', 'fwdfw use srcport' => 'Kaynak bağlantı noktası:', 'fwdfw use srv' => 'Hedef bağlantı noktası:', 'fwdfw useless rule' => 'Bu kural geçersiz.', @@ -1020,7 +1043,6 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost addgrpname' => 'Grup adı:', 'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:', 'fwhost addnet' => 'Yeni bir ağ ekle:', -'fwhost addrule' => 'Kural ekle/düzenle:', 'fwhost addservice' => 'Hizmet ekle:', 'fwhost addservicegrp' => 'Yeni bir hizmet grubu ekle:', 'fwhost any' => 'Herhangi', @@ -1035,7 +1057,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:', 'fwhost cust net' => 'Ağlar:', 'fwhost cust service' => 'Hizmetler:', -'fwhost cust srvgrp' => 'Hizmet Grupları:', +'fwhost cust srvgrp' => 'Hizmet grupları:', 'fwhost deleted' => 'Silindi', 'fwhost empty' => 'Tanımlı kurallar yok', 'fwhost err addr' => 'Geçersiz IP adresi veya alt ağ', @@ -1076,13 +1098,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost ipadr' => 'IP adresi:', 'fwhost ipsec host' => 'IPsec istemcileri:', 'fwhost ipsec net' => 'IPsec ağları:', -'fwhost menu' => 'Güvenlik Duvarı grupları', +'fwhost menu' => 'Güvenlik Duvarı Gurupları', 'fwhost netaddress' => 'Ağ adresi', 'fwhost newgrp' => 'Ağ/Ana Bilgisayar Grupları', 'fwhost newhost' => 'Ana Bilgisayarlar', 'fwhost newnet' => 'Ağlar', 'fwhost newservice' => 'Hizmetler', -'fwhost newservicegrp' => 'Hizmet grupları', +'fwhost newservicegrp' => 'Hizmet Gurupları', 'fwhost orange' => 'Turuncu', 'fwhost ovpn_n2n' => 'Ağdan-Ağa OpenVPN', 'fwhost port' => 'Bağlantı Noktası', @@ -1098,13 +1120,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'fwhost wo subnet' => '(alt ağ olmadan)', 'g.dtm' => 'KALDIRILACAK', 'g.lite' => 'KALDIRILACAK', -'gateway' => 'Ağ Geçidi', +'gateway' => 'Ağ geçidi', 'gateway ip' => 'Ağ Geçidi IP Adresi', 'gen static key' => 'Statik bir anahtar oluştur', 'generate' => 'Yönetici/Sunucu Sertifikası Oluştur', 'generate a certificate' => 'Sertifika oluştur:', 'generate iso' => 'ISO oluştur', -'generate root/host certificates' => 'Yönetici/Sunucu sertifikası oluştur', +'generate root/host certificates' => 'Yönetici/Sunucu Sertifikası Oluştur', 'generate tripwire keys and init' => 'tripwire anahtarları ve init oluştur', 'generatekeys' => 'Anahtar Oluştur', 'generatepolicy' => 'Yeni kural oluştur', @@ -1117,10 +1139,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'gpl license agreement' => 'Lisans Sözleşmesi', 'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin', 'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı çevirisi', -'graph' => 'Grafiği', +'graph' => 'grafiği', 'graph per' => '-', 'green' => 'YEŞİL', 'green interface' => 'Yeşil Arabirim', +'grouptype' => 'Gurup türü:', 'guaranteed bandwith' => 'Garantili bant genişliği', 'guardian alertfile' => 'Uyarı dosyası', 'guardian configuration' => 'Koruyucu Yapılandırması', @@ -1171,7 +1194,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ids preprocessor' => 'IDS önişlemcisi', 'ids rules license' => 'Sourcefire VRT Sertifikalı Kurallarından yararlanmak için kayıt olmanız gerekmektedir', 'ids rules license1' => '.', -'ids rules license2' => 'Lisans kabulü için siteyi ziyaret ede veya e-posta ile aktifleştirin. Sonra ', +'ids rules license2' => 'Lisans kabulü için siteyi ziyaret edin veya e-posta ile aktifleştirin. Sonra ', 'ids rules license3' => 'adresine gidin. Önce "Kod Oluştur" düğmesine basın ve sonra aşağıdaki alana 40 karakterlik Onikcode kodunu kopyalayın.', 'ids rules update' => 'Snort kuralları güncelleştirme', 'iface' => 'Iface', @@ -1198,11 +1221,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'installed' => 'Yüklenenler', 'installed updates' => 'Yüklenen güncellemeler:', 'instant update' => 'Hızlı Güncelle', +'integrity' => 'Bütünlük:', 'interface' => 'Ara birim', 'interfaces' => 'Ara birim', 'internet' => 'İNTERNET', 'intrusion detection' => 'Saldırı Tespiti', -'intrusion detection system' => 'Saldırı Tespit Sistemi', +'intrusion detection system' => 'Saldırı tespit sistemi', 'intrusion detection system log viewer' => 'Saldırı Tespit Sistemi Günlük Görüntüleyicisi', 'intrusion detection system rules' => 'saldırı tespit sistemi kuralları', 'intrusion detection system2' => 'Saldırı Tespit Sistemi:', @@ -1225,6 +1249,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'invalid input for dhcp dns' => 'DHCP DNS için geçersiz giriş.', 'invalid input for dhcp domain' => 'DHCP etki alanı için geçersiz giriş.', 'invalid input for dhcp wins' => 'DHCP WINS için geçersiz giriş.', +'invalid input for dpd delay' => 'DPD gecikmesi için geçersiz giriş.', +'invalid input for dpd timeout' => 'DPD zamanaşımı için geçersiz giriş.', 'invalid input for e-mail address' => 'E-posta adresi için geçersiz giriş.', 'invalid input for esp keylife' => 'ESP anahtar ömrü için geçersiz giriş.', 'invalid input for hostname' => 'Ana bilgisayar adı için geçersiz giriş.', @@ -1281,9 +1307,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ipfire side is invalid' => 'Geçersiz IPFire yan listesi.', 'ipfires hostname' => 'IPFire ana bilgisayar adı', 'ipinfo' => 'IP bilgi', +'ipsec' => 'IPsec', +'ipsec network' => 'IPsec ağ', +'ipsec no connections' => 'Aktif hiçbir IPsec bağlantısı yok', 'iptable rules' => 'IPTablo kuralları', -'iptmangles' => 'IPTablo Sıkıştırmaları', -'iptnats' => 'IPTablo Ağ Adres Çevrimi', +'iptmangles' => 'IPTablo sıkıştırmaları', +'iptnats' => 'IPTablo ağ adres çevrimi', 'ipts' => 'IPTablolar', 'isdn' => 'ISDN', 'isdn settings' => 'Ek ISDN ayarları:', @@ -1300,14 +1329,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'key stuff' => '2. Anahtarlar ve Sertifikalar', 'keyreset' => 'Anahtarları Sıfırla', 'keys' => 'anahtarlar', -'lan' => 'LAN', +'lan' => 'YEREL AĞ', 'lang' => 'tr', 'languagepurpose' => 'IPFire sistemini görüntülemek istediğiniz dili seçin:', 'last activity' => 'Son Etkinlik', 'lateprompting' => 'Geç istenen', 'lease expires' => 'Kiralama süresi', +'least preferred' => 'az tercih edilen', 'legend' => 'Açıklamalar', -'length' => 'Süresi', +'length' => 'Süre', +'lifetime' => 'Yaşam süresi:', 'line' => 'Satırı', 'linkq' => 'bağlantı kalitesi', 'load printer' => 'Yazıcı Yükle', @@ -1317,19 +1348,19 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'local ntp server specified but not enabled' => 'Belirtilen yerel NTP sunucusu etkin değil', 'local subnet' => 'Yerel Alt Ağ:', 'local subnet is invalid' => 'Geçersiz yerel alt ağ.', -'local vpn hostname/ip' => 'Yerel VPN Ana Bilgisayar Adı/IP', +'local vpn hostname/ip' => 'Yerel VPN ana bilgisayar adı/ip', 'localkey' => 'yerel Anahtar', 'localkeyfile' => 'Yerel Anahtar Dosyası', 'log' => 'Günlük:', 'log enabled' => 'Günlük Aktif', -'log level' => 'Günlük Seviyesi', +'log level' => 'Günlük seviyesi', 'log lines per page' => 'Sayfa başına satır', 'log server address' => 'Syslog sunucusu:', 'log settings' => 'Günlük Ayarları', 'log summaries' => 'Günlük özetleri', 'log summary' => 'Günlük Özetleri', 'log var messages' => '/var/log/messages için ayarlar:', -'log view' => 'Günlük Kaydı', +'log view' => 'Günlük kaydı', 'log viewer' => 'Günlük görüntüleyici', 'log viewing options' => 'Günlük görüntüleme seçenekleri', 'log-options' => 'Günlük dosya seçenekleri', @@ -1337,7 +1368,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'logging' => 'Günlük', 'logging server' => 'Günlük Sunucusu', 'loginlogout' => 'Giriş/Çıkış', -'logs' => 'günlükler', +'logs' => 'Günlükler', 'lookup failed' => 'Ters arama başarısız', 'loosedirectorychecking' => 'Serbest Dizin Denetimi', 'low' => 'Düşük', @@ -1363,8 +1394,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'mac address recon' => 'Yeniden bağlanmaya çalışılıyor!', 'mac address saved' => 'Başarıyla kaydedildi!', 'mac address saved txt' => 'MAC adresi başarıyla kaydedildi. Fakat değişiklikler sadece yeniden başlattıktan sonra veya yeniden bağlandıktan sonra yürürlüğe girecektir.', -'mac address title' => 'Orta Erişim Kontrolü Adresi', +'mac address title' => 'MAC adresi atayın', 'mac desc' => 'Burada red0 üzerindeki MAC adresini değiştirebilirsiniz. Adres onaltılık (0-9,a-f) bir tanımlama arasında olmalıdır.<br />Örneğin: 00-01-02-0e-b8-d6 veya 00:01:02:0e:b8:d6.', +'mac filter' => 'MAC filtre', 'mac new' => 'Yeni MAC adresi:', 'mac1 new' => 'Yeni MAC adresi 1 (vdsl-inet):', 'mac2 new' => 'Yeni MAC adresi 2 (vdsl-iptv):', @@ -1374,11 +1406,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'main page' => 'Ana sayfa', 'manage ovpn' => '5. Tünel Yönetimi:', 'manage printers' => 'yazıcıları yönet', -'manage shares' => 'Paylaşım Yönetimi', +'manage shares' => 'Paylaşım yönetimi', 'manual' => 'El ile', 'manual control and status' => 'El ile kontrol ve durum:', 'manually' => 'El ile', -'map to guest' => 'Ziyaretçi Haritası', +'map to guest' => 'Ziyaretçi haritası', 'march' => 'Mart', 'marked' => 'İşaretli', 'max bandwith' => 'En fazla bant genişliği', @@ -1391,6 +1423,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'max size' => 'En fazla nesne boyutu (KB):', 'max throughput' => 'En fazla hacmi', 'maximal' => 'En fazla', +'maximum' => 'En fazla', 'maximum retries' => 'En fazla yeniden deneme:', 'may' => 'Mayıs', 'mbmon display' => 'Görüntü', @@ -1405,10 +1438,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'mbmon volt' => 'voltaj', 'meaning' => 'anlam', 'media' => 'Medya', -'media information' => 'medya bilgisi', +'media information' => 'Medya bilgisi', 'medium' => 'Orta', 'memory' => 'Bellek', -'memory information' => 'bellek bilgisi', +'memory information' => 'Bellek bilgisi', 'memory usage per' => 'bellek başına kullanım - ', 'messages logging' => '/var/log/messages için günlük ayarları', 'method' => 'Yöntem:', @@ -1416,6 +1449,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'min delay' => 'En az gecikme', 'min size' => 'En az nesne boyutu (KB):', 'minimal' => 'En az', +'minimum' => 'En az', 'minute' => 'dakika', 'minutes' => 'dakika', 'misc-options' => 'Çeşitli seçenekler', @@ -1434,7 +1468,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'modify' => 'Düzenle', 'modulation' => 'Geçiş', 'monday' => 'Pazartesi', -'month' => 'ay', +'month' => 'Ay', 'month-graph' => 'ay', 'monthly firewallhits' => 'aylık güvenlik duvarı kaydı', 'monthly start day bad' => 'Aylık başlangıç günü doğru değil', @@ -1444,6 +1478,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'monthly volume start day short' => 'İlk gün', 'months' => 'ay', 'more' => 'daha', +'most preferred' => 'En çok tercih edilen', 'mount' => 'Bağla', 'mounted on' => 'Bağlı', 'mpfire' => 'IPFire için Media Player', @@ -1469,7 +1504,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'net to net vpn' => 'Ağdan-Ağa Sanal Özel Ağ', 'net traffic newversion' => 'Yeni Ağ-Trafik sürümü var:', 'net-traffic configuration' => 'Ağ-Trafik Yapılandırması', -'netbios name' => 'Netbios Adı', +'netbios name' => 'Netbios adı', 'netmask' => 'Ağ Maskesi', 'network' => 'Ağ', 'network added' => 'Özel ağ eklendi', @@ -1513,6 +1548,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'not running' => 'çalışmıyor', 'not set' => 'ayarlanmamış', 'notes' => 'Notlar', +'notice' => 'Dikkat', 'november' => 'Kasım', 'ntp common settings' => 'Genel ayarlar', 'ntp configuration' => 'NTP yapılandırması', @@ -1545,6 +1581,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'openvpn fragment allowed with udp' => 'UDP kuralı kullanırken sadece parça kullanılmasına izin verilir.', 'openvpn log' => 'OpenVPN Günlük', 'openvpn mssfix allowed with udp' => 'UDP kuralı kullanırken sadece "mssfix" ile kullanılmasına izin verilir.', +'openvpn network' => 'OpenVPN ağları', 'openvpn prefix local subnet' => 'Önek gösterimi kullanımı yerel alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin.', 'openvpn prefix openvpn subnet' => 'Önek gösterimi kullanımı OpenVPN alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin', 'openvpn prefix remote subnet' => 'Önek gösterimi kullanımı uzak alt ağ için desteklenmez. Lütfen 255.255.255.0 gibi alt ağ maskeleri girin', @@ -1559,10 +1596,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'or' => 'veya', 'orange' => 'TURUNCU', 'organization cant be empty' => 'Kuruluş boş olamaz.', -'organization name' => 'Kuruluş Adı', +'organization name' => 'Kuruluş adı', 'organization too long' => 'Kuruluş adı çok uzun. Kuruluş adı 60 karakterden çok olmamalıdır.', 'original' => 'Orijinal', -'os level' => 'OS Seviyesi', +'os level' => 'OS seviyesi', 'other' => 'Diğer', 'other countries' => 'Diğer ülkelers', 'other login script' => 'Diğer oturum açma komut dosyası', @@ -1602,6 +1639,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn errmsg green already pushed' => 'Yeşil ağ için her zaman bir yol ayarla', 'ovpn errmsg invalid ip or mask' => 'Geçersiz ağ adresi veya alt ağ maskesi', 'ovpn log' => 'OVPN-Günlük', +'ovpn mgmt in root range' => 'Bağlantı noktası numarası 1024 ya da daha yüksek bir numara olmalıdır.', 'ovpn mtu-disc' => 'MTU algılama', 'ovpn mtu-disc and mtu not 1500' => 'MTU algılama 1500 MTU olmasını gerektirir.', 'ovpn mtu-disc maybe' => 'İsteğe Bağlı', @@ -1609,9 +1647,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn mtu-disc off' => 'Devre dışı', 'ovpn mtu-disc with mssfix or fragment' => 'MTU algılama mssfix veya parçası ile kullanılamaz.', 'ovpn mtu-disc yes' => 'Zorunlu', +'ovpn no connections' => 'Hiçbir aktif OpenVPN bağlantısı yok', 'ovpn on blue' => 'MAVİ üzerindeki OpenVPN', 'ovpn on orange' => 'TURUNCU üzerindeki OpenVPN', 'ovpn on red' => 'KIRMIZI üzerindeki OpenVPN', +'ovpn port in root range' => '1024 ya da daha yüksek bir bağlantı noktası numarası gereklidir..', 'ovpn routes push' => 'Yollar (her satırda bir tane) örneğin 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Yol baskı seçenekleri', 'ovpn server status' => 'Güncel OpenVPN sunucu durumu:', @@ -1634,25 +1674,27 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'ovpn_processprioVH' => 'Çok yüksek', 'ovpnstatus log' => 'OVPN-Durum-Günlük', 'ovpnsys log' => 'OVPN-Durum-Günlük', +'p2p block' => 'P2P Ağları', +'p2p block save notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kural ayarlarını lütfen yeniden yükleyin.', 'package failed to install' => 'Paket yüklenemedi.', 'pagerefresh' => 'Sayfa yenileniyor. Lütfen bekleyin.', 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?', 'pakfire ago' => 'önce yapıldı.', -'pakfire available addons' => 'Mevcut Eklentiler:', -'pakfire configuration' => 'Pakfire Yapılandırması', +'pakfire available addons' => 'Mevcut eklentiler:', +'pakfire configuration' => 'Pakfire yapılandırması', 'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:', 'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi', 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):', 'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />eklemek için artı simgesine tıklayınız.', 'pakfire install package' => 'Aşağıdaki paketleri yüklemek istediniz: ', -'pakfire installed addons' => 'Kurulu Eklentiler:', +'pakfire installed addons' => 'Kurulu eklentiler:', 'pakfire last core list update' => 'Son çekirdek listesi güncellemesi', 'pakfire last package update' => 'Son paket listesi güncellemesi', 'pakfire last serverlist update' => 'Son sunucu listesi güncellemesi', 'pakfire last update' => 'Son güncelleme', 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.', 'pakfire register' => 'Pakfire-sunucusuna kayıt:', -'pakfire system state' => 'Sistem Durumu', +'pakfire system state' => 'Sistem durumu', 'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.', 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ', 'pakfire update daily' => 'Günlük güncellemeleri ara:', @@ -1704,7 +1746,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'printing' => 'Yazdırılıyor', 'printing options' => 'yazdırma seçenekleri', 'priority' => 'Öncelik', -'processes' => 'işlemler', +'processes' => 'İşlemler', 'profile' => 'Profil', 'profile deleted' => 'Silinen profiller: ', 'profile has errors' => 'Profil hataları', @@ -1714,7 +1756,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'profile saved' => 'Kaydedilen profiller: ', 'profiles' => 'Profiller:', 'proto' => 'Kural', -'protocol' => 'Kural: ', +'protocol' => 'Kural ', 'proxy' => 'Vekil sunucu', 'proxy access graphs' => 'Vekil sunucu erişim grafiği', 'proxy admin password' => 'Önbellek yönetici parolası', @@ -1753,8 +1795,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'rebooting' => 'Yeniden Başlat', 'rebooting ipfire' => 'IPFire\'ı Yeniden Başlat', 'reconnect' => 'Yeniden Bağlan', -'reconnection' => 'Yeniden Bağlan', +'reconnection' => 'Yeniden bağlan', 'red' => 'İnternet', +'red1' => 'KIRMIZI', 'references' => 'Referanslar', 'refresh' => 'Yenile', 'refresh index page while connected' => 'Index.cgi sayfası bağlandığında yenile', @@ -1774,7 +1817,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'removable device advice' => 'Bir aygıt takıp yenileyin. Aygıtı kullanmadan önce seçip bağlayın. Çıkarmadan önce de ayırın.', 'remove' => 'Kaldır', 'remove ca certificate' => 'CA sertifikasını kaldır', -'remove x509' => 'x509 kaldır', +'remove x509' => 'X509 Kaldır', 'repeat' => 'Tekrar', 'reportfile' => 'Dosya raporu', 'reportlevel' => 'Seviye raporu', @@ -1791,7 +1834,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'restart' => 'Yeniden Başlat', 'restart ovpn server' => 'OpenVPN sunucusunu yeniden başlat', 'restore' => 'Geri Yükle', -'restore defaults' => 'Varsayılanı geri yükle', +'restore defaults' => 'Varsayılanı Geri Yükle', 'restore hardware settings' => 'Donanım ayarlarını geri yükle', 'restore settings' => 'Ayarları Sıfırla', 'reverse sort' => 'Ters kronolojik sıralama', @@ -1801,20 +1844,20 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'root user password' => 'Root parolası', 'route subnet is invalid' => 'Alt ağda geçersiz ek basma yolu', 'router ip' => 'Yönlendirici IP adresi:', -'routing table entries' => 'Yönlendirici Tablo Girdileri:', +'routing table entries' => 'Yönlendirici tablo girdileri:', 'rsvd dst port overlap' => 'IPFire için ayrılmış bağlantı noktası ile örtüşen hedef bağlantı noktası aralığı:', 'rsvd src port overlap' => 'IPFire için ayrılmış bağlantı noktası ile örtüşen kaynak bağlantı noktası aralığı:', 'rules already up to date' => 'Kurallar zaten yüklenmiş.', 'running' => 'ÇALIŞIYOR', 'safe removal of umounted device' => 'Bağlantısı kesilen aygıtı güvenli bir şekilde kaldırabilirsiniz', 'samba' => 'Samba', -'samba status' => 'Samba Durumu', +'samba status' => 'Samba durumu', 'saturday' => 'Cumartesi', 'save' => 'Kaydet', 'save config' => 'ayarları kaydet', 'save error' => 'Yapılandırma arşiv dosyası kaydedilemiyor.', 'save settings' => 'Ayarları kaydet', -'save-adv-options' => 'Gelişmiş seçenekleri kaydet', +'save-adv-options' => 'Gelişmiş Seçenekleri Kaydet', 'script name' => 'Komut adı:', 'secondary dns' => 'İkincil DNS:', 'secondary ntp server' => 'İkincil NTP sunucusu', @@ -1823,7 +1866,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'section' => 'Bölüm', 'secure shell server' => 'Güvenli Kabuk Sunucusu', 'security' => 'Güvenlik', -'security options' => 'Güvenlik Seçenekleri', +'security options' => 'Güvenlik seçenekleri', 'select' => 'Seç', 'select dest net' => 'Bir ağ hedefi seçin.', 'select media' => 'Ortamı seç <br />(çıkartılabilir ortam için sadece FAT desteklenir)', @@ -1836,7 +1879,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'serial' => 'Dizi', 'server reserved' => 'Bağlantı adı sunucusu ayrılmıştır, izin verilmez.', 'server restart' => 'OpenVPN sunucu çalışırken herhangi bir değişikliği kaydetmek mümkün değildir.', -'server string' => 'Sunucu Dizisi', +'server string' => 'Sunucu dizisi', 'service' => 'Hizmet', 'service added' => 'Özel ağ hizmeti eklendi', 'service name' => 'Hizmet adı:', @@ -1846,8 +1889,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'services' => 'Hizmetler', 'services settings' => 'Güvenlik Duvarı - Hizmet Ayarları', 'set' => 'ayar', -'set time now' => 'Zamanı şimdi ayarla', -'set time now help' => 'Herhangi bir zamanda eşitleme etkinliği sırasında (hatta yinelenen bir program kullanılırken) <i>Şimdi zamanı ayarla</i> düğmesine basın. Bir eşitleme olmadan önce beş dakika veya daha fazla beklemek zorunda olduğunuzu unutmayın.', +'set time now' => 'Zamanı Şimdi Ayarla', +'set time now help' => 'Herhangi bir zamanda eşitleme etkinliği sırasında (hatta yinelenen bir program kullanılırken) <i>Zamanı şimdi ayarla</i> düğmesine basın. Bir eşitleme olmadan önce beş dakika veya daha fazla beklemek zorunda olduğunuzu unutmayın.', 'settings' => 'Ayarlar', 'shaping add options' => 'Hizmet ekle', 'shaping list options' => 'Trafik şekillendirme hizmetleri', @@ -1858,7 +1901,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'show areas' => 'alanları göster', 'show ca certificate' => 'CA sertifikalarını göster', 'show certificate' => 'Sertifika göster', -'show crl' => 'Sertifika iptal listesini göster', +'show crl' => 'Sertifika İptal Listesini Göster', 'show host certificate' => 'Ana bilgisayar sertifikalarını göster', 'show last x lines' => 'Son x satırlarını göster', 'show lines' => 'Satırları göster', @@ -1885,6 +1928,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'smbstop' => 'Samba\'yı durdur', 'smtphost' => 'SMTP ana bilgisayarı', 'smtpport' => 'SMTP bağlantı noktası numarası', +'snat new source ip address' => 'Yeni kaynak IP adresi', 'snort hits' => 'Saldırı kuralları için toplam aktif sayı', 'snort working' => 'Snort çalışıyor ... Tüm işlemler başarıyla tamamlanana kadar bekleyin.', 'socket options' => 'Soket seçenekleri', @@ -1912,10 +1956,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'srcprt range overlaps' => 'Kaynak bağlantı noktası aralığı önceden tanımlanmış bir bağlantı noktası ile çakışıyor.', 'srcprt within existing' => 'Kaynak bağlantı noktası önceden tanımlanmış bağlantı noktası aralığı içinde.', 'ssdmz pinholes' => 'Açık Bölge (DMZ)', -'ssh access' => 'SSH Erişimi', +'ssh' => 'SSH', +'ssh access' => 'SSH erişimi', 'ssh access tip' => 'IPFire SSH varsayılan bağlantı noktası olarak 222 kullanmıyor!', 'ssh fingerprint' => 'Parmak izi', -'ssh host keys' => 'SSH Sunucu Anahtarı', +'ssh host keys' => 'SSH sunucu anahtarları', 'ssh is disabled' => 'SSH devre dışı bırakıldı. Durduruluyor.', 'ssh is enabled' => 'SSH aktifleştirildi. Yeniden başlatılıyor.', 'ssh key' => 'Anahtar', @@ -1946,7 +1991,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'static routes' => 'Statik Yollar', 'status' => 'Durum', 'status information' => 'Durum bilgisi', -'status ovpn' => '4. OpenVPN Durumu / Yapılandırma:', +'status ovpn' => 'OpenVPN', 'std classes' => 'Standart sınıflar', 'stop' => 'Dur', 'stop ovpn server' => 'OpenVPN Sunucusunu Durdur', @@ -1960,16 +2005,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'successfully refreshed updates list' => 'Başarıyla güncellemeler listesi yenilendi.', 'summaries kept' => 'Günlük özetlerini tut:', 'sunday' => 'Pazar', +'support donation' => 'Lütfen bağışta bulunarak IPFire projesine destek olun', 'swap' => 'takas alanı', 'swap usage per' => 'takas alanı kullanımı - ', 'system' => 'Sistem', 'system graphs' => 'Sistem Grafikleri', -'system information' => 'Sistem bilgisi', +'system information' => 'Sistem Bilgisi', 'system log viewer' => 'Sistem Günlük Görüntüleyicisi', 'system logs' => 'Sistem Günlükleri', 'system status information' => 'Sistem Durum Bilgisi', 'telephone not set' => 'Telefon ayarlanmamış.', -'template' => 'Ön ayar', +'template' => 'Ön Ayar', 'template warning' => 'QoS kurmak için iki seçeneğiniz vardır. İlk olarak kaydet düğmesine basıp kendi sınıf ve kurallarınızı oluşturabilirsiniz. İkinci olarak ise ön ayar düğmesine basıp sınıf ve kurallar için bir şablonun kurulmasını sağlayın. ', 'test' => 'test', 'test email could not be sent' => 'Test e-posta gönderilemedi', @@ -2012,20 +2058,22 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor accounting period daily' => 'günlük', 'tor accounting period monthly' => 'aylık', 'tor accounting period weekly' => 'haftalık', -'tor acls' => 'Erişim Kontrolü', +'tor acls' => 'Erişim kontrolü', 'tor allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)', 'tor bandwidth burst' => 'En büyük ayırma', 'tor bandwidth rate' => 'En büyük oran', -'tor bandwidth settings' => 'Bant Genişliği Ayarları', +'tor bandwidth settings' => 'Bant genişliği ayarları', 'tor bandwidth unlimited' => 'sınırsız', 'tor bridge enabled' => 'Tor köprüsünü etkinleştir', -'tor common settings' => 'Genel Ayarlar', -'tor configuration' => 'Tor Yapılandırması', +'tor common settings' => 'Genel ayarlar', +'tor configuration' => 'Tor yapılandırması', 'tor connected relays' => 'Bağlı aktarımlar', -'tor contact info' => 'İletişim Bilgileri', +'tor contact info' => 'İletişim bilgileri', 'tor daemon' => 'Artalan süreci', -'tor enabled' => 'Tor Aktif', +'tor directory port' => 'Dizin bağlantı noktası', +'tor enabled' => 'Tor aktif', 'tor errmsg invalid accounting limit' => 'Geçersiz hesap sınırı', +'tor errmsg invalid directory port' => 'Geçersiz dizin bağlantı noktası', 'tor errmsg invalid ip or mask' => 'Geçersiz IP alt ağı', 'tor errmsg invalid node id' => 'Geçersiz düğüm kimliği (ID)', 'tor errmsg invalid relay address' => 'Geçersiz aktarma adresi', @@ -2034,10 +2082,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor errmsg invalid socks port' => 'Geçersiz SOCKS bağlantı noktası', 'tor exit country' => 'Ülçe çıkışı', 'tor exit country any' => 'Herhangi bir ülke', -'tor exit nodes' => 'Çıkış Düğümleri', +'tor exit nodes' => 'Çıkış düğümleri', 'tor relay address' => 'Aktarma adresleri', -'tor relay configuration' => 'Tor Aktarma Yapılandırması', -'tor relay enabled' => 'Tor Aktarma Aktif', +'tor relay configuration' => 'Tor aktarma yapılandırması', +'tor relay enabled' => 'Tor aktarma aktif', 'tor relay external address' => 'Aktarım dış adresi', 'tor relay fingerprint' => 'Aktarım parmak izi', 'tor relay mode' => 'Aktarım biçimi', @@ -2047,7 +2095,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'tor relay mode relay' => 'Sadece aktarım', 'tor relay nickname' => 'Aktarım takma adı', 'tor relay port' => 'Aktarım bağlantı noktası', -'tor service' => 'Tor Servisi', +'tor service' => 'Tor servisi', 'tor socks port' => 'SOCKS bağlantı noktası', 'tor stats' => 'İstatistik', 'tor traffic limit hard' => 'Trafik sınırına ulaşıldı.', @@ -2094,7 +2142,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'unable to contact' => 'Bağlantı Kurulamadı', 'unencrypted' => 'Şifresiz', 'uninstall' => 'Kaldır', -'unix charset' => 'UNIX Karakterleri', +'unix charset' => 'UNIX karakterleri', 'unix group' => ' UNIX kullanıcı grubu', 'unix password sync' => 'Unix Parola Eşitleme', 'unix shell' => 'UNIX Kabuğu', @@ -2173,7 +2221,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'updxlrtr total data from cache' => 'Önbellekten teslim edilen toplam veri (bayt)', 'updxlrtr total files' => 'Önbellekteki toplam dosya', 'updxlrtr unknown' => 'Bilinmeyen', -'updxlrtr update accelerator' => 'Güncelleme Hızlandırıcısı', +'updxlrtr update accelerator' => 'Güncelleme hızlandırıcısı', 'updxlrtr update information' => 'Yüklenebilir bir güncelleştirime sürümü var. Daha fazla bilgi için <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> adresini ziyaret edin.', 'updxlrtr update notification' => 'Güncelleme bildirimi!', 'updxlrtr used by' => 'Kullanan', @@ -2182,16 +2230,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'updxlrtr weekly' => 'haftalık', 'updxlrtr year' => 'Bir yıl', 'upgrade' => 'yükselt', +'uplink' => 'Yükleme bağlantısı', 'uplink speed' => 'Yükleme hızı (kbit/san)', 'uplink std class' => 'Standart yükleme hızı sınıf', 'upload' => 'Yükle', 'upload a certificate' => 'Sertifikası yükle:', 'upload a certificate request' => 'Sertifika isteği yükle:', -'upload ca certificate' => 'CA sertifikası yükle', +'upload ca certificate' => 'CA Sertifikası Yükle', 'upload fcdsl.o' => 'KALDIRILACAK', 'upload file' => 'Dosya yükle', 'upload new ruleset' => 'Yeni kurallar yükle', -'upload p12 file' => 'PKCS12 dosyası yükle', +'upload p12 file' => 'PKCS12 Dosyası Yükle', 'upload static key' => 'Statik bir anahtar yükle', 'upload successful' => 'Yükleme başarılı.', 'upload synch.bin' => 'synch.bin yükle', @@ -2217,17 +2266,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter assigned users' => 'Atanan kullanıcılar', 'urlfilter automatic blacklist update' => 'Otomatik olarak kara listeyi güncelleştir', 'urlfilter automatic update schedule' => 'Otomatik olarak güncelleştirme zamanı', -'urlfilter back to main page' => 'Ana sayfaya geri dön', +'urlfilter back to main page' => 'Ana Sayfaya Geri Dön', 'urlfilter background image' => 'UrlFilter arka plan resmi', 'urlfilter background text' => 'Engellenen sayfanın altında özel bir arkaplan görüntüsü kullanmak için .jpg dosyası yükleme', -'urlfilter backup' => 'Yedek dosyası oluştur', +'urlfilter backup' => 'Yedek Dosyası Oluştur', 'urlfilter backup error' => 'Yedek dosyası oluşturulamıyor', 'urlfilter backup settings' => 'Yedek URL filtre ayarları', 'urlfilter banned clients' => 'Yasaklanan IP adresleri', 'urlfilter blacklist age 1' => 'Son kara liste başarıyla güncellendi', 'urlfilter blacklist age 2' => 'gün önce', 'urlfilter blacklist category name' => 'Kara liste kategori adı', -'urlfilter blacklist editor' => 'Kara liste düzenleyicisi', +'urlfilter blacklist editor' => 'Kara Liste Düzenleyicisi', 'urlfilter blacklist editor info' => 'Kara liste dosyanızı oluturma ve düzenleme', 'urlfilter blacklist name' => 'Kara liste adı', 'urlfilter blacklist update' => 'Kara listeyi güncelleştir', @@ -2260,7 +2309,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter custom url' => 'Özel kaynak URL adresi', 'urlfilter custom url required' => 'Gerekli özel kaynak URL', 'urlfilter custom whitelist' => 'Özel beyaz liste', -'urlfilter daily' => 'günlük', +'urlfilter daily' => 'Günlük', 'urlfilter disabled' => 'Kapalı', 'urlfilter domains' => 'Etki alanı (her satırda bir tane)', 'urlfilter dont restart urlfilter' => 'URL filtreyi yeniden başlatma', @@ -2283,7 +2332,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter enabled' => 'Aktif:', 'urlfilter example' => 'Örneğin: www.etkialani.com', 'urlfilter example ads' => 'Örneğin: www.etkialani.com/reklam/', -'urlfilter export blacklist' => 'Kara listeyi dışarı aktar', +'urlfilter export blacklist' => 'Kara Listeyi Dışarı Aktar', 'urlfilter export error' => 'Dışarı aktarma dosyası dosyası oluşturulamıyor', 'urlfilter expressions' => 'İfadeler (her satırda bir tane)', 'urlfilter file ext block' => 'Engellenen dosya uzantısı', @@ -2294,16 +2343,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter friday' => 'Cum', 'urlfilter from' => 'Başlangıç', 'urlfilter hourly' => 'Saatlik', -'urlfilter import blacklist' => 'Kara listeyi al', +'urlfilter import blacklist' => 'Kara Listeyi Al', 'urlfilter import text' => 'Önceden kaydedilmiş *.tar.gz uzantılı kara liste düzenleyici dosyasını yüklemek için aşağıdan seçin', -'urlfilter install blacklist' => 'Kara listeye yükle', +'urlfilter install blacklist' => 'Kara Listeye Yükle', 'urlfilter install information' => 'Yeni kara liste otomatik olarak oluşturulup veritabanları için derlenecektir. Kara liste boyutuna bağlı olarak güncelleme işlemi birkaç dakika zaman alabilir. URL filtreyi yeniden başlatmadan önce bu görevin muhakkak bitirilmesini bekleyin.', 'urlfilter invalid content' => 'Dosya squidGuard uyumlu kara liste değil', 'urlfilter invalid import file' => 'Dosya geçerli URL filtre kara liste düzenleyicisi dosyası değil', 'urlfilter invalid ip or mask error' => 'Geçersiz IP adresi veya ağ maskesi', 'urlfilter invalid restore file' => 'Bu dosya geçerli bir URL filtre yedek dosyası değil', 'urlfilter invalid user error' => 'Geçersiz kullanıcı adı', -'urlfilter load blacklist' => 'Kara liste dosyasını yükle', +'urlfilter load blacklist' => 'Kara Liste Dosyasını Yükle', 'urlfilter local file redirection' => 'Yeniden yerel dosyaya yönlendir', 'urlfilter log' => 'urlfiltre günlükleri', 'urlfilter log summary' => 'URL filtre kaydı için toplam sayı', @@ -2311,13 +2360,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter logs' => 'URL Filtre Günlükleri', 'urlfilter maintenance' => 'URL filtre bakımı', 'urlfilter manage local file repository' => 'Yerel dosya deposunu yönetin', -'urlfilter manage repository' => 'Depoyu yönet', +'urlfilter manage repository' => 'Depoyu Yönet', 'urlfilter minutes' => 'dakika', 'urlfilter mode allow' => 'İzin ver', 'urlfilter mode block' => 'Engelle', 'urlfilter mon' => 'P', 'urlfilter monday' => 'Pzt', -'urlfilter monthly' => 'aylık', +'urlfilter monthly' => 'Aylık', 'urlfilter msg text 1' => '1. mesaj satırı', 'urlfilter msg text 2' => '2. mesaj satırı', 'urlfilter msg text 3' => '3. mesaj satırı', @@ -2327,6 +2376,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter quota restart message' => 'Not: URL filtrenin yeniden başlatılması tüm kullanıcılar için zaman sayaçlarını sıfırlar', 'urlfilter quota time error' => 'Zaman kotası için geçersiz değer', 'urlfilter quota user error' => 'En az bir kullanıcı adı gereklidir', +'urlfilter redirect template' => 'Sayfa şablonuna yönlendir', 'urlfilter redirectpage' => 'Bu URL adresine yönlendir', 'urlfilter remove file' => 'Deposundan dosyayı kaldır', 'urlfilter renewal' => 'Yenile', @@ -2336,7 +2386,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter restart' => 'URL filtreyi yeniden başlat', 'urlfilter restart message' => 'Değişen URL filtre kurallarının aktifleştirilmesi için yeniden başlatılmalıdır', 'urlfilter restart notification' => 'Değişen kuralları aktifleştir', -'urlfilter restore' => 'Yedek dosyasını içeri aktar', +'urlfilter restore' => 'Yedek Dosyasını İçeri Aktar', 'urlfilter restore results' => 'Sonuçları geri yükle', 'urlfilter restore settings' => 'URL filtre ayarlarını geri yükle', 'urlfilter restore success' => 'URL filtre yapılandırması geri yüklendi. URL filtresi yeni ayarlarını aktifleştirmek için yeniden başlatılması gerekir.', @@ -2345,12 +2395,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter sat' => 'C', 'urlfilter saturday' => 'Cmt', 'urlfilter save and restart' => 'Kaydet ve Yeniden Başlat', -'urlfilter save schedule' => 'Güncelleme ayarlarını kaydet', +'urlfilter save schedule' => 'Güncelleme Ayarlarını Kaydet', 'urlfilter select blacklist' => 'Mevcut kara listeyi seçin', 'urlfilter select multi' => 'Birden çok kategori seçmek için Ctrl tuşuna basın', 'urlfilter select source' => 'İndirmek için kaynağı seçin', -'urlfilter set time constraints' => 'Zaman kısıtlamalarını ayarla', -'urlfilter set user quota' => 'Kullanıcı kotasını ayarla', +'urlfilter set time constraints' => 'Zaman Kısıtlamalarını Ayarla', +'urlfilter set user quota' => 'Kullanıcı Kotasını Ayarla', 'urlfilter show category' => 'Engellenen sayfada kategori göster', 'urlfilter show dnserror' => '"DNS Hatası" URL adreslerini engellemek için kullan', 'urlfilter show ip' => 'Engellenen sayfada IP göster', @@ -2374,12 +2424,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter unfiltered clients' => 'Yasaksız IP adresleri', 'urlfilter update information' => 'Yüklenebilir güncelleştirilmiş bir sürümü var. Daha fazla bilgi için <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> adresini ziyaret edin.', 'urlfilter update notification' => 'Güncelleme bildirimi!', -'urlfilter update now' => 'Şimdi güncelle', +'urlfilter update now' => 'Şimdi Güncelle', 'urlfilter update results' => 'Kara liste güncelleştirme sonuçları', 'urlfilter update rule' => 'Güncelle', 'urlfilter upload background' => 'Resim yükle', -'urlfilter upload blacklist' => 'Kara liste dosyası yükle', -'urlfilter upload file' => 'Dosya yükle', +'urlfilter upload blacklist' => 'Kara Liste Dosyası Yükle', +'urlfilter upload file' => 'Dosya Yükle', 'urlfilter upload file information 1' => 'Not', 'urlfilter upload file information 2' => 'URL filtre depo değişikliklerini aktifleştirmek için yeniden başlatılması gerekir.', 'urlfilter upload file text' => 'Yerel depoya dosya eklemek için aşağıdan bir dosya yükleyin', @@ -2396,7 +2446,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'urlfilter wed' => 'Ç', 'urlfilter wednesday' => 'Çar', 'urlfilter weekday error' => 'Seçilmiş en az bir gün olmalıdır', -'urlfilter weekly' => 'haftalık', +'urlfilter weekly' => 'Haftalık', 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini', 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok', 'usb modem on acm0' => 'ACM0 üzerindeki USB Modem', @@ -2472,11 +2522,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'weeks' => 'hafta', 'wildcards' => 'Joker karakterler', 'wins server' => 'Wins Sunucusu', -'wins support' => 'Wins Desteği', +'wins support' => 'Wins desteği', 'wireless' => 'KABLOSUZ AĞ', 'wireless config added' => 'Kablosuz ağ yapılandırma eklendi', 'wireless config changed' => 'Kablosuz ağ yapılandırma değiştirildi', -'wireless configuration' => 'Kablosuz Ağ ayarları', +'wireless configuration' => 'Kablosuz ağ ayarları', 'wlan client' => 'Kablosuz istemci', 'wlan client advanced settings' => 'Gelişmiş ayarlar', 'wlan client and' => 've', @@ -2507,7 +2557,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', -'wlanap access point' => 'Erişim Noktası', +'wlan clients' => 'Kablosuz istemciler', +'wlanap access point' => 'Access Point', 'wlanap channel' => 'Kanal', 'wlanap country' => 'Ülke Kodu', 'wlanap debugging' => 'Hata ayıklama', @@ -2529,7 +2580,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.', 'wlanap wlan settings' => 'WLan Ayarları', 'wlanap wlan status' => 'WLan Durumu', 'wol wakeup' => 'Kalk', -'workgroup' => 'Çalışma Grubu', +'workgroup' => 'Çalışma grubu', 'written bytes' => 'yazılan bayt', 'xtaccess all error' => 'Bu bağlantı noktası yönlendirme kaydı yapıldığında tüm harici erişim ayarlanamaz.', 'xtaccess bad transfert' => 'Bir bağlantı noktası hedef aralığı belirtirseniz, kaynak aralığı ile aynı olmalıdır!', diff --git a/lfs/initscripts b/lfs/initscripts index 28387f3..02f9743 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -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; \ diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl deleted file mode 100644 index b0abab7..0000000 --- a/src/scripts/dialctrl.pl +++ /dev/null @@ -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 = "‹no action since clearing›"; - $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); -} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 835a1e2863fac9065690b5a79c0ca120f398e533
by git＠ipfire.org 16 Mar '14

16 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 835a1e2863fac9065690b5a79c0ca120f398e533 (commit) from d5e94f72f6fe617f5b1653eaa24fbe0fdc3dde3b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 835a1e2863fac9065690b5a79c0ca120f398e533 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 16 16:02:18 2014 +0100 tzdata: Update to 2014a. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/tzdata | 32 +++++++++----------------------- lfs/tzdata | 34 +++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 36 deletions(-) Difference in files: diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index 7362a0f..2ffb7b5 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -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 diff --git a/lfs/tzdata b/lfs/tzdata index edf5ff2..c36b7a3 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -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) - -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 + 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 + rm -vf /usr/share/zoneinfo/localtime cp -vf /usr/share/zoneinfo/GMT /etc/localtime + @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d5e94f72f6fe617f5b1653eaa24fbe0fdc3dde3b
by git＠ipfire.org 15 Mar '14

15 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d5e94f72f6fe617f5b1653eaa24fbe0fdc3dde3b (commit) from 2b6c5f257980b0f9e4d31f26ac1945092a45df6a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d5e94f72f6fe617f5b1653eaa24fbe0fdc3dde3b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 15 15:08:37 2014 +0100 sudo: Update to 1.8.10p1. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/sudo | 79 +++++++++++++++++++++++++++++++++++++--- config/rootfiles/core/76/exclude | 1 + lfs/sudo | 18 ++++++--- 3 files changed, 86 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo index 4aa763e..c904fc3 100644 --- a/config/rootfiles/common/sudo +++ b/config/rootfiles/common/sudo @@ -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 diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude index a468d0a..18e9b4d 100644 --- a/config/rootfiles/core/76/exclude +++ b/config/rootfiles/core/76/exclude @@ -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 diff --git a/lfs/sudo b/lfs/sudo index 15463c5..7c3feab 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -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) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2b6c5f257980b0f9e4d31f26ac1945092a45df6a
by git＠ipfire.org 13 Mar '14

13 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2b6c5f257980b0f9e4d31f26ac1945092a45df6a (commit) via dadffbf738474d649b7177d56acedbad51d6e603 (commit) via fd24071f657fff2dfa8f878b8eef5d6a1dcf20d8 (commit) via 7e7788ea0bf73e122b71f56e972565d910a1e302 (commit) via 9d870c49eb75331f75bd84daeb6bed658d8a1b90 (commit) via 84004f0538945215dda2b52fe2f664274dc884ce (commit) via 03b08c08f0be261f47335ebf6e608b4b5d6d153a (commit) via 4d81e0f3812fc272b2515a631a2e98c4ae76a42b (commit) via c6df357fd4fefe2a8285ec92e38bd40361fe788e (commit) via b3c53248d97ee083fcf43cc5ff745396be06ca1a (commit) from 38cacce21b42d9e7c079e646096e486ac706e546 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2b6c5f257980b0f9e4d31f26ac1945092a45df6a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 13 15:43:52 2014 +0100 ipfire theme: Fix default setting for hostname in title. commit dadffbf738474d649b7177d56acedbad51d6e603 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 13 15:35:14 2014 +0100 fwhost.cgi: disable "use warnings" commit fd24071f657fff2dfa8f878b8eef5d6a1dcf20d8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 13 15:37:05 2014 +0100 Update translations. commit 7e7788ea0bf73e122b71f56e972565d910a1e302 Merge: 9d870c4 03b08c0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 13 15:32:00 2014 +0100 Merge remote-tracking branch 'amarx/BETA3' into next commit 9d870c49eb75331f75bd84daeb6bed658d8a1b90 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 13 15:29:53 2014 +0100 entropy graph: Remove trend line. commit 84004f0538945215dda2b52fe2f664274dc884ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 13 15:27:14 2014 +0100 Add link to entropy page and show if there is hardware support available. commit 03b08c08f0be261f47335ebf6e608b4b5d6d153a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 13 15:27:01 2014 +0100 VPN Checksubnets: Buttons are now Language Strings commit 4d81e0f3812fc272b2515a631a2e98c4ae76a42b Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 13 15:09:01 2014 +0100 VPN Checksubnets: Now the remote subnets (OpenVPN/IPSec) are checked. If they are defined elsewhere, there's a warningmessage displayed commit c6df357fd4fefe2a8285ec92e38bd40361fe788e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 13 13:53:39 2014 +0100 Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically commit b3c53248d97ee083fcf43cc5ff745396be06ca1a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 13 13:53:39 2014 +0100 Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 79 ++++++++++++++++++++-------- config/cfgroot/graphs.pl | 2 - config/menu/20-status.menu | 6 +++ doc/language_issues.de | 2 + doc/language_issues.en | 2 + doc/language_issues.es | 12 ++++- doc/language_issues.fr | 12 ++++- doc/language_issues.nl | 12 ++++- doc/language_issues.pl | 12 ++++- doc/language_issues.ru | 12 ++++- doc/language_issues.tr | 12 +++++ doc/language_missings | 40 ++++++++++++++ html/cgi-bin/entropy.cgi | 36 +++++++++++++ html/cgi-bin/firewall.cgi | 20 ------- html/cgi-bin/fwhosts.cgi | 3 +- html/cgi-bin/ovpnmain.cgi | 21 ++++++-- html/cgi-bin/vpnmain.cgi | 27 ++++++---- html/html/themes/ipfire/include/functions.pl | 2 +- langs/de/cgi-bin/de.pl | 12 ++++- langs/en/cgi-bin/en.pl | 12 ++++- 20 files changed, 264 insertions(+), 72 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 386b047..adfba54 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -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;} } diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 81b6fa4..4942c98 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -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); diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index c0b780a..8899310 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -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', diff --git a/doc/language_issues.de b/doc/language_issues.de index 881d318..94cf2ce 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -206,6 +206,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from diff --git a/doc/language_issues.en b/doc/language_issues.en index 611a0de..b69be53 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -228,6 +228,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from diff --git a/doc/language_issues.es b/doc/language_issues.es index 636b05f..8ff311d 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -593,6 +593,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 @@ -627,6 +629,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -637,6 +640,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 @@ -679,9 +683,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -727,6 +729,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 +804,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 +818,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: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -860,6 +865,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 @@ -909,6 +916,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 30cc1f1..69f260d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -603,6 +603,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 @@ -638,6 +640,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -648,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: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -690,9 +694,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -738,6 +740,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 +815,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 +829,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: notice WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync @@ -868,6 +873,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 @@ -917,6 +924,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: upload new ruleset WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index e04aae3..59c9ecb 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -591,6 +591,8 @@ 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: dead peer detection WARNING: untranslated string: default ip @@ -603,6 +605,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -612,6 +615,7 @@ 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: fw default drop @@ -637,9 +641,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -685,6 +687,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 +762,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 +775,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: notice WARNING: untranslated string: openvpn network WARNING: untranslated string: ovpn mgmt in root range @@ -787,6 +792,8 @@ WARNING: untranslated string: routing table 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 @@ -835,6 +842,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan client diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 636b05f..8ff311d 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -593,6 +593,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 @@ -627,6 +629,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -637,6 +640,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 @@ -679,9 +683,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -727,6 +729,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 +804,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 +818,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: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -860,6 +865,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 @@ -909,6 +916,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 195ffc1..c7679b7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -596,6 +596,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 @@ -632,6 +634,7 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: downlink WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action @@ -642,6 +645,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 @@ -674,9 +678,7 @@ WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip WARNING: untranslated string: fwdfw err prot_port WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists @@ -722,6 +724,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 +799,7 @@ WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome 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 +814,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: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -850,6 +855,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 @@ -898,6 +905,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: uplink WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 3f27ba2..abcb6ee 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -228,6 +228,8 @@ WARNING: translation string unused: from warn email bad WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err nosrcip +WARNING: translation string unused: fwdfw err notgtip WARNING: translation string unused: fwdfw err prot_port1 WARNING: translation string unused: fwdfw final_rule WARNING: translation string unused: fwdfw from @@ -636,10 +638,13 @@ 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: dead peer detection WARNING: untranslated string: default ip 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 @@ -649,14 +654,17 @@ 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: fwdfw dnat extport WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw hint mac +WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwhost err hostip 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 @@ -669,6 +677,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: notice WARNING: untranslated string: openvpn network WARNING: untranslated string: ovpn mgmt in root range @@ -684,7 +693,10 @@ WARNING: untranslated string: routing table 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 directory port WARNING: untranslated string: tor errmsg invalid directory port +WARNING: untranslated string: uplink WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan clients diff --git a/doc/language_missings b/doc/language_missings index 2ca9bf6..8e13c90 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -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 @@ -75,6 +77,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -84,6 +87,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -185,6 +189,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -278,6 +283,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -292,6 +298,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < ntp common settings < ntp sync @@ -333,6 +340,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < system information < tor < tor 0 = disabled @@ -389,6 +398,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < upload new ruleset < uptime < uptime load average @@ -483,6 +493,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 @@ -518,6 +530,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -527,6 +540,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -628,6 +642,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -721,6 +736,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -735,6 +751,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -792,6 +809,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < system information < tor < tor 0 = disabled @@ -848,6 +867,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template @@ -918,6 +938,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 @@ -953,6 +975,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -962,6 +985,7 @@ < drop outgoing < encryption < entropy +< entropy graphs < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1055,6 +1079,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -1148,6 +1173,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -1162,6 +1188,7 @@ < minimum < minute < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -1204,6 +1231,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < tor < tor 0 = disabled < tor accounting @@ -1259,6 +1288,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template @@ -1330,6 +1360,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 @@ -1367,6 +1399,7 @@ < dnsforward forward_server < dnsforward zone < dns servers +< downlink < dpd delay < dpd timeout < drop action @@ -1377,6 +1410,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 @@ -1471,6 +1505,7 @@ < fwdfw use nat < fwdfw use srcport < fwdfw use srv +< fwdfw warn1 < fwdfw wd_fri < fwdfw wd_mon < fwdfw wd_sat @@ -1564,6 +1599,7 @@ < fw settings remark < fw settings ruletable < grouptype +< hardware support < hour-graph < incoming traffic in bytes per second < integrity @@ -1581,6 +1617,7 @@ < minute < month-graph < most preferred +< no hardware random number generator < notice < openvpn default < openvpn destination port used @@ -1620,6 +1657,8 @@ < ssh < static routes < support donation +< system has hwrng +< system has rdrand < tor < tor 0 = disabled < tor accounting @@ -1675,6 +1714,7 @@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view +< uplink < uptime < uptime load average < urlfilter redirect template diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi index 9362e78..bd3de82 100755 --- a/html/cgi-bin/entropy.cgi +++ b/html/cgi-bin/entropy.cgi @@ -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; +} diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 7bcb079..82684e0 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2375,26 +2375,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 +2394,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 +2413,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]; diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 049233c..2d128f5 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -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'; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fa801a9..877e09c 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2159,7 +2159,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { } else { $errormessage = $Lang::tr{'invalid key'}; } - + &General::firewall_reload(); ### ### Download PKCS12 file @@ -3509,8 +3509,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)$/)) { @@ -4569,6 +4574,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 = ""; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index af836da..f5ec500 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -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'}'> diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index f71181e..0c47cd4 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -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'}"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e951b68..1042707 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -481,8 +481,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ß.', @@ -813,6 +815,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', @@ -1005,6 +1008,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', @@ -1131,6 +1135,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', @@ -1506,6 +1511,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', @@ -1976,6 +1982,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', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d8cfdc7..62facdc 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -499,8 +499,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.', @@ -839,6 +841,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', @@ -1031,6 +1034,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', @@ -1159,6 +1163,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', @@ -1535,6 +1540,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', @@ -2011,6 +2017,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', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 38cacce21b42d9e7c079e646096e486ac706e546
by git＠ipfire.org 13 Mar '14

13 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 38cacce21b42d9e7c079e646096e486ac706e546 (commit) from 09d7ae9471547ea9ab42a77339666a3e5353caf3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 38cacce21b42d9e7c079e646096e486ac706e546 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 13 12:45:56 2014 +0100 samba: update to 3.6.23. ----------------------------------------------------------------------- Summary of changes: lfs/samba | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 13110d5..4f5375c 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)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) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 09d7ae9471547ea9ab42a77339666a3e5353caf3
by git＠ipfire.org 11 Mar '14

11 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 09d7ae9471547ea9ab42a77339666a3e5353caf3 (commit) via 014b284e5f3dc1eb87b1198e717cffa28dc70771 (commit) from 826c22d66c3eae74bb4c7287cdd81478a5341e01 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09d7ae9471547ea9ab42a77339666a3e5353caf3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 11 21:47:16 2014 +0100 linux: Remove disabling of loading the pcspkr module. commit 014b284e5f3dc1eb87b1198e717cffa28dc70771 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 11 18:03:59 2014 +0100 beep: Update to 1.3. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/76/filelists/beep | 1 + lfs/beep | 4 ++-- lfs/linux | 3 --- src/patches/linux-2.6.30-no-pcspkr-modalias.patch | 12 ------------ 4 files changed, 3 insertions(+), 17 deletions(-) create mode 120000 config/rootfiles/core/76/filelists/beep delete mode 100644 src/patches/linux-2.6.30-no-pcspkr-modalias.patch Difference in files: diff --git a/config/rootfiles/core/76/filelists/beep b/config/rootfiles/core/76/filelists/beep new file mode 120000 index 0000000..6db094e --- /dev/null +++ b/config/rootfiles/core/76/filelists/beep @@ -0,0 +1 @@ +../../../common/beep \ No newline at end of file diff --git a/lfs/beep b/lfs/beep index dc0d22c..437677b 100644 --- a/lfs/beep +++ b/lfs/beep @@ -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) diff --git a/lfs/linux b/lfs/linux index 1993cc8..7ffb345 100644 --- a/lfs/linux +++ b/lfs/linux @@ -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 diff --git a/src/patches/linux-2.6.30-no-pcspkr-modalias.patch b/src/patches/linux-2.6.30-no-pcspkr-modalias.patch deleted file mode 100644 index 439269c..0000000 --- a/src/patches/linux-2.6.30-no-pcspkr-modalias.patch +++ /dev/null @@ -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(a)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) - { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 826c22d66c3eae74bb4c7287cdd81478a5341e01
by git＠ipfire.org 10 Mar '14

10 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 826c22d66c3eae74bb4c7287cdd81478a5341e01 (commit) via e9b5ba417924d00309736ca045997c5dec7ce4d3 (commit) via cbb88df1548953beeca06d462c9d3006a15dc9ef (commit) via e55334753d7dc49db0b5530b78b8d0f15ca03e9c (commit) via 5ef260ae4192d644d621f82bfb0a8f514088cc0c (commit) via d7050fc04a06f0decd8faf12c559e899b3848191 (commit) from 9a5050b4c5e9a2635f859cae14820827742dfcf4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 826c22d66c3eae74bb4c7287cdd81478a5341e01 Merge: e9b5ba4 e553347 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 10 21:35:15 2014 +0100 Merge remote-tracking branch 'amarx/INDEX' into next commit e9b5ba417924d00309736ca045997c5dec7ce4d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 10 19:40:20 2014 +0100 firewall: Add auxiliary rules for firewall access. Rules for accessing the firewall are added when access to networks (GREEN, BLUE, ...) the firewall resides in is allowed. commit cbb88df1548953beeca06d462c9d3006a15dc9ef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 10 16:11:50 2014 +0100 vpnmain.cgi: Remove left-over </td> tag. commit e55334753d7dc49db0b5530b78b8d0f15ca03e9c Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Mar 10 12:54:06 2014 +0100 graphs.pl : fixed layout on Nexus 7 devices "hour-Day-week-month-year" now on top of graph commit 5ef260ae4192d644d621f82bfb0a8f514088cc0c Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Mar 10 12:22:32 2014 +0100 index.cgi: fix colors and tables for vpn connections commit d7050fc04a06f0decd8faf12c559e899b3848191 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 8 17:29:47 2014 +0100 ipsec: Allow to create firewall rules for IPsec input as well. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 2 +- config/firewall/firewall-policy | 9 +++++ config/firewall/rules.pl | 36 +++++++++++++++++ html/cgi-bin/index.cgi | 10 ++--- html/cgi-bin/vpnmain.cgi | 2 +- src/patches/strongswan-5.0.2_ipfire.patch | 66 +++++++++++++++++++------------ 6 files changed, 93 insertions(+), 32 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index cc00c66..81b6fa4 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -92,8 +92,8 @@ sub makegraphbox { print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>"; print " - "; print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>"; - print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; print "</center>"; + print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; } # Generate the CPU Graph for the current period of time for values given by diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy index b820a7f..2c583c5 100755 --- a/config/firewall/firewall-policy +++ b/config/firewall/firewall-policy @@ -52,10 +52,19 @@ case "${CONFIG_TYPE}" in ;; esac +HAVE_IPSEC="true" HAVE_OPENVPN="true" # INPUT +# IPsec INPUT +case "${HAVE_IPSEC},${POLICY}" in + true,MODE1) ;; + true,*) + iptables -A POLICYIN -m policy --pol ipsec --dir in -j ACCEPT + ;; +esac + # OpenVPN INPUT # Allow direct access to the internal IP addresses of the firewall # from remote subnets if forward policy is allowed. diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 4bb40a4..51ddb44 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -278,6 +278,11 @@ sub buildrules { # Add time constraint options. push(@options, @time_options); + my $firewall_is_in_source_subnet = 0; + if ($source) { + $firewall_is_in_source_subnet = &firewall_is_in_subnet($source); + } + # Process NAT rules. if ($NAT) { my $nat_address = &get_nat_address($$hash{$key}[29]); @@ -326,6 +331,14 @@ sub buildrules { } push(@options, @source_options); + + if ($firewall_is_in_source_subnet && ($fwdfwsettings{"POLICY"} eq "MODE1") && ($chain eq $CHAIN_FORWARD)) { + if ($LOG && !$NAT) { + run("$IPTABLES -A $CHAIN_INPUT @options @log_limit_options -j LOG --log-prefix '$CHAIN_INPUT '"); + } + run("$IPTABLES -A $CHAIN_INPUT @options -j $target"); + } + push(@options, @destination_options); # Insert firewall rule. @@ -781,3 +794,26 @@ sub make_log_limit_options { return @options; } + +sub firewall_is_in_subnet { + my $subnet = shift; + + my ($net_address, $net_mask) = split("/", $subnet); + if (!$net_mask) { + return 0; + } + + # ORANGE is missing here, because nothing may ever access + # the firewall from this network. + foreach my $zone ("GREEN", "BLUE") { + next unless (exists $defaultNetworks{$zone . "_ADDRESS"}); + + my $zone_address = $defaultNetworks{$zone . "_ADDRESS"}; + + if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) { + return 1; + } + } + + return 0; +} diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index c5ccae8..2ce4030 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -358,7 +358,7 @@ if (($confighash{'ENABLED'} eq "on") || $ovpnip="$ovpnip/$sub"; print <<END; <tr> - <td style='width:25%; text-align:center; background-color:$Header::colourvpn;'> + <td style='width:25%; text-align:center; background-color:$Header::colourovpn;'> <a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a> </td> <td style='width:30%; text-align:center;'>$ovpnip</td> @@ -372,7 +372,7 @@ print"</table>"; #Check if there are any vpns configured (ipsec and openvpn) &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) { - if ($vpnconfig{$key}[0] eq 'on'){ + if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host'){ $showipsec=1; $showbox=1; last; @@ -409,7 +409,7 @@ if ($showbox){ </tr> END foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) { - if ($vpnconfig{$key}[0] eq 'on') { + if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') { $count++; my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]); $vpnsub=&General::iporsubtocidr($vpnsub); @@ -420,8 +420,8 @@ END $col = $color{'color20'}; } print "<tr>"; - print "<td style='text-align:left; color:white; background-color:$Header::colourovpn;'>$vpnconfig{$key}[1]</td>"; - print "<td style='text-align:left; background-color:$col'>$vpnip</td>"; + print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>"; + print "<td style='text-align:center; background-color:$col'>$vpnip</td>"; my $activecolor = $Header::colourred; my $activestatus = $Lang::tr{'capsclosed'}; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 7e90649..af836da 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2520,7 +2520,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <td> <label> <input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} /> - IKE+ESP: $Lang::tr{'use only proposed settings'}</td> + IKE+ESP: $Lang::tr{'use only proposed settings'} </label> </td> </tr> diff --git a/src/patches/strongswan-5.0.2_ipfire.patch b/src/patches/strongswan-5.0.2_ipfire.patch index 6606095..71eb24e 100644 --- a/src/patches/strongswan-5.0.2_ipfire.patch +++ b/src/patches/strongswan-5.0.2_ipfire.patch @@ -1,8 +1,6 @@ -diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in -index 3a40e21..d9f3ea0 100644 --- a/src/_updown/_updown.in +++ b/src/_updown/_updown.in -@@ -193,6 +193,29 @@ custom:*) # custom parameters (see above CAUTION comment) +@@ -178,6 +178,29 @@ ;; esac @@ -32,7 +30,7 @@ index 3a40e21..d9f3ea0 100644 # utility functions for route manipulation # Meddling with this stuff should not be necessary and requires great care. uproute() { -@@ -397,12 +420,12 @@ up-host:iptables) +@@ -407,12 +430,12 @@ # connection to me, with (left/right)firewall=yes, coming up # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -46,9 +44,9 @@ index 3a40e21..d9f3ea0 100644 - -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT + -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 # - # log IPsec host connection setup - if [ $VPN_LOGGING ] -@@ -410,10 +433,10 @@ up-host:iptables) + # allow IPIP traffic because of the implicit SA created by the kernel if + # IPComp is used (for small inbound packets that are not compressed) +@@ -428,10 +451,10 @@ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO \ @@ -61,7 +59,7 @@ index 3a40e21..d9f3ea0 100644 fi fi ;; -@@ -421,12 +444,12 @@ down-host:iptables) +@@ -439,12 +462,12 @@ # connection to me, with (left/right)firewall=yes, going down # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -75,9 +73,9 @@ index 3a40e21..d9f3ea0 100644 - -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT + -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 # - # log IPsec host connection teardown - if [ $VPN_LOGGING ] -@@ -434,10 +457,10 @@ down-host:iptables) + # IPIP exception teardown + if [ -n "$PLUTO_IPCOMP" ] +@@ -459,10 +482,10 @@ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO -- \ @@ -90,7 +88,7 @@ index 3a40e21..d9f3ea0 100644 fi fi ;; -@@ -447,24 +470,24 @@ up-client:iptables) +@@ -472,24 +495,24 @@ # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] then @@ -113,16 +111,26 @@ index 3a40e21..d9f3ea0 100644 - iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT - iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j RETURN + iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT + -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50 fi # - # log IPsec client connection setup -@@ -473,12 +496,51 @@ up-client:iptables) + # allow IPIP traffic because of the implicit SA created by the kernel if +@@ -497,7 +520,7 @@ + # INPUT is correct here even for forwarded traffic. + if [ -n "$PLUTO_IPCOMP" ] + then +- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p 4 \ ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p 4 \ + -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT + fi + # +@@ -507,12 +530,51 @@ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO \ @@ -176,7 +184,7 @@ index 3a40e21..d9f3ea0 100644 ;; down-client:iptables) # connection to client subnet, with (left/right)firewall=yes, going down -@@ -486,28 +548,28 @@ down-client:iptables) +@@ -520,34 +582,34 @@ # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] then @@ -202,8 +210,9 @@ index 3a40e21..d9f3ea0 100644 + iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT \ - $IPSEC_POLICY_IN -j ACCEPT +- $IPSEC_POLICY_IN -j ACCEPT - iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ $IPSEC_POLICY_IN -j RETURN + iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -s $PLUTO_MY_CLIENT $S_MY_PORT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ @@ -211,8 +220,15 @@ index 3a40e21..d9f3ea0 100644 + $IPSEC_POLICY_OUT -j MARK --set-mark 50 fi # - # log IPsec client connection teardown -@@ -516,12 +578,51 @@ down-client:iptables) + # IPIP exception teardown + if [ -n "$PLUTO_IPCOMP" ] + then +- iptables -D INPUT -i $PLUTO_INTERFACE -p 4 \ ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p 4 \ + -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT + fi + # +@@ -557,12 +619,51 @@ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO -- \ @@ -266,7 +282,7 @@ index 3a40e21..d9f3ea0 100644 ;; # # IPv6 -@@ -556,10 +657,10 @@ up-host-v6:iptables) +@@ -597,10 +698,10 @@ # connection to me, with (left/right)firewall=yes, coming up # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -279,7 +295,7 @@ index 3a40e21..d9f3ea0 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -580,10 +681,10 @@ down-host-v6:iptables) +@@ -621,10 +722,10 @@ # connection to me, with (left/right)firewall=yes, going down # This is used only by the default updown script, not by your custom # ones, so do not mess with it; see CAUTION comment up at top. @@ -292,7 +308,7 @@ index 3a40e21..d9f3ea0 100644 -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT # -@@ -606,10 +707,10 @@ up-client-v6:iptables) +@@ -647,10 +748,10 @@ # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -305,7 +321,7 @@ index 3a40e21..d9f3ea0 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT fi -@@ -618,10 +719,10 @@ up-client-v6:iptables) +@@ -659,10 +760,10 @@ # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then @@ -318,7 +334,7 @@ index 3a40e21..d9f3ea0 100644 -s $PLUTO_MY_CLIENT $S_MY_PORT \ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT fi -@@ -645,11 +746,11 @@ down-client-v6:iptables) +@@ -686,11 +787,11 @@ # ones, so do not mess with it; see CAUTION comment up at top. if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] then @@ -332,7 +348,7 @@ index 3a40e21..d9f3ea0 100644 -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ -d $PLUTO_MY_CLIENT $D_MY_PORT \ $IPSEC_POLICY_IN -j ACCEPT -@@ -659,11 +760,11 @@ down-client-v6:iptables) +@@ -700,11 +801,11 @@ # or sometimes host access via the internal IP is needed if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9a5050b4c5e9a2635f859cae14820827742dfcf4
by git＠ipfire.org 08 Mar '14

08 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9a5050b4c5e9a2635f859cae14820827742dfcf4 (commit) from 59124eeb2aacdee2229b68e128cfa8c738ee1a68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9a5050b4c5e9a2635f859cae14820827742dfcf4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 8 14:03:08 2014 +0100 Set version to 2.15 beta3. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index c9c5a71..61b07ff 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="76-beta2" # Core Level (Filename) +CORE="76-beta3" # Core Level (Filename) PAKFIRE_CORE="76" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 59124eeb2aacdee2229b68e128cfa8c738ee1a68
by git＠ipfire.org 07 Mar '14

07 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 59124eeb2aacdee2229b68e128cfa8c738ee1a68 (commit) via dc98645fd42873dfeda01188243565e2f977f4a9 (commit) from 3c3f0b664eb09375e084e969038154899fecf162 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 59124eeb2aacdee2229b68e128cfa8c738ee1a68 Merge: dc98645 3c3f0b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 7 16:33:42 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit dc98645fd42873dfeda01188243565e2f977f4a9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 7 16:33:03 2014 +0100 setddns.pl: Use GetDyndnsRedIP from general-functions.pl. http://forum.ipfire.org/index.php?topic=7504.msg63721#msg63721 ----------------------------------------------------------------------- Summary of changes: src/scripts/setddns.pl | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) Difference in files: diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index 12c0f1d..f97e750 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -44,37 +44,15 @@ if (open(FILE, "$filename")) { # ignore monthly update if not in minimize update mode exit 0 if (($settings{'MINIMIZEUPDATES'} ne 'on') && ($ARGV[1] eq '-m')); -my $ip; -if (open(IP, "${General::swroot}/red/local-ipaddress")) { - $ip = <IP>; - close(IP); - chomp $ip; -} else { - &General::log('Dynamic DNS failure : unable to open local-ipaddress file.'); - exit 0; -} +my $ip = &General::GetDyndnsRedIP(); -#If IP is reserved network, we are behind a router. May we ask for our real public IP ? -if ( &General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') || - &General::IpInSubnet ($ip,'172.16.0.0','255.240.0.0') || - &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0')) { - # We can, but are we authorized by GUI ? - if ($settings{'BEHINDROUTER'} eq 'FETCH_IP') { - if ($ARGV[0] eq '-f'){ - $settings{'BEHINDROUTERWAITLOOP'} = -1; # When forced option, fectch PublicIP now - } - - # Increment counter modulo 4. When it is zero, fetch ip else exit - # This divides by 4 the requests to the dyndns server. - $settings{'BEHINDROUTERWAITLOOP'} = ($settings{'BEHINDROUTERWAITLOOP'}+1) %4; - &General::writehash("${General::swroot}/ddns/settings", \%settings); - exit 0 if ( $settings{'BEHINDROUTERWAITLOOP'} ne 0 ); - my $RealIP = &General::FetchPublicIp; - $ip = (&General::validip ($RealIP) ? $RealIP : 'unavailable'); - &General::log ("Dynamic DNS public router IP is:$ip"); - } +if ($ip eq "unavailable") { + &General::log("Dynamic DNS error: RED/Public IP is unavailable"); + exit(0); } +&General::log("Dynamic DNS public router IP is: $ip"); + if ($ARGV[0] eq '-f') { unlink ($cachefile); # next regular calls will try again if this force update fails. } else { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2014