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 3049ef008ea35a34429e7d6adeaea6933b1458dc (commit) via 189d41d2000d9a6c90d50ba12218a6ab446bbad4 (commit) via b4cb1ed58b9dbd7d40bd8e9710b7f323da8b8997 (commit) via 3fbad7e512d807499c1c04b396bb55ebff1075d7 (commit) via eb408bb29ce2f080651816b216d2e112a1b6e493 (commit) via 85d2bb767f55f88f3803174f16e61925dced053f (commit) via a9067348405fddb2ea72b4ea970ef94d89472f65 (commit) via 5be657270f56af5f0bd189d5b4e4b5eb915633cf (commit) via 5adf0ed40c62559c44ff16459f156701d3e85a5e (commit) via 9270497a6d6a2b3c3669b51052842d6f917d8b34 (commit) via 662b1d802e188820b7d3d537f406ff0c281f2511 (commit) via 43f20d6e5af4ddce3050431db0fe7c598842430d (commit) from 65171dc956d7255fe16244807a4392910b925d90 (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 3049ef008ea35a34429e7d6adeaea6933b1458dc Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:53:45 2021 +0200
perl-CGI: Update to 4.53
- Update from 4.52 to 4.53 - Update of rootfile not required - Changelog 4.53 2021-06-03 - fix typo in passing of max-age to CGI::Cookie (GH #247)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 189d41d2000d9a6c90d50ba12218a6ab446bbad4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 10 12:23:12 2021 +0000
core158: Ship nettle
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b4cb1ed58b9dbd7d40bd8e9710b7f323da8b8997 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:53:29 2021 +0200
nettle: Update to 3.7.3
- Update from 3.7.2 to 3.7.3 - Update rootfile - Changelog 2021-05-22 Niels Möller nisse@lysator.liu.se * configure.ac: Bump package version, to 3.7.3. (LIBNETTLE_MINOR): Bump minor number, to 8.4. (LIBHOGWEED_MINOR): Bump minor number, to 6.4. 2021-05-17 Niels Möller nisse@lysator.liu.se * rsa-decrypt-tr.c (rsa_decrypt_tr): Check up-front that input is in range. * rsa-sec-decrypt.c (rsa_sec_decrypt): Likewise. * rsa-decrypt.c (rsa_decrypt): Likewise. * testsuite/rsa-encrypt-test.c (test_main): Add tests with input > n. 2021-05-14 Niels Möller nisse@lysator.liu.se * rsa-sign-tr.c (rsa_sec_blind): Delete mn argument. (_rsa_sec_compute_root_tr): Delete mn argument, instead require that input size matches key size. Rearrange use of temporary storage, to support in-place operation, x == m. Update all callers. * rsa-decrypt-tr.c (rsa_decrypt_tr): Make zero-padded copy of input, for calling _rsa_sec_compute_root_tr. * rsa-sec-decrypt.c (rsa_sec_decrypt): Likewise. * testsuite/rsa-encrypt-test.c (test_main): Test calling all of rsa_decrypt, rsa_decrypt_tr, and rsa_sec_decrypt with zero input. 2021-05-06 Niels Möller nisse@lysator.liu.se * pkcs1-sec-decrypt.c (_pkcs1_sec_decrypt): Check that message length is valid, for given key size. * testsuite/rsa-sec-decrypt-test.c (test_main): Add test cases for calls to rsa_sec_decrypt specifying a too large message length.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3fbad7e512d807499c1c04b396bb55ebff1075d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 10 12:22:45 2021 +0000
core158: Ship libxcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb408bb29ce2f080651816b216d2e112a1b6e493 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:53:16 2021 +0200
libxcrypt: Update to 4.4.22
- Update from 4.4.20 to 4.4.22 - Update of rootfile not required - Changelog Version 4.4.22 * The crypt_checksalt() function has been fixed to correctly return with 'CRYPT_SALT_INVALID', in case the setting, that is passed to be checked, represents an empty passphrase or an uncomputed setting for descrypt without any salt characters. Version 4.4.21 * The crypt_checksalt() function will now return the value 'CRYPT_SALT_METHOD_LEGACY' in case the setting, that is passed to be checked, uses a hashing method, which is considered to be too weak for use with new passphrases.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 85d2bb767f55f88f3803174f16e61925dced053f Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:53:04 2021 +0200
libogg: Update to 1.3.5
- Update from 1.3.4 to 1.3.5 - Update rootfile - Changelog Version 1.3.5 (2020 June 3) * Fix unsigned typedef problem on macOS. * Fix overflow check in ogg_sync_buffer. * Clean up cmake and autotools build files. * Remove Symbian and Apple XCode build files. * Fix documentation cross-reference links.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a9067348405fddb2ea72b4ea970ef94d89472f65 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 10 12:21:38 2021 +0000
core158: Ship libedit
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5be657270f56af5f0bd189d5b4e4b5eb915633cf Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:52:50 2021 +0200
libedit: Update to 20210522-3.1
- Update from 20210419-3.1 to 20210522-3.1 - Update rootfile - Changelog 2021-05-22 Jess Thrysoee * version-info: 0:66:0 * all: sync with upstream source * src/el.c: editrc not read on systems without issetugid Patch by Trevor Cordes
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5adf0ed40c62559c44ff16459f156701d3e85a5e Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jun 10 13:52:30 2021 +0200
elfutils: Update to 0.185
- Update from 0.184 to 0.185 - Update rootfile - Changelog Version 0.185 debuginfod-client: Simplify curl handle reuse so downloads which return an error are retried. elfcompress: Always exit with code 0 when the operation succeeds (even when nothing was done). On error the exit code is now always 1.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9270497a6d6a2b3c3669b51052842d6f917d8b34 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Jun 8 08:37:19 2021 +0200
Remove no longer needed texts, run "make.sh lang"
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 662b1d802e188820b7d3d537f406ff0c281f2511 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 10 09:12:40 2021 +0000
core158: Ship memory.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 43f20d6e5af4ddce3050431db0fe7c598842430d Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Jun 8 08:37:18 2021 +0200
memory.cgi: Fix memory usage table
procps 3.3.10 introduced a new output format for the "free" command. This patch adapts the new format.
Fixes: #12628
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Tested-by: Bernhard Bitsch bbitsch@ipfire.org Tested-by: Bernhard Bitsch bbitsch@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/libedit | 2 +- config/rootfiles/common/nettle | 4 +-- config/rootfiles/core/158/filelists/files | 1 + .../{oldcore/128 => core/158}/filelists/libedit | 0 .../{oldcore/155 => core/158}/filelists/libxcrypt | 0 .../{oldcore/101 => core/158}/filelists/nettle | 0 config/rootfiles/packages/elfutils | 6 ++-- config/rootfiles/packages/libogg | 3 +- doc/language_issues.de | 1 - doc/language_issues.en | 2 +- doc/language_issues.es | 1 + doc/language_issues.fr | 2 +- doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 2 +- doc/language_missings | 12 ++++---- html/cgi-bin/memory.cgi | 35 ++++++++++------------ langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 1 - langs/fr/cgi-bin/fr.pl | 1 - langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 1 - langs/pl/cgi-bin/pl.pl | 1 - langs/ru/cgi-bin/ru.pl | 1 - langs/tr/cgi-bin/tr.pl | 1 - lfs/elfutils | 6 ++-- lfs/libedit | 4 +-- lfs/libogg | 6 ++-- lfs/libxcrypt | 4 +-- lfs/nettle | 4 +-- lfs/perl-CGI | 4 +-- 34 files changed, 55 insertions(+), 59 deletions(-) copy config/rootfiles/{oldcore/128 => core/158}/filelists/libedit (100%) copy config/rootfiles/{oldcore/155 => core/158}/filelists/libxcrypt (100%) copy config/rootfiles/{oldcore/101 => core/158}/filelists/nettle (100%)
Difference in files: diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit index b0e8cf19c..2a1b8f534 100644 --- a/config/rootfiles/common/libedit +++ b/config/rootfiles/common/libedit @@ -4,7 +4,7 @@ #usr/lib/libedit.la #usr/lib/libedit.so usr/lib/libedit.so.0 -usr/lib/libedit.so.0.0.65 +usr/lib/libedit.so.0.0.66 #usr/lib/pkgconfig/libedit.pc #usr/share/man/man3/editline.3 #usr/share/man/man3/el_deletestr.3 diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle index 591e860c2..cf1165e80 100644 --- a/config/rootfiles/common/nettle +++ b/config/rootfiles/common/nettle @@ -72,9 +72,9 @@ #usr/include/nettle/yarrow.h usr/lib/libhogweed.so usr/lib/libhogweed.so.6 -usr/lib/libhogweed.so.6.3 +usr/lib/libhogweed.so.6.4 #usr/lib/libnettle.so usr/lib/libnettle.so.8 -usr/lib/libnettle.so.8.3 +usr/lib/libnettle.so.8.4 #usr/lib/pkgconfig/hogweed.pc #usr/lib/pkgconfig/nettle.pc diff --git a/config/rootfiles/core/158/filelists/files b/config/rootfiles/core/158/filelists/files index f2512a9e9..e7a6a3073 100644 --- a/config/rootfiles/core/158/filelists/files +++ b/config/rootfiles/core/158/filelists/files @@ -3,6 +3,7 @@ etc/ssh/sshd_config opt/pakfire/lib/functions.pl opt/pakfire/pakfire srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/memory.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/traffic.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/rootfiles/core/158/filelists/libedit b/config/rootfiles/core/158/filelists/libedit new file mode 120000 index 000000000..03fc483da --- /dev/null +++ b/config/rootfiles/core/158/filelists/libedit @@ -0,0 +1 @@ +../../../common/libedit \ No newline at end of file diff --git a/config/rootfiles/core/158/filelists/libxcrypt b/config/rootfiles/core/158/filelists/libxcrypt new file mode 120000 index 000000000..ad93616b5 --- /dev/null +++ b/config/rootfiles/core/158/filelists/libxcrypt @@ -0,0 +1 @@ +../../../common/libxcrypt \ No newline at end of file diff --git a/config/rootfiles/core/158/filelists/nettle b/config/rootfiles/core/158/filelists/nettle new file mode 120000 index 000000000..f0dba7ac8 --- /dev/null +++ b/config/rootfiles/core/158/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index c96267c26..d5db41fc7 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -27,15 +27,15 @@ usr/bin/eu-unstrip #usr/include/gelf.h #usr/include/libelf.h #usr/include/nlist.h -usr/lib/libasm-0.184.so +usr/lib/libasm-0.185.so #usr/lib/libasm.a #usr/lib/libasm.so usr/lib/libasm.so.1 -usr/lib/libdw-0.184.so +usr/lib/libdw-0.185.so #usr/lib/libdw.a #usr/lib/libdw.so usr/lib/libdw.so.1 -usr/lib/libelf-0.184.so +usr/lib/libelf-0.185.so #usr/lib/libelf.a #usr/lib/libelf.so usr/lib/libelf.so.1 diff --git a/config/rootfiles/packages/libogg b/config/rootfiles/packages/libogg index 0b53490cd..2977fc6b0 100644 --- a/config/rootfiles/packages/libogg +++ b/config/rootfiles/packages/libogg @@ -6,7 +6,7 @@ #usr/lib/libogg.la #usr/lib/libogg.so usr/lib/libogg.so.0 -usr/lib/libogg.so.0.8.4 +usr/lib/libogg.so.0.8.5 #usr/lib/pkgconfig/ogg.pc #usr/share/aclocal/ogg.m4 #usr/share/doc/libogg @@ -94,4 +94,3 @@ usr/lib/libogg.so.0.8.4 #usr/share/doc/libogg/vorbisword2.png #usr/share/doc/libogg/white-ogg.png #usr/share/doc/libogg/white-xifish.png - diff --git a/doc/language_issues.de b/doc/language_issues.de index ae8e31276..a091f2303 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -112,7 +112,6 @@ WARNING: translation string unused: alt information WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and -WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps diff --git a/doc/language_issues.en b/doc/language_issues.en index aa5c66dd2..63ac77fce 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -332,6 +332,7 @@ WARNING: untranslated string: august = August WARNING: untranslated string: authentication = Authentication: WARNING: untranslated string: automatic = Automatic WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: available updates = Available updates WARNING: untranslated string: average = Average WARNING: untranslated string: back = Back @@ -725,7 +726,6 @@ WARNING: untranslated string: error the to date has to be later than the from da WARNING: untranslated string: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours. WARNING: untranslated string: every = Every WARNING: untranslated string: exclude logfiles = Exclude logfiles -WARNING: untranslated string: excluding buffers and cache = -/+ buffers/cache WARNING: untranslated string: expires = Expires WARNING: untranslated string: export = Export WARNING: untranslated string: external aliases configuration = External aliases configuration diff --git a/doc/language_issues.es b/doc/language_issues.es index f66c5cae9..626eec21a 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -822,6 +822,7 @@ WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 12c715c62..95dd8fd3c 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -117,7 +117,6 @@ WARNING: translation string unused: alt information WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and -WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps @@ -892,6 +891,7 @@ WARNING: translation string unused: zoneconf val stp zone mode error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: available = available WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 726a0a989..9c0b62c15 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -908,6 +908,7 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string diff --git a/doc/language_issues.nl b/doc/language_issues.nl index e87e2c755..5db088b66 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -903,6 +903,7 @@ WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 80bca4f01..95e68faaf 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -837,6 +837,7 @@ WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6778a8399..cfaeed5b5 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -833,6 +833,7 @@ WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken diff --git a/doc/language_issues.tr b/doc/language_issues.tr index aa7337a66..e89ce0601 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -114,7 +114,6 @@ WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and WARNING: translation string unused: ansi t1.483 -WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps @@ -896,6 +895,7 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System +WARNING: untranslated string: available = available WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: cpu frequency = CPU frequency diff --git a/doc/language_missings b/doc/language_missings index 25265a943..9cfa3d1c9 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -102,12 +102,12 @@ < age shour < age sminute < age ssecond -< application layer gateways < asn lookup failed < Async logging enabled < atm device < attention < autonomous system +< available < bit < block < broken @@ -926,6 +926,7 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < ansi t1.483 +< available < bewan adsl pci st < bewan adsl usb < download apple profile @@ -956,9 +957,9 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac -< application layer gateways < asn lookup failed < autonomous system +< available < block < broken < Captive @@ -1352,10 +1353,10 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac -< application layer gateways < asn lookup failed < atm device < autonomous system +< available < block < broken < capabilities @@ -1812,11 +1813,11 @@ < age shour < age sminute < age ssecond -< application layer gateways < asn lookup failed < atm device < attention < autonomous system +< available < bit < block < broken @@ -2704,11 +2705,11 @@ < age shour < age sminute < age ssecond -< application layer gateways < asn lookup failed < atm device < attention < autonomous system +< available < bit < block < broken @@ -3583,6 +3584,7 @@ < advproxy wpad view pac < asn lookup failed < autonomous system +< available < broken < Captive delete logo < cpu frequency diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 204365294..89fa7d14a 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -64,7 +64,6 @@ if ( $querry[0] =~ "memory"){ &Header::openbox('100%', 'center', $Lang::tr{'memory'}); print "<table width='95%' cellspacing='5'>"; - my $ram=0; my $size=0; my $used=0; my $free=0; @@ -72,10 +71,12 @@ if ( $querry[0] =~ "memory"){ my $shared=0; my $buffers=0; my $cached=0; + my $available=0;
- open(FREE,'/usr/bin/free |'); - while(<FREE>){ - if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ ){ + # output format: kibibytes, wide mode (buffers and cache in two columns) + open(my $cmd_fh, "-|", '/usr/bin/free -k -w') or die $!; + while(<$cmd_fh>){ + if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cache\s+available$/ ){ print <<END <tr> <td align='center'> </td> @@ -87,13 +88,12 @@ if ( $querry[0] =~ "memory"){ END ; }else{ - if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){ - ($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6); + if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){ + ($size,$used,$free,$shared,$buffers,$cached,$available) = ($1,$2,$3,$4,$5,$6,$7); ($percent = ($used/$size)*100) =~ s/^(\d+)(.\d+)?$/$1%/; print <<END <tr> <td class='boldbase'><b>$Lang::tr{'ram'}</b></td> -<td align='center'>$size KB</td> END ; }elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){ @@ -106,17 +106,13 @@ END print <<END <tr> <td class='boldbase'><b>$Lang::tr{'swap'}</b></td> -<td align='center'>$size KB</td> END ; - }elsif($ram and $_ =~ m/^-/+ buffers/cache:\s+(\d+)\s+(\d+)$/ ){ - ($used,$free) = ($1,$2); - ($percent = ($used/$ram)*100) =~ s/^(\d+)(.\d+)?$/$1%/; - print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>"; } print <<END -<td align='center'>$used KB</td> -<td align='center'>$free KB</td> +<td align='center'>$size KiB</td> +<td align='center'>$used KiB</td> +<td align='center'>$free KiB</td> <td> END ; @@ -129,12 +125,13 @@ END ; } } - close FREE; + close($cmd_fh); print <<END -<tr><td class='boldbase' colspan='2'><br /></td></tr> -<tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KB</td></tr> -<tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KB</td></tr> -<tr><td class='boldbase'><b>$Lang::tr{'cached'}</b></td><td align='center'>$cached KB</td></tr> +<tr><td colspan='6'><br /></td></tr> +<tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KiB</td></tr> +<tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KiB</td></tr> +<tr><td class='boldbase'><b>$Lang::tr{'cached'}</b></td><td align='center'>$cached KiB</td></tr> +<tr><td class='boldbase'><b>$Lang::tr{'available'}</b></td><td align='center'>$available KiB</td></tr> </table> END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0bc579cd2..eee51575b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -452,6 +452,7 @@ 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', 'autonomous system' => 'Autonomes System', +'available' => 'verfügbar', 'available updates' => 'Verfügbare Updates', 'average' => 'Durchschnitt', 'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hauptsächlich verwendet, wenn Ihr IPFire sich hinter einem Router befindet. Ihre ROTE IP muss sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.', @@ -1006,7 +1007,6 @@ 'every' => 'Alle', 'exampel' => 'Beispiel', 'exclude logfiles' => 'ohne Protokolldateien', -'excluding buffers and cache' => '-/+ Puffer/Zwischenspeicher', 'expected' => 'Erwartet', 'expertoptions' => 'Expertenoptionen', 'expires' => 'Ablaufdatum', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1c69b3798..a48deeeca 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -451,6 +451,7 @@ 'authentication' => 'Authentication:', 'automatic' => 'Automatic', 'autonomous system' => 'Autonomous System', +'available' => 'available', 'available updates' => 'Available updates', 'average' => 'Average', 'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16', @@ -1033,7 +1034,6 @@ 'every' => 'Every', 'exampel' => 'example', 'exclude logfiles' => 'Exclude logfiles', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Expected', 'expertoptions' => 'Expert options', 'expires' => 'Expires', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index c9a7496bc..e76c987bc 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -839,7 +839,6 @@ 'every' => 'Cada', 'exampel' => 'ejemplo', 'exclude logfiles' => 'Excluir archivos de registro', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Esperado', 'expertoptions' => 'Opciones expertas', 'expires' => 'Expira', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 7cabaccde..840292f9c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1038,7 +1038,6 @@ 'every' => 'Chaque', 'exampel' => 'exemple', 'exclude logfiles' => 'Exclure les fichiers journaux', -'excluding buffers and cache' => '-/+ buffers/tampon', 'expected' => 'Attendu', 'expertoptions' => 'Réglages avancés', 'expires' => 'Expire', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index e82ecfd35..57585dd27 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -888,7 +888,6 @@ 'every' => 'Ogni', 'exampel' => 'esempio', 'exclude logfiles' => 'Escludi File di log', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Expected', 'expertoptions' => 'Expert options', 'expires' => 'Scade', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 55927839e..fb5a932f9 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -874,7 +874,6 @@ 'every' => 'Iedere', 'exampel' => 'voorbeeld', 'exclude logfiles' => 'Exclusief logbestanden', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Verwacht', 'expertoptions' => 'Expertopties', 'expires' => 'Verloopt', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 147db051c..d3540cc62 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -786,7 +786,6 @@ 'every' => 'Każdy', 'exampel' => 'przykład', 'exclude logfiles' => 'Wyklucz pliki z logami', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Oczekiwano', 'expertoptions' => 'Opcje zaawans.', 'expires' => 'Wygasa', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 0d986135d..12afa0b92 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -782,7 +782,6 @@ 'every' => 'Каждый', 'exampel' => 'пример', 'exclude logfiles' => 'Исключить файлы логов', -'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Ожидается', 'expertoptions' => 'Экспортировать настройки', 'expires' => 'Истекает', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index e02320a58..83416ebe7 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -981,7 +981,6 @@ 'every' => 'Her', 'exampel' => 'örnek', 'exclude logfiles' => 'Günlük dosyaları hariç', -'excluding buffers and cache' => '-/+ arabellek/önbellek', 'expected' => 'Beklenen', 'expertoptions' => 'Uzman seçenekleri', 'expires' => 'Bitiş tarihi', diff --git a/lfs/elfutils b/lfs/elfutils index 8c86c3b76..6a6e9dabc 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -24,7 +24,7 @@
include Config
-VER = 0.184 +VER = 0.185
THISAPP = elfutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elfutils -PAK_VER = 5 +PAK_VER = 6
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e5af45255ff7dc413de073da2ceff04 +$(DL_FILE)_MD5 = 2b6e94c2eebc1f2194173e31bca9396e
install : $(TARGET)
diff --git a/lfs/libedit b/lfs/libedit index e03357d7e..c28d07188 100644 --- a/lfs/libedit +++ b/lfs/libedit @@ -24,7 +24,7 @@
include Config
-VER = 20210419-3.1 +VER = 20210522-3.1
THISAPP = libedit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e288b8fe53bf0d096fb13847d4e0f640 +$(DL_FILE)_MD5 = 6ad9e9208daf031adf1ebc64441769e0
install : $(TARGET)
diff --git a/lfs/libogg b/lfs/libogg index 76a1e6813..59a0a3fa1 100644 --- a/lfs/libogg +++ b/lfs/libogg @@ -24,7 +24,7 @@
include Config
-VER = 1.3.4 +VER = 1.3.5
THISAPP = libogg-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libogg -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = eadef24aad6e3e8379ba0d14971fd64a +$(DL_FILE)_MD5 = 3178c98341559657a15b185bf5d700a5
install : $(TARGET)
diff --git a/lfs/libxcrypt b/lfs/libxcrypt index aac92b5ba..79edc5fb6 100644 --- a/lfs/libxcrypt +++ b/lfs/libxcrypt @@ -24,7 +24,7 @@
include Config
-VER = 4.4.20 +VER = 4.4.22
THISAPP = libxcrypt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3b87214308d9a48991fcf2b0aee5649e +$(DL_FILE)_MD5 = 6e4f363d86f99562d012c47e7f024618
install : $(TARGET)
diff --git a/lfs/nettle b/lfs/nettle index dfc3fdda5..02b117f91 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -24,7 +24,7 @@
include Config
-VER = 3.7.2 +VER = 3.7.3
THISAPP = nettle-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 22849db27ed563ebbc829273f0c97e35 +$(DL_FILE)_MD5 = a60273d0fab9c808646fcf5e9edc2e8f
install : $(TARGET)
diff --git a/lfs/perl-CGI b/lfs/perl-CGI index 50517744a..25a781935 100644 --- a/lfs/perl-CGI +++ b/lfs/perl-CGI @@ -24,7 +24,7 @@
include Config
-VER = 4.52 +VER = 4.53
THISAPP = CGI-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d7adc90a42513ede7400309d7985f7e5 +$(DL_FILE)_MD5 = a0fe86a038de743ac45a0933daa2804f
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree