From: ms Date: Sun, 25 Mar 2007 04:40:27 +0000 (+0000) Subject: Squidupdate und QoS-Fix. X-Git-Tag: v2.3-beta1~797 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d86ddb48712aac856e4d10c0f6c46eff5a1f6047 Squidupdate und QoS-Fix. Hostname als Ueberschrift. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@458 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 0861ca4bd0..c3dac4044a 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -628,8 +628,8 @@ END print </dev/null 2>&1 - /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1 + ( sleep 10 && /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1) & + ( sleep 10 && /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1) & echo "Quality of Service was successfully started!" exit 0 diff --git a/doc/language_issues.de b/doc/language_issues.de index 910e098443..62cef526b3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -32,6 +32,7 @@ WARNING: translation string unused: aliases WARNING: translation string unused: all updates installed WARNING: translation string unused: alt dialup WARNING: translation string unused: alt home +WARNING: translation string unused: alt information WARNING: translation string unused: alt logs WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt services @@ -44,7 +45,15 @@ WARNING: translation string unused: available updates WARNING: translation string unused: average WARNING: translation string unused: backup WARNING: translation string unused: backup config floppy +WARNING: translation string unused: backup configuration +WARNING: translation string unused: backup export key +WARNING: translation string unused: backup generate key +WARNING: translation string unused: backup import dat file +WARNING: translation string unused: backup key +WARNING: translation string unused: backup missing key WARNING: translation string unused: backup password +WARNING: translation string unused: backup sets +WARNING: translation string unused: backup to floppy WARNING: translation string unused: bad characters in WARNING: translation string unused: blue access WARNING: translation string unused: blue access use hint @@ -54,6 +63,7 @@ WARNING: translation string unused: bytes per second WARNING: translation string unused: cache management WARNING: translation string unused: cache size WARNING: translation string unused: cached memory +WARNING: translation string unused: cfg restart WARNING: translation string unused: choose config WARNING: translation string unused: clear cache WARNING: translation string unused: comment @@ -69,9 +79,11 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: cpu usage per +WARNING: translation string unused: create WARNING: translation string unused: create new backup WARNING: translation string unused: current WARNING: translation string unused: current dynamic leases +WARNING: translation string unused: current media WARNING: translation string unused: current ovpn WARNING: translation string unused: current profile WARNING: translation string unused: dat without key @@ -79,6 +91,7 @@ WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns WARNING: translation string unused: ddns help plus WARNING: translation string unused: debugme +WARNING: translation string unused: description WARNING: translation string unused: dhcp base ip fixed lease WARNING: translation string unused: dhcp create fixed leases WARNING: translation string unused: dhcp fixed lease err1 @@ -95,7 +108,16 @@ WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted +WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password +WARNING: translation string unused: err bk 2 key +WARNING: translation string unused: err bk 3 tar +WARNING: translation string unused: err bk 4 gz +WARNING: translation string unused: err bk 5 encrypt +WARNING: translation string unused: err rs 1 +WARNING: translation string unused: err rs 6 decrypt +WARNING: translation string unused: err rs 7 untartst +WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access WARNING: translation string unused: exportkey @@ -126,9 +148,12 @@ WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: idle cpu usage WARNING: translation string unused: ids logs +WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incoming traffic in bytes per second +WARNING: translation string unused: incorrect password +WARNING: translation string unused: insert floppy WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: intrusion detection @@ -148,6 +173,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: line WARNING: translation string unused: linkq +WARNING: translation string unused: local hard disk WARNING: translation string unused: log enabled WARNING: translation string unused: log viewer WARNING: translation string unused: ls_dhcpd @@ -173,12 +199,15 @@ WARNING: translation string unused: mbmon temp in WARNING: translation string unused: memory usage per WARNING: translation string unused: min size WARNING: translation string unused: minutes +WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modulation +WARNING: translation string unused: mount WARNING: translation string unused: nat-traversal WARNING: translation string unused: network configuration WARNING: translation string unused: new optionsfw later WARNING: translation string unused: new optionsfw must boot +WARNING: translation string unused: no cfg upload WARNING: translation string unused: no set selected WARNING: translation string unused: not enough disk space WARNING: translation string unused: o-no @@ -213,8 +242,11 @@ WARNING: translation string unused: refresh update list WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: requested data +WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root path +WARNING: translation string unused: root user password WARNING: translation string unused: safe removal of umounted device +WARNING: translation string unused: save error WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second WARNING: translation string unused: select media @@ -289,35 +321,13 @@ WARNING: translation string unused: yes WARNING: untranslated string: IPFires hostname WARNING: untranslated string: Number of IPs for the pie chart WARNING: untranslated string: Number of Ports for the pie chart -WARNING: untranslated string: XY add data -WARNING: untranslated string: XY data -WARNING: untranslated string: XY edit data -WARNING: untranslated string: XY settings -WARNING: untranslated string: XY title WARNING: untranslated string: allmsg -WARNING: untranslated string: backup clear archive -WARNING: untranslated string: backup explain key -WARNING: untranslated string: backup explain key li1 -WARNING: untranslated string: backup explain key li2 -WARNING: untranslated string: backup explain key li3 -WARNING: untranslated string: backup explain key no1 -WARNING: untranslated string: backup explain key no2 -WARNING: untranslated string: backup extract key -WARNING: untranslated string: backup import key -WARNING: untranslated string: backup key file -WARNING: untranslated string: backup key info -WARNING: untranslated string: backup media info -WARNING: untranslated string: backup protect key password -WARNING: untranslated string: choose media WARNING: untranslated string: dial profile -WARNING: untranslated string: done WARNING: untranslated string: down WARNING: untranslated string: firewall graphs -WARNING: untranslated string: insert removable device WARNING: untranslated string: invalid input for keepalive 1:2 WARNING: untranslated string: network pakfire WARNING: untranslated string: network pakfire from -WARNING: untranslated string: notes WARNING: untranslated string: otherip WARNING: untranslated string: otherport WARNING: untranslated string: pakfire configuration @@ -339,9 +349,6 @@ WARNING: untranslated string: traffics WARNING: untranslated string: trafficsum WARNING: untranslated string: trafficto WARNING: untranslated string: up -WARNING: untranslated string: uptime disable -WARNING: untranslated string: uptime enable -WARNING: untranslated string: uptime update now WARNING: untranslated string: wday1 WARNING: untranslated string: wday2 WARNING: untranslated string: wday3 diff --git a/doc/language_issues.en b/doc/language_issues.en index 902f473748..e783608831 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -33,6 +33,7 @@ WARNING: translation string unused: aliases WARNING: translation string unused: all updates installed WARNING: translation string unused: alt dialup WARNING: translation string unused: alt home +WARNING: translation string unused: alt information WARNING: translation string unused: alt logs WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt services @@ -46,8 +47,29 @@ WARNING: translation string unused: available updates WARNING: translation string unused: average WARNING: translation string unused: backup WARNING: translation string unused: backup archive +WARNING: translation string unused: backup clear archive WARNING: translation string unused: backup config floppy +WARNING: translation string unused: backup configuration WARNING: translation string unused: backup erase key +WARNING: translation string unused: backup explain key +WARNING: translation string unused: backup explain key li1 +WARNING: translation string unused: backup explain key li2 +WARNING: translation string unused: backup explain key li3 +WARNING: translation string unused: backup explain key no1 +WARNING: translation string unused: backup explain key no2 +WARNING: translation string unused: backup export key +WARNING: translation string unused: backup extract key +WARNING: translation string unused: backup generate key +WARNING: translation string unused: backup import dat file +WARNING: translation string unused: backup import key +WARNING: translation string unused: backup key +WARNING: translation string unused: backup key file +WARNING: translation string unused: backup key info +WARNING: translation string unused: backup media info +WARNING: translation string unused: backup missing key +WARNING: translation string unused: backup protect key password +WARNING: translation string unused: backup sets +WARNING: translation string unused: backup to floppy WARNING: translation string unused: bewan adsl pci st WARNING: translation string unused: bewan adsl usb WARNING: translation string unused: blue access @@ -57,7 +79,9 @@ WARNING: translation string unused: bytes per second WARNING: translation string unused: cache management WARNING: translation string unused: cache size WARNING: translation string unused: cached memory +WARNING: translation string unused: cfg restart WARNING: translation string unused: choose config +WARNING: translation string unused: choose media WARNING: translation string unused: clear cache WARNING: translation string unused: comment WARNING: translation string unused: compression @@ -72,25 +96,38 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: cpu usage per +WARNING: translation string unused: create WARNING: translation string unused: current WARNING: translation string unused: current dynamic leases +WARNING: translation string unused: current media WARNING: translation string unused: current ovpn WARNING: translation string unused: current profile WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key WARNING: translation string unused: debugme +WARNING: translation string unused: description WARNING: translation string unused: dhcp server disabled on blue interface WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: disk access per WARNING: translation string unused: do not log this port list +WARNING: translation string unused: done WARNING: translation string unused: dynamic dns client WARNING: translation string unused: edit hosts WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted +WARNING: translation string unused: err bk 1 +WARNING: translation string unused: err bk 2 key +WARNING: translation string unused: err bk 3 tar +WARNING: translation string unused: err bk 4 gz +WARNING: translation string unused: err bk 5 encrypt +WARNING: translation string unused: err rs 1 +WARNING: translation string unused: err rs 6 decrypt +WARNING: translation string unused: err rs 7 untartst +WARNING: translation string unused: err rs 8 untar WARNING: translation string unused: error config WARNING: translation string unused: error external access WARNING: translation string unused: exportkey @@ -123,9 +160,13 @@ WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: idle cpu usage WARNING: translation string unused: ids logs +WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incoming traffic in bytes per second +WARNING: translation string unused: incorrect password +WARNING: translation string unused: insert floppy +WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: intrusion detection @@ -145,6 +186,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: line WARNING: translation string unused: linkq +WARNING: translation string unused: local hard disk WARNING: translation string unused: log enabled WARNING: translation string unused: log viewer WARNING: translation string unused: ls_dhcpd @@ -170,15 +212,19 @@ WARNING: translation string unused: mbmon temp in WARNING: translation string unused: memory usage per WARNING: translation string unused: min size WARNING: translation string unused: minutes +WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modulation WARNING: translation string unused: monthly firewallhits +WARNING: translation string unused: mount WARNING: translation string unused: nat-traversal WARNING: translation string unused: network configuration WARNING: translation string unused: new optionsfw later WARNING: translation string unused: new optionsfw must boot +WARNING: translation string unused: no cfg upload WARNING: translation string unused: no set selected WARNING: translation string unused: not enough disk space +WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: openvpn client @@ -207,6 +253,9 @@ WARNING: translation string unused: reboot schedule WARNING: translation string unused: refresh update list WARNING: translation string unused: released WARNING: translation string unused: requested data +WARNING: translation string unused: restore hardware settings +WARNING: translation string unused: root user password +WARNING: translation string unused: save error WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second WARNING: translation string unused: shaping add options @@ -276,11 +325,6 @@ WARNING: translation string unused: yes WARNING: untranslated string: IPFires hostname WARNING: untranslated string: Number of IPs for the pie chart WARNING: untranslated string: Number of Ports for the pie chart -WARNING: untranslated string: XY add data -WARNING: untranslated string: XY data -WARNING: untranslated string: XY edit data -WARNING: untranslated string: XY settings -WARNING: untranslated string: XY title WARNING: untranslated string: down WARNING: untranslated string: network pakfire WARNING: untranslated string: network pakfire from @@ -291,9 +335,6 @@ WARNING: untranslated string: red WARNING: untranslated string: remove x509 WARNING: untranslated string: settingsc WARNING: untranslated string: up -WARNING: untranslated string: uptime disable -WARNING: untranslated string: uptime enable -WARNING: untranslated string: uptime update now WARNING: untranslated string: vpn aggrmode WARNING: untranslated string: vpn altname syntax WARNING: untranslated string: vpn auth-dn diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 84662a84cf..733b3e996d 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -61,42 +61,8 @@ if ($errormessage) { &Header::closebox(); } -print "
\n"; - -&Header::openbox('100%', 'left', $Lang::tr{'network pakfire'}); -print < - - - $Lang::tr{'network pakfire from'} - - -   - -END -; - - -print < -
-
- - - - - - -
* $Lang::tr{'this field may be blank'} - -
-END -; - &Header::closebox(); -print "\n"; - &Header::closebigbox(); &Header::closepage(); diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 8956b8297d..78127c0de8 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -166,7 +166,14 @@ END
diff --git a/lfs/squid b/lfs/squid index 6884411f2e..e8c631e7cf 100644 --- a/lfs/squid +++ b/lfs/squid @@ -26,7 +26,7 @@ include Config -VER = 2.6.STABLE9 +VER = 2.6.STABLE12 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 95997d6cb38fdb562ecb790c553f9cfc +$(DL_FILE)_MD5 = a830ccc95cb39cdfa5e5b773add0bb0d install : $(TARGET)