Geaendert:

* Squid auf neuesten Stand gebracht. * QoS-Fortschritt. * Kleines Script fuer Sprachdateiupdates. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@268 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-09-10 19:52:20 +00:00
parent f1df2c418b
commit 363fb6afce
12 changed files with 578 additions and 292 deletions
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -553,11 +553,16 @@ print <<END
 	### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
 	iptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}

+	## STARTING COLLECTOR
+	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
+	/usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
+
 	echo "Quality of Service was successfully started!"
 	exit 0
  ;;
  clear|stop)
 	### RESET EVERYTHING TO A KNOWN STATE
+	killall -9 qosd
 	# DELETE QDISCS
 	tc qdisc del dev $qossettings{'RED_DEV'} root
 	tc qdisc del dev $qossettings{'IMQ_DEV'} root
--- a/config/qos/parse-func.pl
+++ b/config/qos/parse-func.pl
@@ -157,8 +157,8 @@ sub parse_class($) {
 #		print "bytes: $bytes\n"."pkts: $pkts\n";
 #		print "dropped: $dropped\n"."overlimits: $overlimits\n";
 	    } else { 
-		print "$timestamp: ERROR(+1) - Unable to parse (class ${class}_$device): ";
-		print "\"$tc_output[$i + 1]\"\n";
+#		print "$timestamp: ERROR(+1) - Unable to parse (class ${class}_$device): ";
+#		print "\"$tc_output[$i + 1]\"\n";
 		$return_val="";
 		next;
 	    } 
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,11 @@
 ------------------------------------------------------------------------
+r267 | ms | 2006-09-02 22:18:51 +0200 (Sat, 02 Sep 2006) | 4 lines
+
+Hinzugefuegt:
+  * QoS-Graphen jetzt auch für Unterklassen.
+Fix:
+  * restartsquid killt jetzt auch squidGuard.
+------------------------------------------------------------------------
 r266 | ms | 2006-09-02 14:21:49 +0200 (Sat, 02 Sep 2006) | 6 lines

 Geaendert:
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -6,7 +6,7 @@

 use CGI qw(param);

-$swroot = "/var/ipcop";
+$swroot = "/var/ipfire";

 my %cgiparams;
 my %mainsettings;
--- a/html/cgi-bin/logs.cgi/proxylog.dat
+++ b/html/cgi-bin/logs.cgi/proxylog.dat
@@ -6,8 +6,6 @@
 #
 # (c) The SmoothWall Team
 #
-# $Id: proxylog.dat,v 1.4.2.25 2005/07/07 17:32:24 eoberlander Exp $
-#

 use strict;

@@ -28,6 +26,7 @@ undef (@dummy);
 my %cgiparams=();
 my %logsettings=();
 my %ips=();
+my %users=();
 my %selected=();
 my %checked=();
 my @log=();
@@ -86,6 +85,7 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
 	$cgiparams{'MONTH'} = $temp[1];
 	$cgiparams{'DAY'} = $temp[2];  
 	$cgiparams{'SOURCE_IP'} = $temp[3];
+	$cgiparams{'USERNAME'} = $temp[4];
 }

 if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
@@ -168,6 +168,8 @@ my $daystr = $cgiparams{'DAY'} == 0 ? '' :$cgiparams{'DAY'} <= 9 ? "0$cgiparams{
 my $filter = $cgiparams{'ENABLE_FILTER'} eq 'on' ? $cgiparams{'FILTER'} : '';
 my $sourceip = $cgiparams{'SOURCE_IP'};
 my $sourceall =  $cgiparams{'SOURCE_IP'} eq 'ALL' ? 1 : 0;
+my $username = $cgiparams{'USERNAME'};
+my $usersall =  $cgiparams{'USERNAME'} eq 'ALL' ? 1 : 0;

 my $lines = 0;
 my $temp = ();
@@ -217,21 +219,23 @@ if ($@ ne '')
 	    READ:while (<FILE>) {
 		my ($datetime,$do,$ip,$ray,$me,$far,$url,$so) = split;
 		$ips{$ip}++;
+		$users{$so}++;
 		# for debug
 		#$lastdatetime = $datetime;

 		# collect lines between date && filter
 		if (( ($datetime>$mintime)&&($datetime<$maxtime)) && !($url =~ /$filter/) &&
-		   ((($ip eq $sourceip) || $sourceall)))
+		   ((($ip eq $sourceip) || $sourceall)) &&
+		   ((($so eq $username) || $usersall)))
 		{
 		    # when standart viewing, just keep in memory the correct slices
 		    # it starts a '$start' and size is $viewport
 		    # If export, then keep all lines...
 		    if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){
-		        $log[$lines++] = "$datetime $ip $url";
+		        $log[$lines++] = "$datetime $ip $so $url";
 		    } else {
 			if ($lines++ < ($start + $Header::viewsize)) {
-			    push(@log,"$datetime $ip $url");
+			    push(@log,"$datetime $ip $so $url");
 			    if (@log > $Header::viewsize) {
 				shift (@log);
 			    }
@@ -247,7 +251,7 @@ if ($@ ne '')
 	    }
 	    close (FILE);
 	}
-	$gzindex--;	# will try next gz file eg 40,39,38,.... because it may have holes when ipcop stopped
+	$gzindex--;	# will try next gz file eg 40,39,38,.... because it may have holes when ipfire stopped
 			# for a long time

    }
@@ -271,6 +275,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 	print "IPFire proxy log\r\n";
 	print "$Lang::tr{'date'}: $daystr\r\n"; 
 	print "Source IP: $cgiparams{'SOURCE_IP'}\r\n";
+	print "Username: $cgiparams{'USERNAME'}\r\n";
 	if ($cgiparams{'ENABLE_FILTER'} eq 'on') {
 		print "Ignore filter: $cgiparams{'FILTER'}\r\n"; }
 	print "\r\n";
@@ -278,22 +283,23 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 	if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }

 	foreach $_ (@log) {
-	    my ($datetime,$ip,$url) = split;
+	    my ($datetime,$ip,$so,$url) = split;
 	    my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime);
 	    $SECdt = sprintf ("%.02d",$SECdt);
 	    $MINdt = sprintf ("%.02d",$MINdt);
 	    $HOURdt = sprintf ("%.02d",$HOURdt);
 	    if ($cgiparams{'DAY'}==0) {			# full month
 		$DAYdt = sprintf ("%.02d",$DAYdt);
-		print "$DAYdt/$HOURdt:$MINdt:$SECdt $ip $url\n";
+		print "$DAYdt/$HOURdt:$MINdt:$SECdt $ip $so $url\n";
 	    } else {
-		print "$HOURdt:$MINdt:$SECdt $ip $url\n";
+		print "$HOURdt:$MINdt:$SECdt $ip $so $url\n";
 	    }
 	}
 	exit;
 }

 $selected{'SOURCE_IP'}{$cgiparams{'SOURCE_IP'}} = "selected='selected'";
+$selected{'USERNAME'}{$cgiparams{'USERNAME'}} = "selected='selected'";

 $checked{'ENABLE_FILTER'}{'off'} = '';
 $checked{'ENABLE_FILTER'}{'on'} = '';
@@ -357,12 +363,26 @@ print <<END
 	<option value='ALL' $selected{'SOURCE_IP'}{'ALL'}>$Lang::tr{'caps all'}</option>
 END
 ;
-foreach my $ip (keys %ips) {
+foreach my $ip (sort keys %ips) {
 	print "<option value='$ip' $selected{'SOURCE_IP'}{$ip}>$ip</option>\n"; }
 print <<END
 	</select>
 	</td>
 </tr>
+<tr>
+	<td width='60%' colspan='6'>&nbsp;</td>
+	<td width='25%' class='base'>$Lang::tr{'advproxy NCSA username'}:</td>
+	<td width='15%'>
+	<select name='USERNAME'>
+	<option value='ALL' $selected{'USERNAME'}{'ALL'}>$Lang::tr{'caps all'}</option>
+END
+;
+foreach my $so (sort keys %users) {
+	print "<option value='$so' $selected{'USERNAME'}{$so}>$so</option>\n"; }
+print <<END
+	</select>
+	</td>
+</tr>
 <tr>
 	<td class='base'>$Lang::tr{'ignore filter'}:</td>
 	<td colspan='5'><input type='text' name='FILTER' value='$cgiparams{'FILTER'}' size='40' /></td>
@@ -415,7 +435,8 @@ print <<END
 <tr>
 <td width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
 <td width='15%' align='center' class='boldbase'><b>$Lang::tr{'source ip'}</b></td>
-<td width='75%' align='center' class='boldbase'><b>$Lang::tr{'website'}</b></td>
+<td width='12%' align='center' class='boldbase'><b>$Lang::tr{'advproxy NCSA username'}</b></td>
+<td width='63%' align='center' class='boldbase'><b>$Lang::tr{'website'}</b></td>
 </tr>
 END
 ;
@@ -426,7 +447,7 @@ foreach $_ (@log)
 		print "<tr bgcolor='${Header::table1colour}'>\n"; }
 	else {
 		print "<tr bgcolor='${Header::table2colour}'>\n"; }
-	my ($datetime,$ip,$url) = split;
+	my ($datetime,$ip,$so,$url) = split;
        my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime);
 	$SECdt = sprintf ("%.02d",$SECdt);
 	$MINdt = sprintf ("%.02d",$MINdt);
@@ -445,6 +466,7 @@ foreach $_ (@log)
 	print <<END
 	<td align='center'>$DAYdt$HOURdt:$MINdt:$SECdt</td>
 	<td align='center'>$ip</td>
+	<td align='center'>$so</td>
 	<td align='left'><a href='$url' title='$url' target='_new'>$part</a></td>
 </tr>
 END
@@ -473,14 +495,14 @@ END

 print "<td align='center' width='50%'>";
 if ($prev != -1) {
-        print "<a href='/cgi-bin/logs.cgi/proxylog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{'SOURCE_IP'}'>$Lang::tr{'older'}</a>"; }
+        print "<a href='/cgi-bin/logs.cgi/proxylog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{'SOURCE_IP'},$cgiparams{'USERNAME'}'>$Lang::tr{'older'}</a>"; }
 else {
        print "$Lang::tr{'older'}"; }
 print "</td>\n";

 print "<td align='center' width='50%'>";
 if ($next >= 0 ) {
-        print "<a href='/cgi-bin/logs.cgi/proxylog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{'SOURCE_IP'}'>$Lang::tr{'newer'}</a>"; }
+        print "<a href='/cgi-bin/logs.cgi/proxylog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{'SOURCE_IP'},$cgiparams{'USERNAME'}'>$Lang::tr{'newer'}</a>"; }
 else {
        print "$Lang::tr{'newer'}"; }
 print "</td>\n";
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -20,7 +20,7 @@ require "${General::swroot}/header.pl";
 my %qossettings = ();
 my %checked = ();
 my %netsettings = ();
-my $message = "";
+my $message = '';
 my $errormessage = "";
 my $c = "";
 my $direntry = "";
@@ -179,11 +179,6 @@ elsif ($qossettings{'DOCLASS'} eq 'Loeschen')

 if ($qossettings{'DOSCLASS'} eq $Lang::tr{'save'})
 {
-	if ($qossettings{'SCLASS'} >= 1000 && $qossettings{'CLASS'} < 1021) {
-		$qossettings{'DEVICE'} = $qossettings{'RED_DEV'};
-	} elsif ($qossettings{'SCLASS'} >= 2000 && $qossettings{'CLASS'} < 2021) {
-		$qossettings{'DEVICE'} = $qossettings{'IMQ_DEV'};
-	}
 	&validsubclass();
 	&validminbwdth();
 	if ( $qossettings{'VALID'} eq 'yes' ) {
@@ -382,24 +377,47 @@ elsif ($qossettings{'ACTION'} eq 'Grafische Auswertung')
 	&Header::openbox('100%', 'left', 'QoS Graphen');
 	print <<END
 	<table width='100%'><tr><td colspan='2' align='center'><font color='red'>Diese Seite braucht je nach Geschwindigkeit des Computers laenger zum Laden.</font>
+	</table>
 END
 ;
+	&Header::closebox();
 	open( FILE, "< $classfile" ) or die "Unable to read $classfile";
 	@classes = <FILE>;
 	close FILE;
+	open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
+	@subclasses = <FILE>;
+	close FILE;
  	foreach $classentry (sort @classes)
  	{
  		@classline = split( /\;/, $classentry );
 		$qossettings{'DEV'}=$classline[0];
 		$qossettings{'CLASS'}=$classline[1];
 		&gengraph($qossettings{'DEV'},$qossettings{'CLASS'});
+		&Header::openbox('100%', 'center', "$qossettings{'CLASS'} ($qossettings{'DEV'})");
 		print <<END
-		<tr><td colspan='2' align='center'><font color='darkblue'><b>$qossettings{'CLASS'} ($qossettings{'DEV'})</b></font>
+		<table>
 		<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png'>
 		<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-borrowed.png'>
 		<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-bytes.png'>
 END
 ;
+	  	foreach $subclassentry (sort @subclasses)
+  		{
+	  		@subclassline = split( /\;/, $subclassentry );
+			if ($subclassline[1] eq $classline[1]) {
+				$qossettings{'DEV'}=$subclassline[0];
+				$qossettings{'SCLASS'}=$subclassline[2];
+				&gengraph($qossettings{'DEV'},$qossettings{'SCLASS'});
+				print <<END
+				<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-packets.png'>
+				<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-borrowed.png'>
+				<tr><td colspan='2' align='center'><img src='/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'SCLASS'}_$qossettings{'DEV'}-bytes.png'>
+END
+;
+			}
+		}
+	print "\t\t</table>";
+	&Header::closebox();	
 	}
 print <<END
 	</table>
@@ -776,7 +794,9 @@ END
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>Ceilburst:
 		    <td width='33%' align='left'><input type='text' name='CBURST' maxlength='8' value=$qossettings{'CBURST'}>
-		    <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}><input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
+		    <td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'}>
+							<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'}>
+							<input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
 		</table></form>
 END
 ;
@@ -1269,7 +1289,7 @@ sub expert
 	&Header::openbox('100%', 'center', 'Expertenoptionen:');
 	print <<END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-		<table width='66%'>
+<!--		<table width='66%'>
 		<tr><td width='100%' colspan='3'>Diese Einstellungen sollten sie nur veraendern, wenn sie wirklich wissen, was sie tun.
 		<tr><td width='33%' align='right'>Download-Rate 90\%:<td width='33%' align='left'>
 			<input type='text' name='DEF_INC_SPD' maxlength='8' required='4' value=$qossettings{'DEF_INC_SPD'}>
@@ -1278,7 +1298,7 @@ sub expert
 			<input type='text' name='DEF_OUT_SPD' maxlength='8' required='4' value=$qossettings{'DEF_OUT_SPD'}>
 		    <td width='33%' align='center'>&nbsp;
 		</table>
-		<hr>
+		<hr> -->
 		<table width='66%'>
 		<tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
 			<input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'}>
@@ -1303,7 +1323,7 @@ sub validminbwdth {
 		} elsif ( $qossettings{'DEVICE'} eq $qossettings{'IMQ_DEV'} ) {
 			$qossettings{'SPD'} = $qossettings{'INC_SPD'};
 		}
-		unless ( ( $qossettings{'MINBDWTH'} >= 0 ) && ( $qossettings{'MINBDWTH'} <= $qossettings{'SPD'} ) ) {
+		unless ( ( $qossettings{'MINBWDTH'} >= 1 ) && ( $qossettings{'MINBWDTH'} <= $qossettings{'SPD'} ) ) {
 			$qossettings{'VALID'} = 'no';
 			$message = "Mindestbandbreite ist ungueltig.";
 		}
@@ -1378,9 +1398,9 @@ sub gengraph {
 	$qossettings{'CLASS'} = shift;
 	my $ERROR="";
 	if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { 
-		$qossettings{'CLASSPRFX'} = '1'; 
+		$qossettings{'CLASSPRFX'} = '1';
 	} else { 
-		$qossettings{'CLASSPRFX'} = '2'; 
+		$qossettings{'CLASSPRFX'} = '2';
 	}

 	RRDs::graph ("/home/httpd/html/graphs/class_$qossettings{'CLASSPRFX'}-$qossettings{'CLASS'}_$qossettings{'DEV'}-packets.png",
@@ -1436,7 +1456,6 @@ sub gengraph {
 		"CDEF:kbits=bits,1024,/,8,/",
 		"AREA:kbytes#FFBE7D:kbytes",
 		"GPRINT:kbytes:LAST:rate\\: %8.3lf kbytes\\j",
-		"GPRINT:kbits:LAST:rate\\:%8.2lf kbits\\r",
 	);
 		$ERROR = RRDs::error;
 		print "$ERROR";
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1076,11 +1076,17 @@
 'advproxy visible hostname' => 'Sichtbarer Hostname',
 'advproxy admin mail' => 'Cache Administrator E-Mail',
 'advproxy error language' => 'Sprache der Fehlermeldungen',
+'advproxy error design' => 'Design der Fehlermeldungen',
+'advproxy suppress version' => 'Unterdrücke Versions-Informationen',
+'advproxy squid version' => 'Squid Cache Version',
+'advproxy standard' => 'Standard',
+'advproxy unknown' => 'Unbekannt',
 'advproxy upstream proxy' => 'Vorgelagerter Proxy',
 'advproxy via forwarding' => 'Proxy-Adresse weiterleiten',
 'advproxy client IP forwarding' => 'Client-IP-Adresse weiterleiten',
 'advproxy username forwarding' => ' Benutzernamen weiterleiten',
-'advproxy upstream proxy hostport' => 'Vorgelagerter Proxy (HostPort)',
+'advproxy no connection auth' => 'Keine verbindungsorientierte Authentifizierungsweiterleitung',
+'advproxy upstream proxy host:port' => 'Vorgelagerter Proxy (Host:Port)',
 'advproxy upstream username' => 'Proxy-Benutzername',
 'advproxy upstream password' => 'Proxy-Passwort',
 'advproxy log settings' => 'Protokolleinstellungen',
@@ -1097,6 +1103,9 @@
 'advproxy no cache sites' => 'Diese Domains nicht zwischenspeichern (eine pro Zeile)',
 'advproxy number of L1 dirs' => 'Anzahl der Level-1 Unterverzeichnisse',
 'advproxy offline mode' => 'Aktiviere Offline-Modus',
+'advproxy destination ports' => 'Ziel-Ports',
+'advproxy standard ports' => 'Zulässige Standard-Ports (einer pro Zeile)',
+'advproxy ssl ports' => 'Zulässige SSL-Ports (einer pro Zeile)',
 'advproxy network based access' => 'Netzwerkbasierte Zugriffskontrolle',
 'advproxy allowed subnets' => 'Erlaubte Subnetze (eins pro Zeile)',
 'advproxy unrestricted ip clients' => 'Uneingeschränkte IP-Adressen (eine pro Zeile)',
@@ -1143,7 +1152,7 @@
 'advproxy fake useragent' => 'Gefälschter Useragent für externe Web-Sites',
 'advproxy fake referer' => 'Gefälschter Referer für externe Web-Sites',
 'advproxy url filter' => 'URL-Filter',
-'advproxy update accelerator' => 'Update-Beschleuniger',
+'advproxy update accelerator' => 'Update-Accelerator',
 'advproxy enabled' => 'Aktiviert',
 'advproxy save and restart' => 'Speichern und Neustart',
 'advproxy clear cache' => 'Cache leeren',
@@ -1226,9 +1235,11 @@
 'advproxy RADIUS unauthorized users' => 'Unautorisierte Benutzer (einer pro Zeile)',
 'advproxy RADIUS use positive access list' => 'Verwende positive Zugriffskontrolle',
 'advproxy RADIUS use negative access list' => 'Verwende negative Zugriffskontrolle',
+'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 hdd cache size' => 'Ungültiger Wert für die Größe des Festplatten-Cachespeichers (min. 10 MB erforderlich)',
-'advproxy errmsg mem cache size' => 'Ungültiger Wert für die Größe des RAM-Cachespeichers',
+'advproxy errmsg hdd cache size' => 'Ungültiger Wert f<EFBFBD>r die Größe des Festplatten-Cachespeichers (min. 10 MB erforderlich)',
+'advproxy errmsg mem cache size' => 'Ungültiger Wert f<EFBFBD>r die Größe des RAM-Cachespeichers',
+'advproxy errmsg invalid destination port' => 'Ungültiger Ziel-Port',
 'advproxy errmsg time restriction' => 'Ungültige Zeitbeschränkung',
 'advproxy errmsg no browser' => 'Mindestens ein Browser oder Client muss für den Web-Zugriff zugelassen sein',
 'advproxy errmsg auth children' => 'Ungültige Anzahl Authentifizierungsprozesse',
@@ -1268,10 +1279,9 @@
 'advproxy errmsg password incorrect' => 'Falsches Passwort',
 'advproxy errmsg change fail' => 'Passwort konnte nicht geändert werden',
 'advproxy errmsg change success'  => 'Passwort für Webzugriff erfolgreich geändert',
-'advproxy chgwebpwd SUCCESS' => 'E R F O L G ',
-'advproxy chgwebpwd ERROR' => 'F E H L E R ',
+'advproxy chgwebpwd SUCCESS' => 'E R F O L G :',
+'advproxy chgwebpwd ERROR' => 'F E H L E R :',
 'advproxy update notification' => 'Update-Benachrichtigung!',
-'advproxy update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> für weitere Informationen.',
 'linkq' => 'Verbindungsqualität',
 'empty profile' => 'Unbenannt',
 'HDD temperature' => 'HDD-Temperatur',
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1109,10 +1109,16 @@
 'advproxy visible hostname' => 'Visible hostname',
 'advproxy admin mail' => 'Cache administrator e-mail',
 'advproxy error language' => 'Error messages language',
+'advproxy error design' => 'Error messages design',
+'advproxy suppress version' => 'Suppress version information',
+'advproxy squid version' => 'Squid Cache version',
+'advproxy standard' => 'Standard',
+'advproxy unknown' => 'Unknown',
 'advproxy upstream proxy' => 'Upstream proxy',
 'advproxy via forwarding' => 'Proxy address forwarding',
 'advproxy client IP forwarding' => 'Client IP address forwarding',
 'advproxy username forwarding' => 'Username forwarding',
+'advproxy no connection auth' => 'No connection oriented authentication forwarding',
 'advproxy upstream proxy host:port' => 'Upstream proxy (host:port)',
 'advproxy upstream username' => 'Upstream username',
 'advproxy upstream password' => 'Upstream password',
@@ -1130,6 +1136,9 @@
 'advproxy no cache sites' => 'Do not cache these domains (one per line)',
 'advproxy number of L1 dirs' => 'Number of level-1 subdirectories',
 'advproxy offline mode' => 'Enable offline mode',
+'advproxy destination ports' => 'Destination ports',
+'advproxy standard ports' => 'Allowed standard ports (one per line)',
+'advproxy ssl ports' => 'Allowed SSL ports (one per line)',
 'advproxy network based access' => 'Network based access control',
 'advproxy allowed subnets' => 'Allowed subnets (one per line)',
 'advproxy unrestricted ip clients' => 'Unrestricted IP addresses (one per line)',
@@ -1259,9 +1268,11 @@
 'advproxy RADIUS unauthorized users' => 'Unauthorized users (one per line)',
 'advproxy RADIUS use positive access list' => 'Use positive access control',
 'advproxy RADIUS use negative access list' => 'Use negative access control',
+'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 hdd cache size' => 'Invalid value for harddisk cache size (min 10 MB required)',
 'advproxy errmsg mem cache size' => 'Invalid value for memory cache size',
+'advproxy errmsg invalid destination port' => 'Invalid destination port',
 'advproxy errmsg time restriction' => 'Invalid time restriction',
 'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access',
 'advproxy errmsg auth children' => 'Invalid number of authentication processes',
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@

 include Config

-VER        = 2.5.STABLE14
+VER        = 2.6.STABLE3

 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -38,17 +38,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE) \
-	$(THISAPP)-httpReplyDestroy.patch \
-	$(THISAPP)-hierarchy_tag.patch
+objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-httpReplyDestroy.patch = $(URL_IPFIRE)/$(THISAPP)-httpReplyDestroy.patch
-$(THISAPP)-hierarchy_tag.patch = $(URL_IPFIRE)/$(THISAPP)-hierarchy_tag.patch

-$(DL_FILE)_MD5 = f413e0b887a5f9b2a75350243ed5564c
-$(THISAPP)-httpReplyDestroy.patch_MD5 = 1529f8b0170e24b26353578778435bd4
-$(THISAPP)-hierarchy_tag.patch_MD5 = 9abe563ca3d01dc58502737edc6f3c60
+$(DL_FILE)_MD5 = 5b181e9c08f35d098e53e54b01fbd092

 install : $(TARGET)

@@ -79,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

-	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-httpReplyDestroy.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-hierarchy_tag.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	   --datadir=/usr/lib/squid \
 	   --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -1381,6 +1381,7 @@ usr/local/bin/rcnfs-server
 usr/local/bin/rcpostfix
 usr/local/bin/rcwinbind
 usr/local/bin/run-parts
+usr/local/bin/updatelang
 #usr/local/doc
 #usr/local/etc
 #usr/local/include
--- a/src/scripts/updatelang
+++ b/src/scripts/updatelang
@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# IPFire! GPLv2
+#
+
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"