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 7bdeaf3046c36881bdae18124ded7b19fd1be5a1 (commit) via 077e110eb627f6b6b3a59ae25fb20cec46fbd5a7 (commit) via 3bcd393e18c76683f7649368bd30c5c57789f7e5 (commit) via 8dd9b4366244276ae4ffc2b2c7bf9e1928cd6150 (commit) via cf33650eb354795b7a5a19bf356f563908075cca (commit) via d96d5db6e51999d1239639140ab715bf97cb2749 (commit) via 1aa097a9471a636fb72a0bb7cbc8e4f8896e52cd (commit) via 003fb6f60892cdecea9a094ee891a4ccddbc9987 (commit) via 2a554ea34f7054669b76b26dae27ede826dcda01 (commit) via 086c09eefb72449ef39517e3586470ebef5e7276 (commit) via 51044e048f6f2908299a4540b470b9e333dd4b3d (commit) via 49d09728cc90b05827e1bd2f9d16eee5fbd9e57a (commit) via 8c7446ab081d664972db0462080639fe5a96d69c (commit) via 68a6d1053f13e66d7dba959d0ec26c2570fae16e (commit) via 5a5de3f0269983bec1d7ffc9f4019b96b1c560a0 (commit) via 29f35b79c70ba5ee54ed20ad4d96397f93b9b0c4 (commit) via 7b1134ea606428f05f721a7a598b99556f39d8dc (commit) via a05dbe793d36681d2b8b7cb3332537e1c6dca0b4 (commit) via 906a1763782c7c77843aa96a67234ff2510f63f7 (commit) via f7ae6259f487e10fa9181d76f58f3fdc702c68ad (commit) via b1c761c1842313f10354f8f2577a1e8380a351b1 (commit) via ad537bf9cb6bd0655d4ec177d6540e1515240366 (commit) via efe2990afc45cc1a722d4b6be7b094633b5c78bd (commit) via d9673001e82e8c627c1b21a3d97b4f9c435d1bca (commit) via ef7e9e52f2eb6457b4e498d63bf446148a552c46 (commit) from 79ccd55de407f7746614658046ef884fb728311b (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 7bdeaf3046c36881bdae18124ded7b19fd1be5a1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 15:26:59 2020 +0000
core145: add vnstat changes
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 077e110eb627f6b6b3a59ae25fb20cec46fbd5a7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 15:15:24 2020 +0000
core145: add libwww-perl
commit 3bcd393e18c76683f7649368bd30c5c57789f7e5 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Apr 11 16:14:44 2020 +0200
libwww-perl: update to 6.43
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8dd9b4366244276ae4ffc2b2c7bf9e1928cd6150 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 15:13:37 2020 +0000
core145: add pakfire functions.pl
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit cf33650eb354795b7a5a19bf356f563908075cca Author: Peter Müller peter.mueller@ipfire.org Date: Sat Apr 11 12:20:01 2020 +0200
Pakfire: do not leak upstream proxy password in log messages
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d96d5db6e51999d1239639140ab715bf97cb2749 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Apr 11 12:19:20 2020 +0200
Pakfire: fix upstream proxy usage
This patch ensures Pakfire will download updates via the configured upstream proxy (if any) for both HTTP and HTTPS.
Fixes: #12357
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1aa097a9471a636fb72a0bb7cbc8e4f8896e52cd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 15:10:08 2020 +0000
core145: add system.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 003fb6f60892cdecea9a094ee891a4ccddbc9987 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Apr 11 11:02:26 2020 +0200
system.cgi: correctly translate CPU frequency
The CPU frequency diagram used the same "translation" as the CPU load, which was confusing. This patch introduces a dedicated translation for "CPU frequency", which makes things a little bit better but still does not solve a Deppenleerzeichen ("CPU-Frequenz Diagramm") in the German translation.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 2a554ea34f7054669b76b26dae27ede826dcda01 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Apr 11 10:25:29 2020 +0200
lang: fix typo (MacVTtap != MacVTap)
Fixes: #12339
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 086c09eefb72449ef39517e3586470ebef5e7276 Author: Erik Kapfer ummeegge@ipfire.org Date: Sat Apr 11 07:26:58 2020 +0200
borgbackup: Fixes DEP error. Update to 1.1.11
Fixes #12356
Several fixes but also new features has been added with this version. Full changelog can be found in here --> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111... .
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 51044e048f6f2908299a4540b470b9e333dd4b3d Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Apr 11 19:08:38 2020 +0200
vnstat 2.6: Added status section for initscript
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 49d09728cc90b05827e1bd2f9d16eee5fbd9e57a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Apr 11 18:37:38 2020 +0200
vnstat 2.6: Fix for initskript
Removed 'sleep 2'
Added exit status in 'stop'-section
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8c7446ab081d664972db0462080639fe5a96d69c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Apr 10 21:41:42 2020 +0200
vnstat 2.6: Fix for rootfile
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 68a6d1053f13e66d7dba959d0ec26c2570fae16e Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Apr 10 19:17:11 2020 +0200
makegraphs: 'vnstat -u' is no longer supported/needed
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 5a5de3f0269983bec1d7ffc9f4019b96b1c560a0 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Apr 10 19:17:10 2020 +0200
vnstat 2.6: New initscript
Added the new 'vnstatd' daemon to 'start' and 'stop' section.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 29f35b79c70ba5ee54ed20ad4d96397f93b9b0c4 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Apr 10 19:17:09 2020 +0200
traffic.cgi: Changed time interval for vnstat graphs from 5 to 1 minute
This keeps the graphs a bit more "updated".
From 'man vnstat': '-c (--cache-time) => Update output file only if at least *time* minutes have passed since the previous file update.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7b1134ea606428f05f721a7a598b99556f39d8dc Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Apr 10 19:17:08 2020 +0200
vnstat: Update to 2.6
For details see: https://humdi%5Bdot%5Dnet/vnstat/CHANGES
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a05dbe793d36681d2b8b7cb3332537e1c6dca0b4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 14:54:07 2020 +0000
core145: add gzip
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 906a1763782c7c77843aa96a67234ff2510f63f7 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Apr 10 10:00:37 2020 +0200
gzip: ship zgrep, zless and zmore
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f7ae6259f487e10fa9181d76f58f3fdc702c68ad Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 14:52:11 2020 +0000
core145: add iproute2
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b1c761c1842313f10354f8f2577a1e8380a351b1 Author: Erik Kapfer ummeegge@ipfire.org Date: Wed Apr 8 11:12:18 2020 +0200
iproute2: Update to version 5.6.0
Several fixes and new enhancements, including new binaries (devlink, rdma, tipc) has been added. For all commits, take a look in here --> https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/ .
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ad537bf9cb6bd0655d4ec177d6540e1515240366 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 14:50:14 2020 +0000
core145: add ipset
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit efe2990afc45cc1a722d4b6be7b094633b5c78bd Author: Erik Kapfer ummeegge@ipfire.org Date: Wed Apr 8 10:56:17 2020 +0200
ipset: Update to version 7.6
Update includes several userspace and kernel part changes. For an overview, take a look into the changelog http://ipset.netfilter.org/changelog.html
Signed-off-by: Erik Kapfer ummeegge@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d9673001e82e8c627c1b21a3d97b4f9c435d1bca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 30 14:45:03 2020 +0000
core145: add firewall initskript
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ef7e9e52f2eb6457b4e498d63bf446148a552c46 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Apr 7 17:07:18 2020 +0200
firewall initscript: slightly improve comments
This patch corrects some typos and does not introduce functional changes.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/gzip | 6 +- config/rootfiles/common/iproute2 | 26 ++------ config/rootfiles/common/libwww-perl | 78 +++------------------- config/rootfiles/common/vnstat | 11 ++- config/rootfiles/core/145/filelists/files | 6 ++ .../{oldcore/111 => core/145}/filelists/gzip | 0 .../{oldcore/106 => core/145}/filelists/iproute2 | 0 .../{oldcore/106 => core/145}/filelists/ipset | 0 .../136 => core/145}/filelists/libwww-perl | 0 config/rootfiles/core/145/update.sh | 2 + config/rootfiles/packages/borgbackup | 34 ++++++---- html/cgi-bin/system.cgi | 2 +- html/cgi-bin/traffic.cgi | 10 +-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 3 +- langs/fr/cgi-bin/fr.pl | 2 +- lfs/borgbackup | 8 +-- lfs/iproute2 | 6 +- lfs/ipset | 6 +- lfs/libwww-perl | 6 +- lfs/vnstat | 5 +- src/initscripts/system/firewall | 18 ++--- src/initscripts/system/vnstat | 19 +++++- src/pakfire/lib/functions.pl | 6 +- src/scripts/makegraphs | 3 - 25 files changed, 108 insertions(+), 150 deletions(-) copy config/rootfiles/{oldcore/111 => core/145}/filelists/gzip (100%) copy config/rootfiles/{oldcore/106 => core/145}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/106 => core/145}/filelists/ipset (100%) copy config/rootfiles/{oldcore/136 => core/145}/filelists/libwww-perl (100%)
Difference in files: diff --git a/config/rootfiles/common/gzip b/config/rootfiles/common/gzip index c470a385c..f0b450b78 100644 --- a/config/rootfiles/common/gzip +++ b/config/rootfiles/common/gzip @@ -8,9 +8,9 @@ bin/zcat #usr/bin/zegrep #usr/bin/zfgrep #usr/bin/zforce -#usr/bin/zgrep -#usr/bin/zless -#usr/bin/zmore +usr/bin/zgrep +usr/bin/zless +usr/bin/zmore #usr/bin/znew #usr/share/info/gzip.info #usr/share/man/man1/gunzip.1 diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index 802803bdd..83a483155 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -10,12 +10,14 @@ etc/iproute2/rt_scopes etc/iproute2/rt_tables sbin/bridge sbin/ctstat +sbin/devlink sbin/genl sbin/ifcfg sbin/ifstat sbin/ip sbin/lnstat sbin/nstat +sbin/rdma sbin/routef sbin/routel sbin/rtacct @@ -24,6 +26,7 @@ sbin/rtpr sbin/rtstat sbin/ss sbin/tc +sbin/tipc #usr/include/iproute2 #usr/include/iproute2/bpf_elf.h #usr/lib/tc @@ -35,26 +38,6 @@ sbin/tc #usr/share/bash-completion #usr/share/bash-completion/completions usr/share/bash-completion/completions/tc -#usr/share/doc/iproute2 -#usr/share/doc/iproute2/examples -#usr/share/doc/iproute2/examples/README.cbq -#usr/share/doc/iproute2/examples/README.iproute2+tc -#usr/share/doc/iproute2/examples/SYN-DoS.rate.limit -#usr/share/doc/iproute2/examples/cbqinit.eth1 -#usr/share/doc/iproute2/examples/diffserv -#usr/share/doc/iproute2/examples/diffserv/Edge1 -#usr/share/doc/iproute2/examples/diffserv/Edge2 -#usr/share/doc/iproute2/examples/diffserv/Edge31-ca-u32 -#usr/share/doc/iproute2/examples/diffserv/Edge31-cb-chains -#usr/share/doc/iproute2/examples/diffserv/Edge32-ca-u32 -#usr/share/doc/iproute2/examples/diffserv/Edge32-cb-chains -#usr/share/doc/iproute2/examples/diffserv/Edge32-cb-u32 -#usr/share/doc/iproute2/examples/diffserv/README -#usr/share/doc/iproute2/examples/diffserv/afcbq -#usr/share/doc/iproute2/examples/diffserv/ef-prio -#usr/share/doc/iproute2/examples/diffserv/efcbq -#usr/share/doc/iproute2/examples/diffserv/regression-testing -#usr/share/doc/iproute2/examples/gaiconf #usr/share/man/man3/libnetlink.3 #usr/share/man/man7/tc-hfsc.7 #usr/share/man/man8/arpd.8 @@ -67,6 +50,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/devlink-region.8 #usr/share/man/man8/devlink-resource.8 #usr/share/man/man8/devlink-sb.8 +#usr/share/man/man8/devlink-trap.8 #usr/share/man/man8/devlink.8 #usr/share/man/man8/genl.8 #usr/share/man/man8/ifcfg.8 @@ -127,10 +111,12 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tc-drr.8 #usr/share/man/man8/tc-ematch.8 #usr/share/man/man8/tc-etf.8 +#usr/share/man/man8/tc-ets.8 #usr/share/man/man8/tc-flow.8 #usr/share/man/man8/tc-flower.8 #usr/share/man/man8/tc-fq.8 #usr/share/man/man8/tc-fq_codel.8 +#usr/share/man/man8/tc-fq_pie.8 #usr/share/man/man8/tc-fw.8 #usr/share/man/man8/tc-hfsc.8 #usr/share/man/man8/tc-htb.8 diff --git a/config/rootfiles/common/libwww-perl b/config/rootfiles/common/libwww-perl index d54d85f14..373065128 100644 --- a/config/rootfiles/common/libwww-perl +++ b/config/rootfiles/common/libwww-perl @@ -1,27 +1,3 @@ -#usr/lib/perl5/site_perl/5.30.0/Bundle -usr/lib/perl5/site_perl/5.30.0/Bundle/LWP.pm -#usr/lib/perl5/site_perl/5.30.0/File -usr/lib/perl5/site_perl/5.30.0/File/Listing.pm -usr/lib/perl5/site_perl/5.30.0/HTML/Form.pm -#usr/lib/perl5/site_perl/5.30.0/HTTP -#usr/lib/perl5/site_perl/5.30.0/HTTP/Cookies -usr/lib/perl5/site_perl/5.30.0/HTTP/Cookies.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Cookies/Microsoft.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Cookies/Netscape.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Daemon.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Date.pm -#usr/lib/perl5/site_perl/5.30.0/HTTP/Headers -usr/lib/perl5/site_perl/5.30.0/HTTP/Headers.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Headers/Auth.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Headers/ETag.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Headers/Util.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Message.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Negotiate.pm -#usr/lib/perl5/site_perl/5.30.0/HTTP/Request -usr/lib/perl5/site_perl/5.30.0/HTTP/Request.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Request/Common.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Response.pm -usr/lib/perl5/site_perl/5.30.0/HTTP/Status.pm #usr/lib/perl5/site_perl/5.30.0/LWP usr/lib/perl5/site_perl/5.30.0/LWP.pm #usr/lib/perl5/site_perl/5.30.0/LWP/Authen @@ -29,22 +5,19 @@ usr/lib/perl5/site_perl/5.30.0/LWP/Authen/Basic.pm usr/lib/perl5/site_perl/5.30.0/LWP/Authen/Digest.pm usr/lib/perl5/site_perl/5.30.0/LWP/Authen/Ntlm.pm usr/lib/perl5/site_perl/5.30.0/LWP/ConnCache.pm +#usr/lib/perl5/site_perl/5.30.0/LWP/Debug usr/lib/perl5/site_perl/5.30.0/LWP/Debug.pm +usr/lib/perl5/site_perl/5.30.0/LWP/Debug/TraceHTTP.pm usr/lib/perl5/site_perl/5.30.0/LWP/DebugFile.pm -usr/lib/perl5/site_perl/5.30.0/LWP/MediaTypes.pm usr/lib/perl5/site_perl/5.30.0/LWP/MemberMixin.pm #usr/lib/perl5/site_perl/5.30.0/LWP/Protocol usr/lib/perl5/site_perl/5.30.0/LWP/Protocol.pm -usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/GHTTP.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/cpan.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/data.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/file.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/ftp.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/gopher.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/http.pm -usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/http10.pm -usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/https.pm -usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/https10.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/loopback.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/mailto.pm usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/nntp.pm @@ -52,51 +25,20 @@ usr/lib/perl5/site_perl/5.30.0/LWP/Protocol/nogo.pm usr/lib/perl5/site_perl/5.30.0/LWP/RobotUA.pm usr/lib/perl5/site_perl/5.30.0/LWP/Simple.pm usr/lib/perl5/site_perl/5.30.0/LWP/UserAgent.pm -usr/lib/perl5/site_perl/5.30.0/LWP/media.types -#usr/lib/perl5/site_perl/5.30.0/Net -#usr/lib/perl5/site_perl/5.30.0/Net/HTTP -usr/lib/perl5/site_perl/5.30.0/Net/HTTP.pm -usr/lib/perl5/site_perl/5.30.0/Net/HTTP/Methods.pm -usr/lib/perl5/site_perl/5.30.0/Net/HTTP/NB.pm -usr/lib/perl5/site_perl/5.30.0/Net/HTTPS.pm -#usr/lib/perl5/site_perl/5.30.0/WWW -#usr/lib/perl5/site_perl/5.30.0/WWW/RobotRules -usr/lib/perl5/site_perl/5.30.0/WWW/RobotRules.pm -usr/lib/perl5/site_perl/5.30.0/WWW/RobotRules/AnyDBM_File.pm -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/libwww-perl -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/libwww-perl/.packlist -#usr/lib/perl5/site_perl/5.30.0/lwpcook.pod -#usr/lib/perl5/site_perl/5.30.0/lwptut.pod -#usr/share/man/man3/Bundle::LWP.3 -#usr/share/man/man3/File::Listing.3 -#usr/share/man/man3/HTML::Form.3 -#usr/share/man/man3/HTTP::Cookies.3 -#usr/share/man/man3/HTTP::Cookies::Microsoft.3 -#usr/share/man/man3/HTTP::Cookies::Netscape.3 -#usr/share/man/man3/HTTP::Daemon.3 -#usr/share/man/man3/HTTP::Date.3 -#usr/share/man/man3/HTTP::Headers.3 -#usr/share/man/man3/HTTP::Headers::Util.3 -#usr/share/man/man3/HTTP::Message.3 -#usr/share/man/man3/HTTP::Negotiate.3 -#usr/share/man/man3/HTTP::Request.3 -#usr/share/man/man3/HTTP::Request::Common.3 -#usr/share/man/man3/HTTP::Response.3 -#usr/share/man/man3/HTTP::Status.3 +#usr/lib/perl5/site_perl/5.30.0/libwww +usr/lib/perl5/site_perl/5.30.0/libwww/lwpcook.pod +usr/lib/perl5/site_perl/5.30.0/libwww/lwptut.pod +#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww +#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww/perl +usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/libwww/perl/.packlist #usr/share/man/man3/LWP.3 #usr/share/man/man3/LWP::Authen::Ntlm.3 #usr/share/man/man3/LWP::ConnCache.3 #usr/share/man/man3/LWP::Debug.3 -#usr/share/man/man3/LWP::DebugFile.3 -#usr/share/man/man3/LWP::MediaTypes.3 #usr/share/man/man3/LWP::MemberMixin.3 #usr/share/man/man3/LWP::Protocol.3 #usr/share/man/man3/LWP::RobotUA.3 #usr/share/man/man3/LWP::Simple.3 #usr/share/man/man3/LWP::UserAgent.3 -#usr/share/man/man3/Net::HTTP.3 -#usr/share/man/man3/Net::HTTP::NB.3 -#usr/share/man/man3/WWW::RobotRules.3 -#usr/share/man/man3/WWW::RobotRules::AnyDBM_File.3 -#usr/share/man/man3/lwpcook.3 -#usr/share/man/man3/lwptut.3 +#usr/share/man/man3/libwww::lwpcook.3 +#usr/share/man/man3/libwww::lwptut.3 diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat index 42e00ed2a..83a79414f 100644 --- a/config/rootfiles/common/vnstat +++ b/config/rootfiles/common/vnstat @@ -1,12 +1,9 @@ -#etc/cron.d -#etc/cron.d/vnstat etc/vnstat.conf usr/bin/vnstat usr/bin/vnstati -#usr/sbin/vnstatd -#usr/share/man/man5/vnstat.conf.5 -#usr/share/man/man1/vnstatd.1 -#usr/share/man/man1/vnstati.1 +usr/sbin/vnstatd #usr/share/man/man1/vnstat.1 -#var/lib/vnstat +#usr/share/man/man1/vnstati.1 +#usr/share/man/man5/vnstat.conf.5 +#usr/share/man/man8/vnstatd.8 var/log/vnstat diff --git a/config/rootfiles/core/145/filelists/files b/config/rootfiles/core/145/filelists/files index 6ab4faa47..e9bb2f47c 100644 --- a/config/rootfiles/core/145/filelists/files +++ b/config/rootfiles/core/145/filelists/files @@ -3,3 +3,9 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs +etc/rc.d/init.d/firewall +etc/rc.d/init.d/vnstat +opt/pakfire/lib/functions.pl +usr/local/bin/makegraphs +srv/web/ipfire/cgi-bin/system.cgi +srv/web/ipfire/cgi-bin/traffic.cgi diff --git a/config/rootfiles/core/145/filelists/gzip b/config/rootfiles/core/145/filelists/gzip new file mode 120000 index 000000000..aebcccd87 --- /dev/null +++ b/config/rootfiles/core/145/filelists/gzip @@ -0,0 +1 @@ +../../../common/gzip \ No newline at end of file diff --git a/config/rootfiles/core/145/filelists/iproute2 b/config/rootfiles/core/145/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/145/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/145/filelists/ipset b/config/rootfiles/core/145/filelists/ipset new file mode 120000 index 000000000..2b43691f2 --- /dev/null +++ b/config/rootfiles/core/145/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/145/filelists/libwww-perl b/config/rootfiles/core/145/filelists/libwww-perl new file mode 120000 index 000000000..ad77c8c4a --- /dev/null +++ b/config/rootfiles/core/145/filelists/libwww-perl @@ -0,0 +1 @@ +../../../common/libwww-perl \ No newline at end of file diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 3d3305e67..2571fa3b3 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -46,6 +46,7 @@ done # Remove files
# Stop services +/etc/init.d/vnstat stop
# Extract files extract_files @@ -54,6 +55,7 @@ extract_files ldconfig
# Start services +/etc/init.d/vnstat start
# Update Language cache /usr/local/bin/update-lang-cache diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index 19b5a69eb..81a7e7072 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -1,19 +1,28 @@ usr/bin/borg usr/bin/borgfs -usr/lib/python3.8/site-packages/borg +#usr/lib/python3.8/site-packages/borg usr/lib/python3.8/site-packages/borg/__init__.py usr/lib/python3.8/site-packages/borg/__main__.py usr/lib/python3.8/site-packages/borg/_version.py -usr/lib/python3.8/site-packages/borg/algorithms +#usr/lib/python3.8/site-packages/borg/algorithms usr/lib/python3.8/site-packages/borg/algorithms/__init__.py usr/lib/python3.8/site-packages/borg/algorithms/checksums.cpython-38-MACHINE-linux-gnu.so +#usr/lib/python3.8/site-packages/borg/algorithms/msgpack +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/__init__.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_packer.cpp +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_packer.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_unpacker.cpp +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_unpacker.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_version.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/exceptions.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/fallback.py usr/lib/python3.8/site-packages/borg/archive.py usr/lib/python3.8/site-packages/borg/archiver.py usr/lib/python3.8/site-packages/borg/cache.py usr/lib/python3.8/site-packages/borg/chunker.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/compress.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/constants.py -usr/lib/python3.8/site-packages/borg/crypto +#usr/lib/python3.8/site-packages/borg/crypto usr/lib/python3.8/site-packages/borg/crypto/__init__.py usr/lib/python3.8/site-packages/borg/crypto/file_integrity.py usr/lib/python3.8/site-packages/borg/crypto/key.py @@ -30,11 +39,12 @@ usr/lib/python3.8/site-packages/borg/lrucache.py usr/lib/python3.8/site-packages/borg/nanorst.py usr/lib/python3.8/site-packages/borg/paperkey.html usr/lib/python3.8/site-packages/borg/patterns.py -usr/lib/python3.8/site-packages/borg/platform +#usr/lib/python3.8/site-packages/borg/platform usr/lib/python3.8/site-packages/borg/platform/__init__.py usr/lib/python3.8/site-packages/borg/platform/base.py usr/lib/python3.8/site-packages/borg/platform/linux.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/platform/posix.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/platform/syncfilerange.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/remote.py usr/lib/python3.8/site-packages/borg/repository.py usr/lib/python3.8/site-packages/borg/selftest.py @@ -71,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/PKG-INFO -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/SOURCES.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/dependency_links.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/entry_points.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/not-zip-safe -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/requires.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 487ba996c..d7db9406a 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -61,7 +61,7 @@ if ( $querry[0] =~ "cpufreq"){ &Header::closebox();
if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ - &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'cpu frequency'} $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","cpufreq","day"); &Header::closebox(); } diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index fbffecb7c..e19bea20a 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -86,15 +86,15 @@ sub display_vnstat if ( $testdata =~ 'enough') { print"No data for $device !<br>"; } else { - system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); + system("/usr/bin/vnstati -c 1 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); # Hour graph - system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); + system("/usr/bin/vnstati -c 1 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); # Day graph - system("/usr/bin/vnstati -c 5 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png"); + system("/usr/bin/vnstati -c 1 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png"); # Month graph - system("/usr/bin/vnstati -c 5 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png"); + system("/usr/bin/vnstati -c 1 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png"); # Top10 graph - system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png"); + system("/usr/bin/vnstati -c 1 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png");
# Generate HTML-Table with the graphs print <<END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index c3702cc09..9f1768e78 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -662,6 +662,7 @@ 'country' => 'Land', 'country codes and flags' => 'Länder und Länderkennungen', 'countrycode' => 'Kennung', +'cpu frequency' => 'CPU-Frequenz', 'cpu frequency per' => 'CPU-Frequenz pro', 'cpu idle usage' => 'Leerlauf CPU-Nutzung', 'cpu interrupt usage' => 'Interrupt CPU-Nutzung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3f3e46641..fb911b914 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -678,6 +678,7 @@ 'country' => 'Country', 'country codes and flags' => 'Country Codes and Flags:', 'countrycode' => 'Code', +'cpu frequency' => 'CPU frequency', 'cpu frequency per' => 'CPU frequency per', 'cpu idle usage' => 'Idle CPU Usage', 'cpu interrupt usage' => 'Interrupt CPU Usage', @@ -2984,7 +2985,7 @@ 'zoneconf nic assignment' => 'NIC Assignment', 'zoneconf nicmode bridge' => 'Bridge', 'zoneconf nicmode default' => 'Default', -'zoneconf nicmode macvtap' => 'MacVTtap', +'zoneconf nicmode macvtap' => 'MacVTap', 'zoneconf notice reboot' => 'Please reboot to apply your changes.', 'zoneconf title' => 'Zone Configuration', 'zoneconf val native assignment error' => 'A NIC cannot be accessed natively by more than one zone.', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index ec81e3e36..cc3d601a2 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2976,7 +2976,7 @@ 'zoneconf nic assignment' => 'Affectation de carte réseau', 'zoneconf nicmode bridge' => 'Pont', 'zoneconf nicmode default' => 'Défaut', -'zoneconf nicmode macvtap' => 'MacVTtap', +'zoneconf nicmode macvtap' => 'MacVTap', 'zoneconf notice reboot' => 'Veuillez redémarrer pour appliquer vos changements.', 'zoneconf title' => 'Configuration de zones', 'zoneconf val native assignment error' => 'Une carte réseau ne peut pas être atteinte nativement par davantage qu'une zone.', diff --git a/lfs/borgbackup b/lfs/borgbackup index 97efd970d..cdfe5e3d5 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.1.9 +VER = 1.1.11
THISAPP = borgbackup-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 3 +PAK_VER = 4
DEPS = python3-llfuse python3-msgpack
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836 +$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
install : $(TARGET)
diff --git a/lfs/iproute2 b/lfs/iproute2 index 820303f35..2e8822902 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 5.3.0 +VER = 5.6.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 227404413c8d6db649d6188ead1e5a6e +$(DL_FILE)_MD5 = 9da0c352707c34b8b1fec3bf42fcfd09
install : $(TARGET)
diff --git a/lfs/ipset b/lfs/ipset index fb6a2f38f..1f6f47d2a 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 7.3 +VER = 7.6
THISAPP = ipset-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a041d186097a23f1f87208f11144907e +$(DL_FILE)_MD5 = e107b679c3256af795261cece864d6d9
install : $(TARGET)
diff --git a/lfs/libwww-perl b/lfs/libwww-perl index 536a49769..1b95ea0da 100644 --- a/lfs/libwww-perl +++ b/lfs/libwww-perl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 5.803 +VER = 6.43
THISAPP = libwww-perl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3345d5f15a4f42350847254141725c8f +$(DL_FILE)_MD5 = e64d87052eb51bb55627c756ccdfe233
install : $(TARGET)
diff --git a/lfs/vnstat b/lfs/vnstat index 27189126b..904e5a256 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -24,7 +24,7 @@
include Config
-VER = 1.18 +VER = 2.6
THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c9abaeb0ce758c16f6cdfa247bd8606c +$(DL_FILE)_MD5 = fe2928a81243cc8a532a357f97221736
install : $(TARGET)
@@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" cd $(DIR_APP) && make install - sed -i 's|eth0|green0|g' /etc/vnstat.conf sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index ab144ea18..00512d9fa 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -41,18 +41,18 @@ iptables_init() { iptables -A LOG_REJECT -j REJECT
# This chain will log, then DROPs packets with certain bad combinations - # of flags might indicate a port-scan attempt (xmas, null, etc) + # of flags might indicate a port-scan attempt (xmas, null, etc.) iptables -N PSCAN if [ "$DROPPORTSCAN" == "on" ]; then - iptables -A PSCAN -p tcp -m limit --limit 10/second -j LOG --log-prefix "DROP_TCP Scan " -m comment --comment "DROP_TCP PScan" - iptables -A PSCAN -p udp -m limit --limit 10/second -j LOG --log-prefix "DROP_UDP Scan " -m comment --comment "DROP_UDP PScan" + iptables -A PSCAN -p tcp -m limit --limit 10/second -j LOG --log-prefix "DROP_TCP Scan " -m comment --comment "DROP_TCP PScan" + iptables -A PSCAN -p udp -m limit --limit 10/second -j LOG --log-prefix "DROP_UDP Scan " -m comment --comment "DROP_UDP PScan" iptables -A PSCAN -p icmp -m limit --limit 10/second -j LOG --log-prefix "DROP_ICMP Scan " -m comment --comment "DROP_ICMP PScan" iptables -A PSCAN -f -m limit --limit 10/second -j LOG --log-prefix "DROP_FRAG Scan " -m comment --comment "DROP_FRAG PScan" fi iptables -A PSCAN -j DROP -m comment --comment "DROP_PScan"
# New tcp packets without SYN set - could well be an obscure type of port scan - # that's not covered above, may just be a broken windows machine + # that's not covered above, may just be a broken Windows machine iptables -N NEWNOTSYN if [ "$DROPNEWNOTSYN" == "on" ]; then iptables -A NEWNOTSYN -m limit --limit 10/second -j LOG --log-prefix "DROP_NEWNOTSYN " @@ -159,7 +159,7 @@ iptables_init() { iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda fi
- # Fix for braindead ISP's + # Fix for braindead ISPs iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
# CUSTOM chains, can be used by the users themselves @@ -180,7 +180,7 @@ iptables_init() { iptables -A FORWARD -j P2PBLOCK iptables -A OUTPUT -j P2PBLOCK - # Guardian (IPS) chains + # IPS (Guardian) chains iptables -N GUARDIAN iptables -A INPUT -j GUARDIAN iptables -A FORWARD -j GUARDIAN @@ -196,7 +196,7 @@ iptables_init() { iptables -A FORWARD -i tun+ -j OVPNBLOCK iptables -A FORWARD -o tun+ -j OVPNBLOCK
- # IPS (suricata) chains + # IPS (Suricata) chains iptables -N IPS_INPUT iptables -N IPS_FORWARD iptables -N IPS_OUTPUT @@ -261,7 +261,7 @@ iptables_init() { iptables -A OUTPUT -o "${GREEN_DEV}" -j DHCPGREENOUTPUT fi
- # allow DHCP on BLUE to be turned on/off + # Allow DHCP on BLUE to be turned on/off iptables -N DHCPBLUEINPUT iptables -N DHCPBLUEOUTPUT if [ -n "${BLUE_DEV}" ]; then @@ -438,7 +438,7 @@ iptables_red_up() { iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $IFACE -j ACCEPT fi
- # Outgoing masquerading (don't masqerade IPSEC (mark 50)) + # Outgoing masquerading (don't masqerade IPsec (mark 50)) iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
if [ "${IFACE}" = "${GREEN_DEV}" ]; then diff --git a/src/initscripts/system/vnstat b/src/initscripts/system/vnstat index 363307013..c1bb2942a 100755 --- a/src/initscripts/system/vnstat +++ b/src/initscripts/system/vnstat @@ -17,15 +17,32 @@ case "$1" in mount_ramdisk "${VNSTATLOG}" evaluate_retval fi + + boot_mesg "Starting vnstatd..." + loadproc /usr/sbin/vnstatd -d --alwaysadd + evaluate_retval ;; + stop) + boot_mesg "Stopping vnstatd..." + killproc /usr/sbin/vnstatd + evaluate_retval + umount_ramdisk "${VNSTATLOG}" + boot_mesg "Unmounting vnstat ramdisk..." + evaluate_retval ;; + restart) ${0} stop sleep 1 ${0} start ;; + + status) + statusproc /usr/sbin/vnstatd + ;; + backup) # Backup all data if ramdisk is used if mountpoint "${RRDLOG}" &>/dev/null; then @@ -34,7 +51,7 @@ case "$1" in ;;
*) - echo "Usage: $0 {start|stop|restart|backup}" + echo "Usage: $0 {start|stop|restart|status|backup}" exit 1 ;; esac diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 45e3427b1..4d5c6219a 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -161,10 +161,10 @@ sub fetchfile { if ($proxysettings{'UPSTREAM_PROXY'}) { logger("DOWNLOAD INFO: Upstream proxy: "$proxysettings{'UPSTREAM_PROXY'}""); if ($proxysettings{'UPSTREAM_USER'}) { - $ua->proxy([["http", "https"] => "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_..."]); - logger("DOWNLOAD INFO: Logging in with: "$proxysettings{'UPSTREAM_USER'}" - "$proxysettings{'UPSTREAM_PASSWORD'}""); + $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_..."); + logger("DOWNLOAD INFO: Logging in with "$proxysettings{'UPSTREAM_USER'}" against "$proxysettings{'UPSTREAM_PROXY'}""); } else { - $ua->proxy([["http", "https"] => "http://$proxysettings%7B%27UPSTREAM_PROXY%27%7D/"]); + $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_PROXY%27%7D/"); } }
diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index b91a70e3a..1dc14b8a3 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -106,9 +106,6 @@ sub updatehdddata{ } }
-## Update vnstat -system ('/usr/bin/vnstat -u'); - my @disks = `ls -1 /sys/block | grep -E '^sd|^nvme|^mmcblk|^xvd|^vd|^md' | sort | uniq`; system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){
hooks/post-receive -- IPFire 2.x development tree