IPFire-SCM February 2013

ipfire-scm@lists.ipfire.org

1 participants
68 discussions

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core66, created. 2e8b71ca698238b679cc5098fb9f0def8ebf716b
by git＠ipfire.org 15 Feb '13

15 Feb '13

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 tag, v2.13-core66 has been created at 2e8b71ca698238b679cc5098fb9f0def8ebf716b (commit) - Log ----------------------------------------------------------------- commit 2e8b71ca698238b679cc5098fb9f0def8ebf716b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 15 07:41:50 2013 +0100 installer: fix firstsetup and set ext4 fs for unattend. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core66, updated. 2e8b71ca698238b679cc5098fb9f0def8ebf716b
by git＠ipfire.org 15 Feb '13

15 Feb '13

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, core66 has been updated via 2e8b71ca698238b679cc5098fb9f0def8ebf716b (commit) via 3b1dbfba60fcfdbe4da096676f8aa32a863e084d (commit) from 3ab685b34bd439f77c2f90f4c8214b025eb99e1c (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 2e8b71ca698238b679cc5098fb9f0def8ebf716b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 15 07:41:50 2013 +0100 installer: fix firstsetup and set ext4 fs for unattend. commit 3b1dbfba60fcfdbe4da096676f8aa32a863e084d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 15 07:30:11 2013 +0100 backupiso: don't redownload source iso every time. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 8 +------- src/scripts/backupiso | 7 +++++-- 2 files changed, 6 insertions(+), 9 deletions(-) Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 14139b5..bf0a356 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -277,7 +277,7 @@ int main(int argc, char *argv[]) ctr[TR_CANCEL], NULL); } else { rc = 1; - fstype = EXT3; + fstype = EXT4; } if (rc == 2) goto EXIT; @@ -596,12 +596,6 @@ EXIT: fclose(flog); newtFinished(); - if (unattended) { - // Remove Setup autorun after boot - if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup")) - printf("Unable to disable setup autorun.\n"); - } - if (system("/bin/umount /harddisk/proc")) printf("Unable to umount /harddisk/proc.\n"); } else { diff --git a/src/scripts/backupiso b/src/scripts/backupiso index ffbc54f..111a350 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -15,8 +15,11 @@ TS=$1 mkdir -p /var/tmp/backupiso cd /var/tmp/backupiso -echo "Fetching ${URL}${ISO}" -wget --quiet -c ${URL}${ISO} +if [ ! -e ${ISO} ] +then + echo "Fetching ${URL}${ISO}" + wget --quiet -c ${URL}${ISO} +else echo "Fetching ${URL}${ISO}.md5" wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3ab685b34bd439f77c2f90f4c8214b025eb99e1c
by git＠ipfire.org 14 Feb '13

14 Feb '13

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, master has been updated via 3ab685b34bd439f77c2f90f4c8214b025eb99e1c (commit) from 2de6c6499478531367c663b5d8f7410fe49af3aa (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 3ab685b34bd439f77c2f90f4c8214b025eb99e1c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 14 22:16:16 2013 +0100 IPFire 2.13 final. ----------------------------------------------------------------------- Summary of changes: make.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 8d42e47..05be857 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.13rc2" # Version number -CORE="65" # Core Level (Filename) -PAKFIRE_CORE="65" # Core Level (PAKFIRE) +VERSION="2.13" # Version number +CORE="66" # Core Level (Filename) +PAKFIRE_CORE="66" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core66, created. 3ab685b34bd439f77c2f90f4c8214b025eb99e1c
by git＠ipfire.org 14 Feb '13

14 Feb '13

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 tag, v2.13-core66 has been created at 3ab685b34bd439f77c2f90f4c8214b025eb99e1c (commit) - Log ----------------------------------------------------------------- commit 3ab685b34bd439f77c2f90f4c8214b025eb99e1c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 14 22:16:16 2013 +0100 IPFire 2.13 final. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core66, created. 3ab685b34bd439f77c2f90f4c8214b025eb99e1c
by git＠ipfire.org 14 Feb '13

14 Feb '13

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, core66 has been created at 3ab685b34bd439f77c2f90f4c8214b025eb99e1c (commit) - Log ----------------------------------------------------------------- commit 3ab685b34bd439f77c2f90f4c8214b025eb99e1c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 14 22:16:16 2013 +0100 IPFire 2.13 final. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2de6c6499478531367c663b5d8f7410fe49af3aa
by git＠ipfire.org 14 Feb '13

14 Feb '13

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, master has been updated via 2de6c6499478531367c663b5d8f7410fe49af3aa (commit) via b34fdcae83378e193a89e7a3ea6329321c5dab08 (commit) via 37dd0cd2a2fcfa7c2b65c53ab5627cb7a4a37b40 (commit) from 40d3e729561e650bafa22b28f33da5bac813899e (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 2de6c6499478531367c663b5d8f7410fe49af3aa Author: Timo Eissler <morlix(a)morlix.de> Date: Thu Feb 14 22:08:30 2013 +0100 backupiso: serveral small improvements. fixes #10233 commit b34fdcae83378e193a89e7a3ea6329321c5dab08 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 14 19:33:37 2013 +0100 proxy: allow access to IPFire itself if nets are blocked. This fixes missing pictures on blocking pages. fixes #10138 commit 37dd0cd2a2fcfa7c2b65c53ab5627cb7a4a37b40 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 14 18:59:42 2013 +0100 readhash: allow % character in config files. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/66/filelists/files | 1 + html/cgi-bin/proxy.cgi | 10 ++++----- src/scripts/backupiso | 38 ++++++++++++++++++++------------ src/scripts/readhash | 2 +- 4 files changed, 31 insertions(+), 20 deletions(-) mode change 100755 => 100644 html/cgi-bin/ovpnmain.cgi Difference in files: diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index a7f3664..e139bb0 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -38,6 +38,7 @@ srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/watch +usr/local/bin/backupiso usr/local/bin/makegraphs usr/local/bin/readhash usr/local/bin/scanhd diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100755 new mode 100644 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0b28c2a..cc7416a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 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 # @@ -3556,15 +3556,15 @@ if ($delaypools) { if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on') { - print FILE "#Prevent internal proxy access to Green\n"; - print FILE "http_access deny IPFire_green_servers !IPFire_green_network\n\n"; + print FILE "#Prevent internal proxy access to Green except IPFire itself\n"; + print FILE "http_access deny IPFire_green_servers !IPFire_ips !IPFire_green_network\n\n"; } if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on') { - print FILE "#Prevent internal proxy access from Blue\n"; + print FILE "#Prevent internal proxy access from Blue except IPFire itself\n"; print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n"; - print FILE "http_access deny IPFire_blue_network IPFire_servers\n\n"; + print FILE "http_access deny IPFire_blue_network !IPFire_ips IPFire_servers\n\n"; } print FILE <<END diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 6bea855..ffbc54f 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,11 +1,11 @@ #!/bin/sh -COREVER=`cat /opt/pakfire/db/core/mine` +COREVER=$(cat /opt/pakfire/db/core/mine) # FIXME: edit this lines before release -URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/ -ISO=ipfire-2.11.i586-full-core$COREVER.iso +URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/" +ISO="ipfire-2.13.i586-full-core$COREVER.iso" -if [ -z "$1" ]; then +if [ -z $1 ]; then echo usage: $0 backup-file exit fi @@ -17,20 +17,30 @@ cd /var/tmp/backupiso echo "Fetching ${URL}${ISO}" wget --quiet -c ${URL}${ISO} -echo "Fetching ${URL}md5sums.txt" +echo "Fetching ${URL}${ISO}.md5" wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 echo "Checking md5 of ${ISO}" md5sum --status -c ${ISO}.md5 -RETVAR="$?" -if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ] - then - echo "md5 is OK" - else - echo "md5 mismatch" - echo "Fetching again ${URL}${ISO}" - wget --quiet -O ${ISO} ${URL}${ISO} +if [ $? -eq 0 -o $? -eq 24 ] +then + echo "md5 is OK" +else + echo "md5 mismatch" + echo "Fetching again ${URL}${ISO}" + wget --quiet -O ${ISO} ${URL}${ISO} + echo "Checking again md5 of ${ISO}" + md5sum --status -c ${ISO}.md5 + if [ $? -eq 0 -o $? -eq 24 ] + then + echo "md5 is OK" + else + echo "md5 mismatch" + echo "aborting backup because md5 mismatch" + exit 1 + fi fi +rm ${ISO}.md5 echo "Remastering iso" mkdir -p backupiso.tmp.${TS} @@ -45,7 +55,7 @@ cp /var/ipfire/backup/${TS}.ipf backupiso.${TS} echo "Running mkisofs" mkisofs -J -r -V "ipfire backup ${TS}" \ -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ - -c boot/isolinux/boot.catalog backupiso.${TS} > `basename ${ISO} .iso`-${TS}.iso + -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso echo "Cleaning up" rm -rf backupiso.${TS} diff --git a/src/scripts/readhash b/src/scripts/readhash index cc063a7..bffc93f 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-Za-z0-9_]*' # For the assigned value we only accept a limited number of characters - none # of which are shell metachars -VARCHARS='A-Za-z0-9=/,.:_@#+-' +VARCHARS='A-Za-z0-9=/,.:%_@#+-' VARVAL="[${VARCHARS}]*" sed -ne "s/$${VARNAME}$=$${VARVAL}$$/\1=\2/p" $1 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 96134a8304cbca60a72e6f21f5e370217362b718
by git＠ipfire.org 14 Feb '13

14 Feb '13

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 3.x development tree". The branch, master has been updated via 96134a8304cbca60a72e6f21f5e370217362b718 (commit) via 635b92fe4004cdafb8885223152f90060bd9e6a8 (commit) from 32dd65d0dce5328f91cc87ec3620151af91b4061 (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 96134a8304cbca60a72e6f21f5e370217362b718 Merge: 32dd65d 635b92f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 20:04:25 2013 +0100 erge remote-tracking branch 'stevee/e2fsprogs-update' commit 635b92fe4004cdafb8885223152f90060bd9e6a8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 14 19:49:07 2013 +0100 e2fsprogs: Update to 1.42.7. This is a major update to the latest stable version of e2fsprogs. * Create own libs package. * Put libcom_err and libss into own sub-packages. ----------------------------------------------------------------------- Summary of changes: e2fsprogs/e2fsprogs.nm | 61 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) Difference in files: diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index d38b414..0ec552e 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -4,7 +4,7 @@ ############################################################################### name = e2fsprogs -version = 1.42.2 +version = 1.42.7 release = 1 groups = System/Filesystems @@ -13,8 +13,8 @@ license = GPLv2 summary = Utilities for managing the extended (ext2/ext3/ext4) filesystems. description - The e2fsprogs package contains a number of utilities for creating, \ - checking, modifying, and correcting any inconsistencies in second \ + The e2fsprogs package contains a number of utilities for creating, + checking, modifying, and correcting any inconsistencies in second and third extended (ext2/ext3) filesystems. end @@ -77,10 +77,65 @@ packages groups += Base end + package %{name}-libs + template LIBS + end + package %{name}-devel template DEVEL end + package libcom_err + summary = Common error description library. + description + This is the common error description library, part of e2fsprogs. + end + + files + %{libdir}/libcom_err.so.* + end + end + + package libcom_err-devel + summary = Development files for libcom_err. + description = %{summary} + + files + %{bindir}/compile_et + %{libdir}/libcom_err.so + %{libdir}/pkgconfig/com_err.pc + %{includedir}/com_err.h + %{includedir}/et + %{datadir}/et + %{mandir}/man1/compile_et.1* + %{mandir}/man3/com_err.3* + end + end + + package libss + summary = Command line interface parsing library. + description + This is libss, a command line interface parsing library, part of e2fsprogs. + end + + files + %{libdir}/libss.so.* + end + end + + package libss-devel + summary = Development files for libss. + description = %{summary} + + files + %{bindir}/mk_cmds + %{libdir}/libss.so + %{libdir}/pkgconfig/ss.pc + %{includedir}/ss + %{datadir}/ss + %{mandir}/man1/mk_cmds.1* + end + end package %{name}-debuginfo template DEBUGINFO end hooks/post-receive -- IPFire 3.x development tree

1 0

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

14 Feb '13

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 fd88f2ee298f63440e81b37680ca2c0a48790ce2 (commit) via 40d3e729561e650bafa22b28f33da5bac813899e (commit) from 30213d32e404579b74e0b3c315ecd36fa86fc2fd (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 fd88f2ee298f63440e81b37680ca2c0a48790ce2 Merge: 30213d3 40d3e72 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 15:36:11 2013 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 3 ++ doc/language_issues.en | 3 ++ doc/language_issues.es | 4 +++ doc/language_issues.fr | 4 +++ doc/language_issues.nl | 4 +++ doc/language_issues.pl | 4 +++ doc/language_issues.ru | 4 +++ doc/language_missings | 4 +++ html/cgi-bin/qos.cgi | 74 ++++++++++++++++++++++++++------------------------ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 11 files changed, 71 insertions(+), 35 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 40ad311..e3c8842 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -146,6 +147,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -257,6 +259,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type diff --git a/doc/language_issues.en b/doc/language_issues.en index 2ad18eb..6c1fc21 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -169,6 +170,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type diff --git a/doc/language_issues.es b/doc/language_issues.es index eb45ffb..78a0222 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.fr b/doc/language_issues.fr index f2f3e00..4c18528 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -588,6 +591,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f43280a..5a23c69 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -169,6 +170,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -508,6 +511,7 @@ WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index eb45ffb..78a0222 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e83f42b..0196084 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -166,6 +167,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename @@ -275,6 +277,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -569,6 +572,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 1682950..a4eebcd 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -98,6 +98,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < snort working < static routes @@ -236,6 +237,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < Set time on boot < static routes @@ -328,6 +330,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < static routes < visit us at @@ -423,6 +426,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < static routes < visit us at diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 31232ca..de73284 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -497,20 +497,21 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'}) } elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} ) { - my @UP; - #print "UP "; - for(my $i = 1; $i <= 10; $i++) { - $UP[$i] = int($qossettings{'OUT_SPD'} / $i ); - #print $i."=".$UP[$i]." "; - } - my @DOWN; - #print " Down "; - for(my $i = 1; $i <= 20; $i++) { - $DOWN[$i] = int($qossettings{'INC_SPD'} / $i); - #print $i."=".$DOWN[$i]." "; - } - open( FILE, "> $classfile" ) or die "Unable to write $classfile"; - print FILE <<END + if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) { + my @UP; + #print "UP "; + for(my $i = 1; $i <= 10; $i++) { + $UP[$i] = int($qossettings{'OUT_SPD'} / $i ); + #print $i."=".$UP[$i]." "; + } + my @DOWN; + #print " Down "; + for(my $i = 1; $i <= 20; $i++) { + $DOWN[$i] = int($qossettings{'INC_SPD'} / $i); + #print $i."=".$DOWN[$i]." "; + } + open( FILE, "> $classfile" ) or die "Unable to write $classfile"; + print FILE <<END imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP; imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN; imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic; @@ -524,9 +525,9 @@ $qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P; $qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN; END ; - close FILE; - open( FILE, "> $level7file" ) or die "Unable to write $level7file"; - print FILE <<END + close FILE; + open( FILE, "> $level7file" ) or die "Unable to write $level7file"; + print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; 102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; @@ -548,9 +549,9 @@ END 220;imq0;bittorrent;;; END ; - close FILE; - open( FILE, "> $portfile" ) or die "Unable to write $portfile"; - print FILE <<END + close FILE; + open( FILE, "> $portfile" ) or die "Unable to write $portfile"; + print FILE <<END 101;$qossettings{'RED_DEV'};icmp;;;;; 102;$qossettings{'RED_DEV'};tcp;;;;53; 102;$qossettings{'RED_DEV'};udp;;;;53; @@ -573,22 +574,25 @@ END 204;imq0;tcp;;80;;; END ; - close FILE; - if ($qossettings{'DEF_INC_SPD'} eq '') { - $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9); - } - if ($qossettings{'DEF_OUT_SPD'} eq '') { - $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9); + close FILE; + if ($qossettings{'DEF_INC_SPD'} eq '') { + $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9); + } + if ($qossettings{'DEF_OUT_SPD'} eq '') { + $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9); + } + $qossettings{'DEFCLASS_INC'} = "210"; + $qossettings{'DEFCLASS_OUT'} = "110"; + $qossettings{'ACK'} ="101"; + $qossettings{'ENABLED'} = 'on'; + &General::writehash("${General::swroot}/qos/settings", \%qossettings); + system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); + system("/usr/bin/touch /var/ipfire/qos/enable"); + system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); + system("logger -t ipfire 'QoS started'"); + } else { + $message = $Lang::tr{'qos enter bandwidths'}; } - $qossettings{'DEFCLASS_INC'} = "210"; - $qossettings{'DEFCLASS_OUT'} = "110"; - $qossettings{'ACK'} ="101"; - $qossettings{'ENABLED'} = 'on'; - &General::writehash("${General::swroot}/qos/settings", \%qossettings); - system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); - system("/usr/bin/touch /var/ipfire/qos/enable"); - system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); - system("logger -t ipfire 'QoS started'"); } elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} ) { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 93529d8..f9405d7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1523,6 +1523,7 @@ 'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', +'qos enter bandwidths' => 'Bitte geben Sie ihre Downstream- und Upstream-Bandbreite an!', 'qos graphs' => 'Qos Diagramme', 'qos warning' => 'Die Regel muss wieder gespeichert werden, ansonsten wird sie verworfen!', 'quick playlist' => 'Quick Playlist', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c4629a5..46076fd 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1551,6 +1551,7 @@ 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos add subclass' => 'Add subclass', +'qos enter bandwidths' => 'You will need to enter your downstream and upstream bandwidth!', 'qos graphs' => 'Qos Graphs', 'qos warning' => 'The rule must be saved, otherwise it will be discarded!', 'quick control' => 'Quick Control', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 40d3e729561e650bafa22b28f33da5bac813899e
by git＠ipfire.org 14 Feb '13

14 Feb '13

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, master has been updated via 40d3e729561e650bafa22b28f33da5bac813899e (commit) from 48d9bbba7597242bba4ded975dea0f82ba3fa462 (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 40d3e729561e650bafa22b28f33da5bac813899e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 14 15:35:43 2013 +0100 QoS: Don't create template when bandwidth is empty. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 3 ++ doc/language_issues.en | 3 ++ doc/language_issues.es | 4 +++ doc/language_issues.fr | 4 +++ doc/language_issues.nl | 4 +++ doc/language_issues.pl | 4 +++ doc/language_issues.ru | 4 +++ doc/language_missings | 4 +++ html/cgi-bin/qos.cgi | 74 ++++++++++++++++++++++++++------------------------ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 11 files changed, 71 insertions(+), 35 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 40ad311..e3c8842 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -146,6 +147,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -257,6 +259,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type diff --git a/doc/language_issues.en b/doc/language_issues.en index 2ad18eb..6c1fc21 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -169,6 +170,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type diff --git a/doc/language_issues.es b/doc/language_issues.es index eb45ffb..78a0222 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.fr b/doc/language_issues.fr index f2f3e00..4c18528 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -588,6 +591,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f43280a..5a23c69 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -169,6 +170,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -283,6 +285,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -508,6 +511,7 @@ WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index eb45ffb..78a0222 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -167,6 +168,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: extrahd unable to read @@ -281,6 +283,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -604,6 +607,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e83f42b..0196084 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -5,6 +5,7 @@ WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping +WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP WARNING: translation string unused: Remote VPN IP WARNING: translation string unused: Resolv @@ -166,6 +167,7 @@ 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: expected +WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename @@ -275,6 +277,7 @@ WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount +WARNING: translation string unused: mtu QoS WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type @@ -569,6 +572,7 @@ WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly WARNING: untranslated string: proxy reports today WARNING: untranslated string: proxy reports weekly +WARNING: untranslated string: qos enter bandwidths WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 1682950..a4eebcd 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -98,6 +98,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < snort working < static routes @@ -236,6 +237,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < Set time on boot < static routes @@ -328,6 +330,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < static routes < visit us at @@ -423,6 +426,7 @@ < proxy reports monthly < proxy reports today < proxy reports weekly +< qos enter bandwidths < server restart < static routes < visit us at diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 31232ca..de73284 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -497,20 +497,21 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'}) } elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} ) { - my @UP; - #print "UP "; - for(my $i = 1; $i <= 10; $i++) { - $UP[$i] = int($qossettings{'OUT_SPD'} / $i ); - #print $i."=".$UP[$i]." "; - } - my @DOWN; - #print " Down "; - for(my $i = 1; $i <= 20; $i++) { - $DOWN[$i] = int($qossettings{'INC_SPD'} / $i); - #print $i."=".$DOWN[$i]." "; - } - open( FILE, "> $classfile" ) or die "Unable to write $classfile"; - print FILE <<END + if (($qossettings{'OUT_SPD'} > 0) && ($qossettings{'INC_SPD'} > 0)) { + my @UP; + #print "UP "; + for(my $i = 1; $i <= 10; $i++) { + $UP[$i] = int($qossettings{'OUT_SPD'} / $i ); + #print $i."=".$UP[$i]." "; + } + my @DOWN; + #print " Down "; + for(my $i = 1; $i <= 20; $i++) { + $DOWN[$i] = int($qossettings{'INC_SPD'} / $i); + #print $i."=".$DOWN[$i]." "; + } + open( FILE, "> $classfile" ) or die "Unable to write $classfile"; + print FILE <<END imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP; imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN; imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic; @@ -524,9 +525,9 @@ $qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P; $qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN; END ; - close FILE; - open( FILE, "> $level7file" ) or die "Unable to write $level7file"; - print FILE <<END + close FILE; + open( FILE, "> $level7file" ) or die "Unable to write $level7file"; + print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; 102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; @@ -548,9 +549,9 @@ END 220;imq0;bittorrent;;; END ; - close FILE; - open( FILE, "> $portfile" ) or die "Unable to write $portfile"; - print FILE <<END + close FILE; + open( FILE, "> $portfile" ) or die "Unable to write $portfile"; + print FILE <<END 101;$qossettings{'RED_DEV'};icmp;;;;; 102;$qossettings{'RED_DEV'};tcp;;;;53; 102;$qossettings{'RED_DEV'};udp;;;;53; @@ -573,22 +574,25 @@ END 204;imq0;tcp;;80;;; END ; - close FILE; - if ($qossettings{'DEF_INC_SPD'} eq '') { - $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9); - } - if ($qossettings{'DEF_OUT_SPD'} eq '') { - $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9); + close FILE; + if ($qossettings{'DEF_INC_SPD'} eq '') { + $qossettings{'DEF_INC_SPD'} = int($qossettings{'INC_SPD'} * 0.9); + } + if ($qossettings{'DEF_OUT_SPD'} eq '') { + $qossettings{'DEF_OUT_SPD'} = int($qossettings{'OUT_SPD'} * 0.9); + } + $qossettings{'DEFCLASS_INC'} = "210"; + $qossettings{'DEFCLASS_OUT'} = "110"; + $qossettings{'ACK'} ="101"; + $qossettings{'ENABLED'} = 'on'; + &General::writehash("${General::swroot}/qos/settings", \%qossettings); + system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); + system("/usr/bin/touch /var/ipfire/qos/enable"); + system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); + system("logger -t ipfire 'QoS started'"); + } else { + $message = $Lang::tr{'qos enter bandwidths'}; } - $qossettings{'DEFCLASS_INC'} = "210"; - $qossettings{'DEFCLASS_OUT'} = "110"; - $qossettings{'ACK'} ="101"; - $qossettings{'ENABLED'} = 'on'; - &General::writehash("${General::swroot}/qos/settings", \%qossettings); - system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); - system("/usr/bin/touch /var/ipfire/qos/enable"); - system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); - system("logger -t ipfire 'QoS started'"); } elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} ) { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 93529d8..f9405d7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1523,6 +1523,7 @@ 'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', +'qos enter bandwidths' => 'Bitte geben Sie ihre Downstream- und Upstream-Bandbreite an!', 'qos graphs' => 'Qos Diagramme', 'qos warning' => 'Die Regel muss wieder gespeichert werden, ansonsten wird sie verworfen!', 'quick playlist' => 'Quick Playlist', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c4629a5..46076fd 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1551,6 +1551,7 @@ 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', 'qos add subclass' => 'Add subclass', +'qos enter bandwidths' => 'You will need to enter your downstream and upstream bandwidth!', 'qos graphs' => 'Qos Graphs', 'qos warning' => 'The rule must be saved, otherwise it will be discarded!', 'quick control' => 'Quick Control', hooks/post-receive -- IPFire 2.x development tree

1 0

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

14 Feb '13

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 30213d32e404579b74e0b3c315ecd36fa86fc2fd (commit) from 48d9bbba7597242bba4ded975dea0f82ba3fa462 (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 30213d32e404579b74e0b3c315ecd36fa86fc2fd Author: Timo Eissler <morlix(a)morlix.de> Date: Wed Jan 2 13:36:15 2013 +0100 New add-on: check_mk_agent 1.2.0p3 https://bugzilla.ipfire.org/show_bug.cgi?id=10275 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/check_mk_agent | 2 ++ lfs/{libpri => check_mk_agent} | 23 ++++++++++++----------- make.sh | 1 + src/paks/{apcupsd => check_mk_agent}/install.sh | 0 src/paks/{motion => check_mk_agent}/uninstall.sh | 0 src/paks/{apcupsd => check_mk_agent}/update.sh | 0 6 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 config/rootfiles/packages/check_mk_agent copy lfs/{libpri => check_mk_agent} (85%) copy src/paks/{apcupsd => check_mk_agent}/install.sh (100%) copy src/paks/{motion => check_mk_agent}/uninstall.sh (100%) copy src/paks/{apcupsd => check_mk_agent}/update.sh (100%) Difference in files: diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent new file mode 100644 index 0000000..073b483 --- /dev/null +++ b/config/rootfiles/packages/check_mk_agent @@ -0,0 +1,2 @@ +usr/bin/check_mk_agent +usr/bin/waitmax diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent new file mode 100644 index 0000000..c0f70d1 --- /dev/null +++ b/lfs/check_mk_agent @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.2.0p3 + +THISAPP = check_mk_agent-$(VER) +DL_FILE = check_mk-${VER}.tar.gz +DL_FROM = http://mathias-kettner.de/download +DIR_APP = $(DIR_SRC)/check_mk-${VER} +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = check_mk_agent +PAK_VER = 2 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist : + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && tar xzf agents.tar.gz + cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent + cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax + cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8d42e47..da3349b 100755 --- a/make.sh +++ b/make.sh @@ -754,6 +754,7 @@ buildipfire() { ipfiremake libstatgrab ipfiremake sarg ipfiremake fstrim + ipfiremake check_mk_agent echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh new file mode 100644 index 0000000..682363b --- /dev/null +++ b/src/paks/check_mk_agent/install.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh new file mode 100644 index 0000000..66f4344 --- /dev/null +++ b/src/paks/check_mk_agent/uninstall.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +make_backup ${NAME} +remove_files diff --git a/src/paks/check_mk_agent/update.sh b/src/paks/check_mk_agent/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/check_mk_agent/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2013