IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7863 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 03e7b65b0173ae1ee9e3a5f326eef04596da3b14
by git＠ipfire.org 16 Jan '14

16 Jan '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 03e7b65b0173ae1ee9e3a5f326eef04596da3b14 (commit) via 15e38431b97baeada58f279b62a0cbfb609230a7 (commit) from f56c0f6c774a442da3f85ec590bb75632abd5dca (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 03e7b65b0173ae1ee9e3a5f326eef04596da3b14 Merge: 15e3843 f56c0f6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 16 11:08:01 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 15e38431b97baeada58f279b62a0cbfb609230a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 16 11:06:49 2014 +0100 Fix sourecode upload. ----------------------------------------------------------------------- Summary of changes: make.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 5d12665..cb04763 100755 --- a/make.sh +++ b/make.sh @@ -1083,11 +1083,11 @@ uploadsrc) fi URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') - REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) - cd $BASEDIR/cache/ - for file in $(ls -1 --ignore=toolchains); do - grep -q "$file" <<<$REMOTE_FILES && continue + for file in ${BASEDIR}/cache/*; do + [ -d "${file}" ] && continue + grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue NEW_FILES="$NEW_FILES $file" done [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE} hooks/post-receive -- IPFire 2.x development tree

1 0

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

15 Jan '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 f56c0f6c774a442da3f85ec590bb75632abd5dca (commit) from 8a7976468d6f6a14edeee5edbc54186d307815ec (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 f56c0f6c774a442da3f85ec590bb75632abd5dca Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 15 23:48:48 2014 +0100 clamav: update to 0.98.1. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 6e0276b..885af45 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.18 +usr/lib/libclamav.so.6.1.20 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.18 +usr/lib/libclamunrar.so.6.1.20 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.18 +usr/lib/libclamunrar_iface.so.6.1.20 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index 51febd9..4a9a5a2 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -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 = 0.98 +VER = 0.98.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 23 +PAK_VER = 24 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ca0b8c930efcb8be1d47592d268006c5 +$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

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

15 Jan '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 8a7976468d6f6a14edeee5edbc54186d307815ec (commit) via 5ac5194b89f57d13516fc8e812ea3d4b48e345f3 (commit) via f5f71c79b7168cc90b5b7fb19a7bda47f3b7bfab (commit) from d99f0ff8c620a7fa832354d403cf701120273d40 (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 8a7976468d6f6a14edeee5edbc54186d307815ec Merge: 5ac5194 d99f0ff Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 15 16:45:44 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 5ac5194b89f57d13516fc8e812ea3d4b48e345f3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 15 16:45:12 2014 +0100 Update translations. commit f5f71c79b7168cc90b5b7fb19a7bda47f3b7bfab Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Jan 15 14:23:02 2014 +0100 firewall: some layout changes and new plausi checks for dnat ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 8 ++++++++ html/cgi-bin/firewall.cgi | 30 +++++++++++++++++++----------- langs/de/cgi-bin/de.pl | 4 +++- langs/en/cgi-bin/en.pl | 2 ++ 10 files changed, 44 insertions(+), 12 deletions(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 83b1d9f..98f1137 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -662,6 +662,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_issues.fr b/doc/language_issues.fr index fd6e72c..a281203 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -674,6 +674,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 99ab6ce..0ec13dc 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -620,6 +620,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 83b1d9f..98f1137 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -662,6 +662,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 39d802d..b4043ad 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -657,6 +657,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 45b129b..978c74f 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -626,6 +626,8 @@ WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete WARNING: untranslated string: fwdfw dnat WARNING: untranslated string: fwdfw dnat error +WARNING: untranslated string: fwdfw dnat extport +WARNING: untranslated string: fwdfw dnat nochoice WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 WARNING: untranslated string: fwdfw edit diff --git a/doc/language_missings b/doc/language_missings index e37efe0..1324a4e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -110,6 +110,8 @@ < fwdfw delete < fwdfw dnat < fwdfw dnat error +< fwdfw dnat extport +< fwdfw dnat nochoice < fwdfw dnat porterr < fwdfw dnat porterr2 < fwdfw DROP @@ -540,6 +542,8 @@ < fwdfw delete < fwdfw dnat < fwdfw dnat error +< fwdfw dnat extport +< fwdfw dnat nochoice < fwdfw dnat porterr < fwdfw dnat porterr2 < fwdfw DROP @@ -954,6 +958,8 @@ < fwdfw delete < fwdfw dnat < fwdfw dnat error +< fwdfw dnat extport +< fwdfw dnat nochoice < fwdfw dnat porterr < fwdfw dnat porterr2 < fwdfw DROP @@ -1357,6 +1363,8 @@ < fwdfw delete < fwdfw dnat < fwdfw dnat error +< fwdfw dnat extport +< fwdfw dnat nochoice < fwdfw dnat porterr < fwdfw dnat porterr2 < fwdfw DROP diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 2a9415a..ee13033 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -729,20 +729,32 @@ sub checkrule { #check valid port for NAT if($fwdfwsettings{'USE_NAT'} eq 'ON'){ - #RULE_ACTION must be on if we use NAT + #RULE_ACTION must be ACCEPT if we use NAT $fwdfwsettings{'RULE_ACTION'} = 'ACCEPT'; + #if no dnat or snat selected errormessage + if ($fwdfwsettings{'nat'} eq ''){ + $errormessage=$Lang::tr{'fwdfw dnat nochoice'}; + return; + } + + #if using snat, the external port has to be empty + if ($fwdfwsettings{'nat'} eq 'snat' && $fwdfwsettings{'dnatport'} ne ''){ + $errormessage=$Lang::tr{'fwdfw dnat extport'}; + return; + } #if no dest port is given in nat area, take target host port if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};} if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){ $errormessage=$Lang::tr{'fwdfw dnat porterr2'}; + return; } #check if port given in nat area is a single valid port or portrange if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){ $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>"; }elsif($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'grp3'} eq 'cust_srv'){ my $custsrvport; - #get servcie Protocol and Port + #get service Protocol and Port foreach my $key (sort keys %customservice){ if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]){ if ($customservice{$key}[2] ne 'TCP' && $customservice{$key}[2] ne 'UDP'){ @@ -976,7 +988,6 @@ sub error print "<class name='base'>$errormessage\n"; print " </class>\n"; &Header::closebox(); - print"<hr>"; } } sub fillselect @@ -1020,7 +1031,7 @@ sub gen_dd_block print<<END; <table width='100%' border='0'> <tr><td width='50%' valign='top'> - <table width='100%' border='0'> + <table width='95%' border='0'> <tr><td width='1%'><input type='radio' name='$grp' id='std_net_$srctgt' value='std_net_$srctgt' $checked{$grp}{'std_net_'.$srctgt}></td><td>$Lang::tr{'fwhost stdnet'}</td><td align='right'><select name='std_net_$srctgt' style='width:200px;'> END foreach my $network (sort keys %defaultNetworks) @@ -1066,7 +1077,7 @@ END print"</select></td>"; } #End left table. start right table (vpn) - print"</tr></table></td><td valign='top'><table width='100%' border='0'><tr>"; + print"</tr></table></td><td valign='top'><table width='95%' border='0' align='right'><tr>"; # CCD networks if( ! -z $configccdnet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){ print"<td width='1%'><input type='radio' name='$grp' id='ovpn_net_$srctgt' value='ovpn_net_$srctgt' $checked{$grp}{'ovpn_net_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_net_$srctgt' style='width:200px;'>"; @@ -1456,7 +1467,6 @@ sub newrule $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED'; $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED'; $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED'; - $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; @@ -1516,13 +1526,11 @@ sub newrule $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED'; $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED'; $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED'; - $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED'; + $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; - $selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected'; - $selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected'; } } $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'}; @@ -1544,7 +1552,9 @@ sub newrule } }else{ $fwdfwsettings{'ACTIVE'}='ON'; + $fwdfwsettings{'nat'} = 'dnat'; $checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED'; + $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED'; $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'}; $fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}}; $fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'}; @@ -1851,7 +1861,6 @@ END &Header::closebox; $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = 'CHECKED'; print <<END; - <br> <center> <table width="80%" class='tbl' id='actions'> <tr> @@ -2028,7 +2037,6 @@ END <input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' /> <input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' /> <input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' /> - <input type='hidden' name='nat' value='$fwdfwsettings{'nat'}' /> <input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td> </table></form> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9a5feb0..c93234b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -933,7 +933,9 @@ 'fwdfw delete' => 'Löschen', 'fwdfw dnat' => 'Destination-NAT (Port-Weiterleitung)', 'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt', -'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden', +'fwdfw dnat extport' => 'Bei Source-NAT-Regeln darf der externe Port nicht gesetzt sein.', +'fwdfw dnat nochoice' => 'Bitte wählen Sie Source-NAT oder Destination-NAT im NAT-Bereich aus.', +'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden.', 'fwdfw dnat porterr2' => 'Externer Port (NAT) darf nur angegeben werden, wenn ein Ziel-Port definiert ist.', 'fwdfw edit' => 'Bearbeiten', 'fwdfw err nosrc' => 'Keine Quelle ausgewählt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f68ec4c..67b5dd5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -959,6 +959,8 @@ 'fwdfw delete' => 'Delete', 'fwdfw dnat' => 'Destination NAT (Port forwarding)', 'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.', +'fwdfw dnat extport' => 'The external port has to be empty when using Source NAT rules.', +'fwdfw dnat nochoice' => 'Please pick Source NAT or Destination NAT from the NAT section.', 'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT', 'fwdfw dnat porterr2' => 'Cannot use external port (NAT) when no destination port is defined.', 'fwdfw edit' => 'Edit', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d99f0ff8c620a7fa832354d403cf701120273d40
by git＠ipfire.org 14 Jan '14

14 Jan '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 d99f0ff8c620a7fa832354d403cf701120273d40 (commit) via 2a127986dc90b9449d5e69c388b15efb851b5980 (commit) from bfaa69562a5a0d9a57c3a374d967da9875ff77be (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 d99f0ff8c620a7fa832354d403cf701120273d40 Merge: 2a12798 bfaa695 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 14 22:35:11 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 2a127986dc90b9449d5e69c388b15efb851b5980 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 14 22:34:23 2014 +0100 fifteen: don't run firstsetup after update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/76/update.sh | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index eafb3cf..1a3c6b3 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -272,6 +272,9 @@ sed -i -e "s|^none\s/var/run|#none /var/run|/g" /etc/fstab # Convert udev persistent network rules sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules +# Firstsetup was already run +touch /var/ipfire/main/firstsetup_ok + # # Start services # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bfaa69562a5a0d9a57c3a374d967da9875ff77be
by git＠ipfire.org 14 Jan '14

14 Jan '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 bfaa69562a5a0d9a57c3a374d967da9875ff77be (commit) from 5a906c11ecc29e00180508f835e308af1e6f8615 (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 bfaa69562a5a0d9a57c3a374d967da9875ff77be Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jan 14 22:09:13 2014 +0100 Firewall: Hide rule actions when using NAT. There is no need to choose a rule action when creating a NAT rule, so this section can be hidden when "Use NAT" has been checked. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 5196670..2a9415a 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -136,14 +136,17 @@ print<<END; \$("#protocol").change(update_protocol); update_protocol(); - // When nat not used, hide it - if (! \$("#USE_NAT").attr("checked")) { + // Show/Hide elements when NAT checkbox is checked. + if (\$("#USE_NAT").attr("checked")) { + \$("#actions").hide(); + } else { \$(".NAT").hide(); } // Show NAT area when "use nat" checkbox is clicked \$("#USE_NAT").change(function() { \$(".NAT").toggle(); + \$("#actions").toggle(); }); // Time constraints hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5a906c11ecc29e00180508f835e308af1e6f8615
by git＠ipfire.org 14 Jan '14

14 Jan '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 5a906c11ecc29e00180508f835e308af1e6f8615 (commit) via 9d38669861117bc30253483cd314ff6ed563ff02 (commit) via 8e7137264bdfae87367a7414d07a054eb7c58c7c (commit) from bf5e1c4c52828c48d6c51b6830f9d696be261877 (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 5a906c11ecc29e00180508f835e308af1e6f8615 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 14 21:58:03 2014 +0100 Update translations. commit 9d38669861117bc30253483cd314ff6ed563ff02 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Tue Jan 14 21:57:26 2014 +0100 index.cgi: Re-design index page. commit 8e7137264bdfae87367a7414d07a054eb7c58c7c Author: Alexander Marx <amarx(a)ipfire.org> Date: Tue Jan 14 14:11:50 2014 +0100 firewall: perl modifications for hiding rule action when nat is used ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 2 +- doc/language_issues.en | 2 +- doc/language_issues.es | 5 +- doc/language_issues.fr | 5 +- doc/language_issues.nl | 5 +- doc/language_issues.pl | 5 +- doc/language_issues.ru | 5 +- doc/language_issues.tr | 5 +- doc/language_missings | 20 ++ html/cgi-bin/firewall.cgi | 5 +- html/cgi-bin/{ipinfo.cgi => gpl.cgi} | 107 ++++------ html/cgi-bin/index.cgi | 367 +++++++++++++++++------------------ langs/de/cgi-bin/de.pl | 8 +- langs/en/cgi-bin/en.pl | 4 +- 14 files changed, 277 insertions(+), 268 deletions(-) copy html/cgi-bin/{ipinfo.cgi => gpl.cgi} (55%) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 4add394..50cdc5a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -140,7 +140,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -275,6 +274,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 diff --git a/doc/language_issues.en b/doc/language_issues.en index 416d9eb..6a516c3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -161,7 +161,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -300,6 +299,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 diff --git a/doc/language_issues.es b/doc/language_issues.es index ab74343..83b1d9f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -154,7 +154,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -791,6 +790,7 @@ WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime @@ -811,6 +811,7 @@ WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 WARNING: untranslated string: ovpn mtu-disc maybe @@ -818,6 +819,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: ovpn no connections +WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: p2p block diff --git a/doc/language_issues.fr b/doc/language_issues.fr index ad06662..fd6e72c 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -154,7 +154,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -803,6 +802,7 @@ WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime @@ -821,6 +821,7 @@ 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: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 WARNING: untranslated string: ovpn mtu-disc maybe @@ -828,6 +829,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +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: pakfire ago diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 6b5c2f4..99ab6ce 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -156,7 +156,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -749,12 +748,16 @@ WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred 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: qos enter bandwidths diff --git a/doc/language_issues.pl b/doc/language_issues.pl index ab74343..83b1d9f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -154,7 +154,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -791,6 +790,7 @@ WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime @@ -811,6 +811,7 @@ WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 WARNING: untranslated string: ovpn mtu-disc maybe @@ -818,6 +819,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: ovpn no connections +WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: p2p block diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b3adf1e..39d802d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -153,7 +153,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -787,6 +786,7 @@ WARNING: untranslated string: incoming traffic in bytes per second 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: least preferred WARNING: untranslated string: lifetime @@ -804,6 +804,7 @@ WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: outgoing traffic in bytes per second +WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 WARNING: untranslated string: ovpn mtu-disc maybe @@ -811,6 +812,8 @@ WARNING: untranslated string: ovpn mtu-disc no WARNING: untranslated string: ovpn mtu-disc off WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment WARNING: untranslated string: ovpn mtu-disc yes +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: proxy reports diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7880240..45b129b 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -161,7 +161,6 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary -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 @@ -755,12 +754,16 @@ WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: most preferred 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 diff --git a/doc/language_missings b/doc/language_missings index 1164640..e37efe0 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -273,7 +273,9 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< ipsec < ipsec network +< ipsec no connections < least preferred < lifetime < minute @@ -294,6 +296,7 @@ < openvpn subnet is used < other < our donors +< ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 < ovpn mtu-disc maybe @@ -301,6 +304,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< ovpn no connections +< ovpn port in root range < p2p block < p2p block save notice < proxy reports @@ -698,7 +703,9 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< ipsec < ipsec network +< ipsec no connections < least preferred < lifetime < minute @@ -733,6 +740,7 @@ < outgoing firewall view group < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 < ovpn mtu-disc maybe @@ -740,6 +748,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< ovpn no connections +< ovpn port in root range < ovpn routes push < ovpn routes push options < p2p block @@ -1107,7 +1117,9 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< ipsec < ipsec network +< ipsec no connections < least preferred < lifetime < minute @@ -1128,6 +1140,7 @@ < our donors < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 < ovpn mtu-disc maybe @@ -1135,6 +1148,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< ovpn no connections +< ovpn port in root range < ovpn routes push < ovpn routes push options < p2p block @@ -1507,7 +1522,9 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< ipsec < ipsec network +< ipsec no connections < least preferred < lifetime < minute @@ -1528,6 +1545,7 @@ < other < our donors < outgoing traffic in bytes per second +< ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 < ovpn mtu-disc maybe @@ -1535,6 +1553,8 @@ < ovpn mtu-disc off < ovpn mtu-disc with mssfix or fragment < ovpn mtu-disc yes +< ovpn no connections +< ovpn port in root range < p2p block < p2p block save notice < proxy reports diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 7ffe59c..5196670 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -726,6 +726,9 @@ sub checkrule { #check valid port for NAT if($fwdfwsettings{'USE_NAT'} eq 'ON'){ + #RULE_ACTION must be on if we use NAT + $fwdfwsettings{'RULE_ACTION'} = 'ACCEPT'; + #if no dest port is given in nat area, take target host port if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};} if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){ @@ -1847,7 +1850,7 @@ END print <<END; <br> <center> - <table width="80%" class='tbl'> + <table width="80%" class='tbl' id='actions'> <tr> <td width="33%" align="center" bgcolor="$color{'color17'}">  <br>  diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi new file mode 100644 index 0000000..7589054 --- /dev/null +++ b/html/cgi-bin/gpl.cgi @@ -0,0 +1,82 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +use strict; +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; +require "/opt/pakfire/lib/functions.pl"; + + +my %cgiparams; +my $refresh; + +if ( -e "/var/ipfire/main/gpl_accepted" ) { + print "Status: 302 Moved Temporarily\n"; + print "Location: index.cgi\n\n"; + exit (0); +} +&Header::showhttpheaders(); + +$cgiparams{'ACTION'} = ''; +&Header::getcgihash(\%cgiparams); + +&Header::openpage($Lang::tr{'main page'}, 1, $refresh); +&Header::openbigbox('', 'center'); + +# licence agreement +if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { + system('touch /var/ipfire/main/gpl_accepted'); +} + +&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'}); +print <<END; + $Lang::tr{'gpl please read carefully the general public license and accept it below'}. + <br /><br /> +END +; +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\'>GNU GENERAL PUBLIC LICENSE</a><br />'; +} +print <<END; + <p> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}. + <br/ > + <input type='submit' name='ACTION' value=$Lang::tr{'yes'} /> + </form> + </p> + <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a> + +END + +&Header::closebox(); +&Header::closebigbox(); +&Header::closepage(); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index d6115bd..3b44baa 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -21,6 +21,7 @@ use strict; use Net::Telnet; +use Sort::Naturally; # enable only the following on debugging purpose #use warnings; @@ -36,12 +37,22 @@ my %pppsettings=(); my %modemsettings=(); my %netsettings=(); my %ddnssettings=(); +my %proxysettings=(); +my %vpnsettings=(); +my %vpnconfig=(); +my %ovpnconfig=(); my $warnmessage = ''; my $refresh = ""; my $ipaddr=''; - -my $haveipsec=0; -my $haveovpn=0; +my $showbox=0; +my $showipsec=0; +my $showovpn=0; + +if ( ! -e "/var/ipfire/main/gpl_accepted" ) { + print "Status: 302 Moved Temporarily\n"; + print "Location: gpl.cgi\n\n"; + exit (0); +} &Header::showhttpheaders(); @@ -53,6 +64,8 @@ $pppsettings{'PROFILENAME'} = 'None'; &General::readhash("${General::swroot}/modem/settings", \%modemsettings); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/ddns/settings", \%ddnssettings); +&General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); +&General::readhash("${General::swroot}/vpn/settings", \%vpnsettings); my %color = (); my %mainsettings = (); @@ -61,12 +74,12 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); - if ( -e "/var/ipfire/main/gpl-accepted" ) { -if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ - $refresh = "<meta http-equiv='refresh' content='5;'>"; -} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { - $refresh = "<meta http-equiv='refresh' content='30;'>"; -} +if ( -e "/var/ipfire/main/gpl-accepted" ) { + if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ + $refresh = "<meta http-equiv='refresh' content='5;'>"; + }elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { + $refresh = "<meta http-equiv='refresh' content='30;'>"; + } } if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) @@ -81,8 +94,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) unlink("${General::swroot}/ppp/settings"); link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}", "${General::swroot}/ppp/settings"); - system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); - + open (TMP, ">${General::swroot}/ppp/updatesettings"); + close TMP; # read in the new params "early" so we can write secrets. %cgiparams = (); &General::readhash("${General::swroot}/ppp/settings", \%cgiparams); @@ -106,10 +119,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) { system('/usr/local/bin/redctrl start > /dev/null') == 0 - or &General::log("Dial failed: $?"); sleep 1;} -elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) { + or &General::log("Dial failed: $?"); sleep 1; +}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) { system('/usr/local/bin/redctrl stop > /dev/null') == 0 - or &General::log("Hangup failed: $?"); sleep 1;} + or &General::log("Hangup failed: $?"); sleep 1; +} my $c; my $maxprofiles = 5; @@ -129,29 +143,21 @@ for ($c = 1; $c <= $maxprofiles; $c++) { $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; my $dialButtonDisabled = "disabled='disabled'"; - &Header::openpage($Lang::tr{'main page'}, 1, $refresh); &Header::openbigbox('', 'center'); +if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) { + $ipaddr = <IPADDR>; + close IPADDR; + chomp ($ipaddr); + } -# licence agreement -if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { - system('touch /var/ipfire/main/gpl_accepted') -} -if ( -e "/var/ipfire/main/gpl_accepted" ) { &Header::openbox('100%', 'center', ''); - - if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { $ipaddr = <IPADDR>; close IPADDR; chomp ($ipaddr); } - if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) { - $ipaddr = <IPADDR>; - close IPADDR; - chomp ($ipaddr); - } } elsif ($modemsettings{'VALID'} eq 'no') { print "$Lang::tr{'modem settings have errors'}\n </b></font>\n"; } else { @@ -160,45 +166,54 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( print <<END;  -<table width=80% class='tbl'> +<table width=80% class='tbl' > <tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th> <th bgcolor='$color{'color20'}'>$Lang::tr{'ip address'}</th> <th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr> <tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td> <td width='30%' align='center'>$ipaddr </td> - <td width='45%' align='center'>$connstate + <td width='45%' align='center'>$connstate </td></tr> END my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; if ( "$HOSTNAME" ne "" ) { print <<END; - <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME<td>  + <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME</td><td></td> END } - if ( -e "/var/ipfire/red/remote-ipaddress" ) { - my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`; + if ( -e "${General::swroot}/red/remote-ipaddress" ) { + open (TMP, "<${General::swroot}/red/remote-ipaddress"); + my $GATEWAY = <TMP>; chomp($GATEWAY); + close TMP; print <<END; - <tr><td><b>Gateway:</b><td align='center'>$GATEWAY<td>  + <tr><td><b>Gateway:</b><td align='center'>$GATEWAY</td><td></td></tr> END } - - my $DNS1 = `cat /var/ipfire/red/dns1`; - my $DNS2 = `cat /var/ipfire/red/dns2`; - chomp($DNS1); + #Read DNS server 1 + open (DNS1, "<${General::swroot}/red/dns1"); + my $DNS1 = <DNS1>; chomp($DNS1); + close DNS1; + #Read DNS server 2 + open (DNS2, "<${General::swroot}/red/dns2"); + my $DNS2 = <DNS2>; + chomp($DNS2); + close DNS2; if ( $DNS1 ) { print <<END; - <tr><td><b>DNS-Server:</b><td align='center'>$DNS1 + <tr><td><b>$Lang::tr{'dns server'}1:</b></td><td align='center'>$DNS1</td><td></td></tr> END } if ( $DNS2 ) { print <<END; - <td align='center'>$DNS2 + <tr><td><b>$Lang::tr{'dns server'}2:</b></td><td align='center'>$DNS2</td><td></td></tr> + </table> END } else { print <<END; - <td> </td> + <td></td> </tr> </table> + END } @@ -255,9 +270,9 @@ END <td width='30%' align='center'>$netsettings{'GREEN_ADDRESS'}/$sub <td width='45%' align='center'> END - if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { - print $Lang::tr{'advproxy on'}; - if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; } + if ( $proxysettings{'ENABLE'} eq 'on' ) { + print $Lang::tr{'advproxy on'}; + if ( $proxysettings{'TRANSPARENT'} eq 'on' ) { print " (transparent)"; } } else { print $Lang::tr{'advproxy off'}; } } if ( $netsettings{'BLUE_DEV'} ) { @@ -267,9 +282,9 @@ END <td width='30%' align='center'>$netsettings{'BLUE_ADDRESS'}/$sub <td width='45%' align='center'> END - if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) { - print $Lang::tr{'advproxy on'}; - if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; } + if ( $proxysettings{'ENABLE_BLUE'} eq 'on' ) { + print $Lang::tr{'advproxy on'}; + if ( $proxysettings{'TRANSPARENT_BLUE'} eq 'on' ) { print " (transparent)"; } } else { print $Lang::tr{'advproxy off'}; } } if ( $netsettings{'ORANGE_DEV'} ) { @@ -281,10 +296,8 @@ END END } #check if IPSEC is running -if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` || - `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) { - $haveipsec=1; - my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`; +if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) { + my $ipsecip = $vpnsettings{'VPN_IP'}; print<<END; <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br> <td width='30%' align='center'>$ipsecip @@ -302,7 +315,6 @@ if (($confighash{'ENABLED'} eq "on") || my ($ovpnip,$sub) = split("/",$confighash{'DOVPN_SUBNET'}); $sub=&General::iporsubtocidr($sub); $ovpnip="$ovpnip/$sub"; - $haveovpn=1; print <<END; <tr> <td align='center' bgcolor='$Header::colourovpn' width='25%'> @@ -315,53 +327,73 @@ END print"</td></tr></table>"; &Header::closebox(); -# Start of Box wich contains all vpn connections - &Header::openbox('100%', 'center', $Lang::tr{'vpn'}) if ($haveipsec || $haveovpn); +#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'){ + $showipsec=1; + $showbox=1; + last; + } +} +&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig); +foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) { + if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){ + $showbox=1; + $showovpn=1; + last; + } +} +if ($showbox){ +# Start of Box wich contains all vpn connections + &Header::openbox('100%', 'center', $Lang::tr{'vpn'}); #show ipsec connectiontable - if ( $haveipsec ) { - my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`; + if ( $showipsec ) { + my $ipsecip = $vpnsettings{'VPN_IP'}; my @status = `/usr/local/bin/ipsecctrl I`; my %confighash = (); - &General::readhasharray("${General::swroot}/vpn/config", \%confighash); + my $id = 0; + my $gif; + my $col=""; + my $count=0; print <<END; <br> <table width='80%' class='tbl'> <tr> - <th>$Lang::tr{'ipsec network'}</th> - <th>$Lang::tr{'ip address'}</th> - <th>$Lang::tr{'status'}</th> + <th width='40%'>$Lang::tr{'ipsec network'}</th> + <th width='30%'>$Lang::tr{'ip address'}</th> + <th width='30%'>$Lang::tr{'status'}</th> </tr> END - my $id = 0; - my $gif; - my $col=""; - foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) { - if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; } - my ($vpnip,$vpnsub) = split("/",$confighash{$key}[11]); - $vpnsub=&General::iporsubtocidr($vpnsub); - $vpnip="$vpnip/$vpnsub"; - if ($id % 2) { - $col="bgcolor='$color{'color20'}'"; - print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>"; - } else { - $col="bgcolor='$color{'color22'}'"; - print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>"; - } - - my $active = "<td bgcolor='${Header::colourred}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>"; - if ($confighash{$key}[0] eq 'off') { - $active = "<td bgcolor='${Header::colourblue}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>"; - } else { - foreach my $line (@status) { - if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~/$confighash{$key}[1]\{.*INSTALLED/ )) - { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; + foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) { + if ($vpnconfig{$key}[0] eq 'on') { + $count++; + my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]); + $vpnsub=&General::iporsubtocidr($vpnsub); + $vpnip="$vpnip/$vpnsub"; + if ($count % 2){ + $col="bgcolor='$color{'color22'}'"; + }else{ + $col="bgcolor='$color{'color20'}'"; + } + if ($id % 2) { + print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>"; + } else { + print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>"; + } + my $active = "<td bgcolor='${Header::colourred}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>"; + if ($vpnconfig{$key}[0] eq 'off') { + $active = "<td bgcolor='${Header::colourblue}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>"; + } else { + foreach my $line (@status) { + if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){ + $active = "<td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td>"; + } + } } - } + print "$active</td>"; } - print "$active</td>"; } print "</tr></table>"; } @@ -370,77 +402,67 @@ END # Check if there is any OpenVPN connection configured. ### -if ( $haveovpn ) -{ - print <<END; - <br> - <table width='80%' class='tbl'> - <tr> - <th>$Lang::tr{'openvpn network'}</th> - <th>$Lang::tr{'ip address'}</th> - <th>$Lang::tr{'status'}</th> + if ( $showovpn ){ + print <<END; + <br> + <table width='80%' class='tbl'> + <tr> + <th width='40%'>$Lang::tr{'openvpn network'}</th> + <th width='30%'>$Lang::tr{'ip address'}</th> + <th width='30%'>$Lang::tr{'status'}</th> END - # Check if the OpenVPN server for Road Warrior Connections is running and display status information. - my %confighash=(); - &General::readhash("${General::swroot}/ovpn/settings", \%confighash); - # Print the OpenVPN N2N connection status. - if ( -d "${General::swroot}/ovpn/n2nconf") { - my %confighash=(); - - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - my $lines; - my $col=""; - foreach my $dkey (keys %confighash) { - $lines++; - if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { - my $tport = $confighash{$dkey}[22]; - next if ($tport eq ''); - - my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); - $tnet->open('127.0.0.1'); - my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); - my @tustate = split(/\,/, $output[1]); - - my $display; - my $display_colour = $Header::colourred; - if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) { - $display_colour = $Header::colourgreen; - $display = $Lang::tr{'capsopen'}; - } else { - $display = $tustate[1]; - } - if ($lines %2){ - $col="bgcolor='$color{'color20'}'"; - }else{ - $col="bgcolor='$color{'color22'}'"; - } - #make cidr from ip - my ($vpnip,$vpnsub) = split("/",$confighash{$dkey}[11]); - my $vpnsub=&General::iporsubtocidr($vpnsub); - my $vpnip="$vpnip/$vpnsub"; - print <<END; - <tr> - <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn' width='50%'><font color=white> - $confighash{$dkey}[1] - </td> - <td align='center' $col> - $vpnip - </td> - <td align='center' bgcolor='$display_colour' width='15%'> - <b> - <font color='#FFFFFF'> - $display - </font> - </b> - </td> - </tr> + # Check if the OpenVPN server for Road Warrior Connections is running and display status information. + my $active; + my $count=0; + # Print the OpenVPN N2N connection status. + if ( -d "${General::swroot}/ovpn/n2nconf") { + my $col=""; + foreach my $dkey (sort { ncmp ($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) { + if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){ + $count++; + my $tport = $ovpnconfig{$dkey}[22]; + next if ($tport eq ''); + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + $tnet->open('127.0.0.1'); + my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + my @tustate = split(/\,/, $output[1]); + my $display; + my $display_colour = $Header::colourred; + if ( $tustate[1] eq 'CONNECTED' || ($tustate[1] eq 'WAIT')) { + $display_colour = $Header::colourgreen; + $display = $Lang::tr{'capsopen'}; + } else { + $display = $tustate[1]; + } + if ($count %2){ + $col="bgcolor='$color{'color22'}'"; + }else{ + $col="bgcolor='$color{'color20'}'"; + } + $active='off'; + #make cidr from ip + my ($vpnip,$vpnsub) = split("/",$ovpnconfig{$dkey}[11]); + my $vpnsub=&General::iporsubtocidr($vpnsub); + my $vpnip="$vpnip/$vpnsub"; + print <<END; + <tr> + <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn'><font color='white'>$ovpnconfig{$dkey}[1]</font></td> + <td align='center' $col>$vpnip</td> + <td align='center' bgcolor='$display_colour' ><b><font color='#FFFFFF'>$display</font></b></td> + </tr> END + } } } + if ($active ne 'off'){ + print "<tr><td colspan='3' align='center'>$Lang::tr{'ovpn no connections'}</td></tr>"; + } + print"</table>"; } -} &Header::closebox(); +} + # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; @@ -501,52 +523,21 @@ foreach my $disk (@files) { $warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n"; } - if ($warnmessage) { + &Header::openbox('100%','center', ); + print "<table width='80%' class='tbl'>"; + print "<tr><th>$Lang::tr{'fwhost hint'}</th></tr>"; print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>"; + &Header::closebox(); } -print <<END; -</table> -END -; + +print "<div align='center'>"; &Pakfire::dblist("upgrade", "notice"); -print <<END; -END if ( -e "/var/run/need_reboot" ) { print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>"; } -&Header::closebox(); -} -else { -&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'}); -print <<END; - $Lang::tr{'gpl please read carefully the general public license and accept it below'}. - <br /><br /> -END -; -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\'>GNU GENERAL PUBLIC LICENSE</a><br />'; -} -print <<END; - <p> - <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}. - <br/ > - <input type='submit' name='ACTION' value=$Lang::tr{'yes'} /> - </form> - </p> - <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a> - -END - -&Header::closebox(); -} +print "</div>"; &Header::closebigbox(); &Header::closepage(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b4753a6..9a5feb0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1269,10 +1269,11 @@ 'ipfire side is invalid' => 'IPFire Seite ist ungültig.', 'ipfires hostname' => 'IPFire\'s Hostname', 'ipinfo' => 'IP-Info', -'iptable rules' => 'IPTable-Regeln', -'iptmangles' => 'IPTable Mangles', 'ipsec' => 'IPsec', 'ipsec network' => 'IPsec-Netzwerke', +'ipsec no connections' => 'Keine aktiven IPsec Verbindungen', +'iptable rules' => 'IPTable-Regeln', +'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', 'isdn' => 'ISDN', @@ -1596,6 +1597,7 @@ '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 mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.', 'ovpn mtu-disc' => 'Path MTU Discovery', 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery benötigt eine MTU von 1500.', 'ovpn mtu-disc maybe' => 'Optional', @@ -1603,10 +1605,10 @@ 'ovpn mtu-disc off' => 'Deaktiviert', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.', 'ovpn mtu-disc yes' => 'Forciert', +'ovpn no connections' => 'Keine aktiven OpenVPN Verbindungen', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', -'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.', 'ovpn port in root range' => 'Ein Port von 1024 oder höher ist erforderlich.', 'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Route push Optionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3d9a5eb..f68ec4c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1300,6 +1300,7 @@ 'ipinfo' => 'IP info', 'ipsec' => 'IPsec', 'ipsec network' => 'IPsec network', +'ipsec no connections' => 'No active IPsec connections', 'iptable rules' => 'IPTable rules', 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', @@ -1626,6 +1627,7 @@ '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 mgmt in root range' => 'A port number of 1024 or higher is required.', 'ovpn mtu-disc' => 'Path MTU Discovery', 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.', 'ovpn mtu-disc maybe' => 'Optionally', @@ -1633,10 +1635,10 @@ 'ovpn mtu-disc off' => 'Disabled', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.', 'ovpn mtu-disc yes' => 'Forced', +'ovpn no connections' => 'No active OpenVPN connections', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', -'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.', 'ovpn port in root range' => 'A port number of 1024 or higher is required.', 'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24', 'ovpn routes push options' => 'Route push options', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bf5e1c4c52828c48d6c51b6830f9d696be261877
by git＠ipfire.org 14 Jan '14

14 Jan '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 bf5e1c4c52828c48d6c51b6830f9d696be261877 (commit) from dd62fd25cde358524861fdd8e20aed1a83c6a6da (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 bf5e1c4c52828c48d6c51b6830f9d696be261877 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 14 17:53:14 2014 +0100 fifteen: increase size of pae kernel. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/76/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index c572e7c..eafb3cf 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -341,7 +341,7 @@ rm -rf /opt/pakfire/db/*/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 9000 -o $ROOTSPACE -lt 90000 ]; then + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then /usr/bin/logger -p syslog.emerg -t ipfire \ "core-update-$core: WARNING not enough space for pae kernel." else hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dd62fd25cde358524861fdd8e20aed1a83c6a6da
by git＠ipfire.org 12 Jan '14

12 Jan '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 dd62fd25cde358524861fdd8e20aed1a83c6a6da (commit) via 595e89a87745e8f1f202d86a7dd0e9e2f1cb4783 (commit) from 9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2 (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 dd62fd25cde358524861fdd8e20aed1a83c6a6da Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 12 23:22:39 2014 +0100 fifteen: remove /var/run from fstab. commit 595e89a87745e8f1f202d86a7dd0e9e2f1cb4783 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 12 23:19:35 2014 +0100 make.sh: fix git branch read for new git versions. ----------------------------------------------------------------------- Summary of changes: config/etc/fstab | 1 - config/rootfiles/core/76/update.sh | 1 + make.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index 805ed4b..0cd30eb 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -7,4 +7,3 @@ DEVICE3 / FSTYPE defaults 1 1 DEVICE4 /var FSTYPE defaults 1 1 none /var/log/rrd tmpfs defaults,size=64M 0 0 none /var/lock tmpfs defaults,size=8M 0 0 -none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index 8d55152..c572e7c 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -267,6 +267,7 @@ sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab sed -i -e "s/^proc/#proc/g" /etc/fstab sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab sed -i -e "s/^devpts/#devpts/g" /etc/fstab +sed -i -e "s|^none\s/var/run|#none /var/run|/g" /etc/fstab # Convert udev persistent network rules sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules diff --git a/make.sh b/make.sh index fa153c4..5d12665 100755 --- a/make.sh +++ b/make.sh @@ -27,7 +27,7 @@ SNAME="ipfire" # Short name VERSION="2.15" # Version number CORE="76-beta1" # Core Level (Filename) PAKFIRE_CORE="76" # Core Level (PAKFIRE) -GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch +GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2
by git＠ipfire.org 12 Jan '14

12 Jan '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 9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2 (commit) via 8b64b1b64eaeb7efd0ae7ffe5d2b9076164c2a84 (commit) via fd75e5e75cef7fdc2a94c1c0f6b1aba4e6958589 (commit) from 07e9a1357dadb1a2b40d0d85aa956331eaa6b537 (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 9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2 Merge: 8b64b1b 07e9a13 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 12 23:02:28 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 8b64b1b64eaeb7efd0ae7ffe5d2b9076164c2a84 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 12 23:02:00 2014 +0100 Limit /run to 8M. commit fd75e5e75cef7fdc2a94c1c0f6b1aba4e6958589 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 12 23:01:21 2014 +0100 initscripts: Fix syntax error when mounting /run. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/mountkernfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/init.d/mountkernfs index 6ea2d18..f7be82d 100644 --- a/src/initscripts/init.d/mountkernfs +++ b/src/initscripts/init.d/mountkernfs @@ -31,7 +31,7 @@ case "${1}" in if ! mountpoint /run &> /dev/null; then boot_mesg -n " /run" ${NORMAL} - mount -n -t tmpfs,nosuid,nodev,mode=755 /run /run || failed=1 + mount -n -t tmpfs -o nosuid,nodev,mode=755,size=8M /run /run || failed=1 fi boot_mesg "" ${NORMAL} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 07e9a1357dadb1a2b40d0d85aa956331eaa6b537
by git＠ipfire.org 12 Jan '14

12 Jan '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 07e9a1357dadb1a2b40d0d85aa956331eaa6b537 (commit) via c05738b25e4a76ca73ee58dba71a7d93d2907318 (commit) via dfb08084ba25b03f27ca41c04f0a0f1e2dace6d5 (commit) from e11f536252fe1f4317c47c121f5026b9a458a311 (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 07e9a1357dadb1a2b40d0d85aa956331eaa6b537 Merge: c05738b e11f536 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 12 19:05:54 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c05738b25e4a76ca73ee58dba71a7d93d2907318 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 12 19:05:05 2014 +0100 installer: wget need libidn. commit dfb08084ba25b03f27ca41c04f0a0f1e2dace6d5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 12 19:02:51 2014 +0100 udev: remove /var/run mount from initskript. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/installer/eject | 1 - config/rootfiles/installer/libidn | 1 + src/initscripts/init.d/udev | 3 --- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 120000 config/rootfiles/installer/eject create mode 120000 config/rootfiles/installer/libidn Difference in files: diff --git a/config/rootfiles/installer/eject b/config/rootfiles/installer/eject deleted file mode 120000 index 54928be..0000000 --- a/config/rootfiles/installer/eject +++ /dev/null @@ -1 +0,0 @@ -../common/eject \ No newline at end of file diff --git a/config/rootfiles/installer/libidn b/config/rootfiles/installer/libidn new file mode 120000 index 0000000..9750546 --- /dev/null +++ b/config/rootfiles/installer/libidn @@ -0,0 +1 @@ +../common/libidn \ No newline at end of file diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index 72d1e40..7674ab5 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -17,9 +17,6 @@ case "${1}" in start) - boot_mesg "Mount /var/run..." - mount -n -t tmpfs tmpfs /var/run -o size=2M - boot_mesg "Populating /dev with device nodes..." if ! grep -q '[[:space:]]sysfs' /proc/mounts; then echo_failure hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM