This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, thirteen has been updated via 5e30738231ced6bfbfb603742a40265e7eef1113 (commit) via 0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4 (commit) via 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 (commit) via ab74c839ddf125b73f7b79e925c31d03e92aa079 (commit) via 55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit) via fb874f2e7cb3a251d16b0555e51a45e219b9e46b (commit) from f0a4269bfee8bce9904abe62144bc377ca7aab14 (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 5e30738231ced6bfbfb603742a40265e7eef1113 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 7 21:13:45 2012 +0100
updater: remove double files from backup.
Add some missed files.
commit 0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4 Merge: f0a4269 9724a0b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 7 00:01:32 2012 +0100
Merge remote-tracking branch 'origin/next' into thirteen
-----------------------------------------------------------------------
Summary of changes: config/outgoingfw/outgoingfw.pl | 61 +++++++++++------------------ config/rootfiles/core/64/filelists/files | 2 + config/rootfiles/core/65/filelists/files | 2 +- config/rootfiles/core/65/filelists/setup | 1 + config/rootfiles/core/65/update.sh | 33 ++++++++++++---- doc/language_issues.de | 3 + doc/language_issues.en | 3 + doc/language_issues.es | 8 +++- doc/language_issues.fr | 8 +++- doc/language_issues.pl | 8 +++- doc/language_issues.ru | 8 +++- doc/language_missings | 20 ++++++++++ html/cgi-bin/credits.cgi | 43 +++++++++++---------- langs/de/cgi-bin/de.pl | 13 ++++-- langs/en/cgi-bin/en.pl | 13 ++++-- langs/es/cgi-bin/es.pl | 8 ++-- langs/fr/cgi-bin/fr.pl | 8 ++-- langs/pl/cgi-bin/pl.pl | 8 ++-- langs/ru/cgi-bin/ru.pl | 8 ++-- src/initscripts/init.d/firewall | 1 - 20 files changed, 155 insertions(+), 104 deletions(-) create mode 120000 config/rootfiles/core/65/filelists/setup
Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 8bb49e0..7dd1430 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -181,6 +181,7 @@ foreach $configentry (sort @configs) @PROTO = ("tcp","udp"); }
+ my $macrule = 0; foreach $PROTO (@PROTO){ foreach $SOURCE (@SOURCE) { $SOURCE =~ s/\s//gi; @@ -189,9 +190,10 @@ foreach $configentry (sort @configs)
if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; - $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $macrule = 1; } else { - $CMD = "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-s $SOURCE -d $DESTINATION -p $PROTO"; }
if ($configline[8] && ( $configline[3] ne 'esp' || $configline[3] ne 'gre') ) { @@ -218,24 +220,12 @@ foreach $configentry (sort @configs) $CMD = "$CMD -o $netsettings{'RED_DEV'}";
if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '", $macrule); } elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", $macrule); }
- if ($DEBUG) { - print "$CMD -j $DO\n"; - } else { - system("$CMD -j $DO"); - } + applyrule("$CMD -j $DO", $macrule); } } } @@ -246,10 +236,9 @@ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile"; @p2ps = <FILE>; close FILE;
-$CMD = "/sbin/iptables -A OUTGOINGFW -m ipp2p"; +$CMD = "-m ipp2p";
-foreach $p2pentry (sort @p2ps) -{ +foreach $p2pentry (sort @p2ps) { @p2pline = split( /;/, $p2pentry ); if ( $outfwsettings{'POLICY'} eq 'MODE2' ) { $DO = "DROP"; @@ -264,27 +253,23 @@ foreach $p2pentry (sort @p2ps) } } if ($P2PSTRING) { - if ($DEBUG) { - print "$CMD $P2PSTRING -j $DO\n"; - } else { - system("$CMD $P2PSTRING -j $DO"); - } + applyrule("$CMD $P2PSTRING -j $DO", 0); }
if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { - $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); - } - } + if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { + applyrule("-o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", 0); + }
- $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); + applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0); +} + +sub applyrule($$) { + my $cmd = shift; + my $macrule = shift; + + system("/sbin/iptables -A OUTGOINGFWMAC $cmd"); + if ($macrule == 0) { + system("/sbin/iptables -A OUTGOINGFW $cmd"); } } diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files index 26308b4..a3b99c8 100644 --- a/config/rootfiles/core/64/filelists/files +++ b/config/rootfiles/core/64/filelists/files @@ -1,4 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 6d0030e..62756fa 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -15,6 +15,6 @@ srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/sbin/setup var/ipfire/langs var/ipfire/qos/bin/makeqosscripts.pl +usr/local/bin/readhash diff --git a/config/rootfiles/core/65/filelists/setup b/config/rootfiles/core/65/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/65/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index 6335e1d..0f1d431 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -24,6 +24,15 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1
+function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + # # Remove old core updates from pakfire cache to save space... core=65 @@ -52,12 +61,13 @@ fi echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... # Add some files that are not in the package to backup -echo lib/modules >> /opt/pakfire/tmp/ROOTFILES -echo etc/udev >> /opt/pakfire/tmp/ROOTFILES -echo lib/udev >> /opt/pakfire/tmp/ROOTFILES -echo boot >> /opt/pakfire/tmp/ROOTFILES -echo etc/snort >> /opt/pakfire/tmp/ROOTFILES -echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES +add_to_backup lib/modules +add_to_backup etc/udev +add_to_backup lib/udev +add_to_backup boot +add_to_backup etc/snort +add_to_backup usr/lib/snort_* +add_to_backup usr/share/zoneinfo
# Backup the files tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ @@ -76,12 +86,16 @@ rm -rf /lib/modules/*-ipfire # # Remove old udev rules. # -cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then + cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +fi cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ rm -rf /etc/udev rm -rf /lib/udev mkdir -p /etc/udev/rules.d -mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then + mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +fi mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
# @@ -95,9 +109,10 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/squid stop /etc/init.d/ipsec stop
-#Remove old snort +#Remove old snort and zoneinfo rm -rf /etc/snort rm -rf /usr/lib/snort_* +rm -rf /usr/share/zoneinfo
# #Extract files diff --git a/doc/language_issues.de b/doc/language_issues.de index d182dbb..5a42ae5 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -117,6 +117,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help @@ -279,6 +280,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.en b/doc/language_issues.en index 3ae364c..6d6a2a6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -307,6 +308,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.es b/doc/language_issues.es index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b1a94a1..189932f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -497,7 +498,9 @@ 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: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -522,14 +525,14 @@ WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed @@ -542,6 +545,7 @@ WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap access point WARNING: untranslated string: wlanap channel diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ee67873..e25d81d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -139,6 +139,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -489,7 +490,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount @@ -503,14 +506,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed @@ -518,4 +521,5 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 16e3ba5..55e0e40 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -10,6 +10,8 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < dns address deleted txt < fireinfo ipfire version < fireinfo is disabled @@ -41,12 +43,15 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < snort working < static routes < system information < upload new ruleset < urlfilter file ext block < urlfilter mode block +< visit us at < vpn keyexchange < wlanap access point < wlanap channel @@ -74,7 +79,9 @@ ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ +< advproxy errmsg invalid upstream proxy < Async logging enabled +< deprecated fs warn < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -103,6 +110,8 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -120,6 +129,7 @@ < Set time on boot < static routes < system information +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: pl # @@ -127,6 +137,8 @@ ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -147,7 +159,10 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < static routes +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: ru # @@ -156,7 +171,9 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< advproxy errmsg invalid upstream proxy < day-graph +< deprecated fs warn < disk access per < Edit an existing route < extrahd because there is already a device mounted @@ -183,8 +200,11 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing traffic in bytes per second < static routes +< visit us at < vpn keyexchange < week-graph < year-graph diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 0d091a2..3224267 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -41,9 +41,16 @@ print <<END <p>$Lang::tr{'donation-text'}</p>
<div align="center"> - <a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a> + <a href="http://www.ipfire.org/donate"> + <strong>$Lang::tr{'donation'}</strong> + </a> </div> -<br> +<br><br><hr><br> +<p style="text-align: center;"> + $Lang::tr{'our donors'}: + + <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> +</p> END ; &Header::closebox(); @@ -51,12 +58,11 @@ END &Header::openbox('100%', 'left', $Lang::tr{'credits'});
print <<END -<br /><center><b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b></center> -<br /> -<p> - <b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.</b><br /> - <b>We want to say thank you to all of the developers who ever contributed anything to IPFire.</b> -</p> +<br> +<center> + $Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b> +</center> +<br><hr><br>
<p><b>Development:</b><br />
@@ -90,23 +96,18 @@ Peter Schälchli Jan Paul Tücking (<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking@ipfire.org</a>)<br /> </p> -<p> -This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. -</p> END ; &Header::closebox();
-&Header::openbox('100%', 'left', 'General Public License v3'); -if ( -e "/usr/share/doc/licenses/GPLv3" ) { - print '<textarea rows="25" cols="75" readonly="true">'; - print `cat "/usr/share/doc/licenses/GPLv3"`; - print '</textarea>'; -} -else { - print '<br /><a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a><br />'; -} - +&Header::openbox("100%", "left", $Lang::tr{'other'}); +print <<END + <p> + This product includes GeoLite data created by MaxMind, available from + <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. + </p> +END +; &Header::closebox();
&Header::closebigbox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3ec57eb..f686c30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse', 'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller', 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid user' => 'Benutzername existiert nicht', 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich', @@ -1311,10 +1311,12 @@ 'organization too long' => 'Organisation ist zu lang; sie sollte nicht länger als 60 Zeichen lang sein.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Sonstiges', 'other countries' => 'Andere Länder', 'other login script' => 'Anderes Anmeldeskript', 'otherip' => 'Andere IP', 'otherport' => 'Anderer Port', +'our donors' => 'Unsere Unterstützer', 'out' => 'Aus', 'outgoing' => 'ausgehend', 'outgoing firewall' => 'Ausgehende Firewall', @@ -1345,10 +1347,14 @@ 'ovpn config' => 'OVPN-Konfiguration', 'ovpn device' => 'OpenVPN Gerät', 'ovpn dl' => 'OVPN-Konfiguration downloaden', +'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', +'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', +'ovpn routes push' => 'Routen (eine pro Zeile)', +'ovpn routes push options' => 'Route push Optionen', 'ovpn server status' => 'OpenVPN Server Status', 'ovpn subnet' => 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Das OpenVPN Subnetz ist ungültig.', @@ -1369,10 +1375,6 @@ 'ovpn_processprioVH' => 'Sehr Hoch', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push Optionen', -'ovpn routes push' => 'Routen (eine pro Zeile)', -'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', -'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', @@ -2096,6 +2098,7 @@ 'virtual address' => 'Virtuelle Addresse', 'virtual private networking' => 'Virtuelles Privates Netzwerk', 'visible in browselist' => 'Sichtbar in der Verzeichnisliste', +'visit us at' => 'Besuchen Sie uns auf', 'voldown10' => 'Laustärke um 10 verringern', 'voldown5' => 'Laustärke um 5 verringern', 'volup10' => 'Laustärke um 10 erhöhen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 003056f..5fe2391 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Invalid MAC address', 'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller', 'advproxy errmsg invalid proxy port' => 'Invalid proxy port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid user' => 'Username does not exist', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', @@ -1339,10 +1339,12 @@ 'organization too long' => 'Organization is too long; it should not be longer than 60 characters.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Other', 'other countries' => 'Other countries', 'other login script' => 'Other login script', 'otherip' => 'other IP', 'otherport' => 'other Port', +'our donors' => 'Our donors', 'out' => 'Out', 'outgoing' => 'outgoing', 'outgoing firewall' => 'Outgoing Firewall', @@ -1373,10 +1375,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'OpenVPN device:', 'ovpn dl' => 'OVPN-Config Download', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Current OpenVPN server status:', 'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.', @@ -1397,10 +1403,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', @@ -2130,6 +2132,7 @@ 'virtual address' => 'Virtual Address', 'virtual private networking' => 'Virtual Private Networking', 'visible in browselist' => 'visible in browselist', +'visit us at' => 'Visit us at', 'voldown10' => 'Decrease volume by 10', 'voldown5' => 'Decrease volume by 5', 'volup10' => 'Increase volume by 10', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 387ab4a..f96284f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1328,10 +1328,14 @@ 'ovpn config' => 'Configruación de OVPN', 'ovpn device' => 'Dispositivo OpenVPN', 'ovpn dl' => 'Configuración de descargas OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Registro de log de OVPN', 'ovpn on blue' => 'OpenVPN en BLUE', 'ovpn on orange' => 'OpenVPN en ORANGE', 'ovpn on red' => 'OpenVPN en RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Status actual del servidor OpenVPN:', 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0', 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.', @@ -1352,10 +1356,6 @@ 'ovpn_processprioVH' => 'Muy alto', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Falló la instalación del paquete', 'pagerefresh' => 'La página se está actualiszando, por favor espere.', 'pakfire accept all' => '¿Desea instalar todos los paquetes?', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a537459..e91191d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1340,10 +1340,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'Périphérique OpenVPN :', 'ovpn dl' => 'Télécharger OVPN-Config', +'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', +'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN sur BLEU', 'ovpn on orange' => 'OpenVPN sur ORANGE', 'ovpn on red' => 'OpenVPN sur RED', +'ovpn routes push' => 'Routes (une par ligne):', +'ovpn routes push options' => 'Options de Route push', 'ovpn server status' => 'Statut actuel du serveur OpenVPN :', 'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.', @@ -1364,10 +1368,6 @@ 'ovpn_processprioVH' => 'Très haute', 'ovpnstatus log' => 'Journal statut OVPN', 'ovpnsys log' => 'Journal système OVPN', -'ovpn routes push options' => 'Options de Route push', -'ovpn routes push' => 'Routes (une par ligne):', -'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', -'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', 'package failed to install' => 'L'installation du paquet a échoué.', 'pagerefresh' => 'La page est entrain d'être rafraichie, veuillez attendre.', 'pakfire accept all' => 'Voulez-vous installer tout les paquets?', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d8f1890..e0d64a0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1351,10 +1351,14 @@ 'ovpn config' => 'OVPN-Konfig', 'ovpn device' => 'Urządzenie OpenVPN:', 'ovpn dl' => 'Pobierz konfig OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Log OVPN', 'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on red' => 'OpenVPN na int. RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Stan serwera OpenVPN:', 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.', @@ -1375,10 +1379,6 @@ 'ovpn_processprioVH' => 'Bardzo wysoki', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Błąd instalacji pakietu.', 'pagerefresh' => 'Strona jest odświeżana, proszę czekać.', 'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c1afd01..4619983 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1342,10 +1342,14 @@ 'ovpn config' => 'Настройки OVPN', 'ovpn device' => 'Устройство OpenVPN:', 'ovpn dl' => 'Загрузка настроек OVPN', +'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', +'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', 'ovpn log' => 'Журнал OVPN', 'ovpn on blue' => 'OpenVPN на BLUE', 'ovpn on orange' => 'OpenVPN на ORANGE', 'ovpn on red' => 'OpenVPN на RED', +'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', +'ovpn routes push options' => 'Настройки маршрутизации', 'ovpn server status' => 'Текущий статус сервера OpenVPN:', 'ovpn subnet' => 'Подсеть OpenVPN (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Подсеть OpenVPN задана неверно.', @@ -1366,10 +1370,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Настройки маршрутизации', -'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', -'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', -'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index c90687c..7478978 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -188,7 +188,6 @@ case "$1" in
# Outgoing Firewall /sbin/iptables -A FORWARD -j OUTGOINGFWMAC - /sbin/iptables -A FORWARD -j OUTGOINGFW
# localhost and ethernet. /sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT
hooks/post-receive -- IPFire 2.x development tree