From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73a92c604cf27df8b31c3ae15f0d6981e88b504d Date: Thu, 24 Dec 2020 12:17:29 +0000 Message-ID: <4D1px617vtz2xdC@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7014553000520176868==" List-Id: --===============7014553000520176868== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 73a92c604cf27df8b31c3ae15f0d6981e88b504d (commit) via 642316370f9cfa65175ae1cbed462a3b6c59622c (commit) via 6666b93d11b3add035baaf5a41a1ef16f4da9e19 (commit) via 0b1d45849f9df9ac145359a02cd383c7baff6c5b (commit) via f65629dd479a2846e9e4b1af910bf879d133e186 (commit) via 4ed49291c2eb23e7043721ed55f07c0135440dcb (commit) via d96d979e2a0bb199b5ae7bec75964f4091996268 (commit) via 631b7056acfd21f03b21f446eb6b26e5bd86f699 (commit) from 03bebd2303f560626ed2e465967a6b7846f21644 (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 73a92c604cf27df8b31c3ae15f0d6981e88b504d Author: Michael Tremer Date: Thu Dec 24 12:01:12 2020 +0000 Run "./make.sh lang" =20 Signed-off-by: Michael Tremer commit 642316370f9cfa65175ae1cbed462a3b6c59622c Author: Michael Tremer Date: Thu Dec 24 12:00:39 2020 +0000 core154: Ship pakfire.cgi =20 Signed-off-by: Michael Tremer commit 6666b93d11b3add035baaf5a41a1ef16f4da9e19 Author: Matthias Fischer Date: Thu Dec 24 01:09:04 2020 +0100 Update (and cosmetic fixes) for 'pakfire.cgi': Added GUI entry for existi= ng, but unused translation string =20 While preparing the Core153 update, I found by chance that a language str= ing had been added from Core152 to Core153 which I couldn't find in any CGI-file. =20 The translation suggested that this string ('Available Updates') could be= long to 'pakfire.cgi'. =20 And I thought that on the pakfire GUI something was actually missing: the= heading above the box listing the 'Available Updates'. Don't know why I didn't saw this bef= ore. =20 So tried to add these missing heading. I hope I made it right... =20 Some cosmetic fixes: I also added some space around the text for 'Available Addons' and 'Insta= lled Addons' because the text lines weren't separated. There is no seen wordwrapping. = This required deleting some unwanted '
' in the affected translation strings. =20 I tried this about 4 years ago, but somehow this patch got lost. =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 0b1d45849f9df9ac145359a02cd383c7baff6c5b Author: Michael Tremer Date: Thu Dec 24 11:59:46 2020 +0000 core154: Ship country.cgi =20 Signed-off-by: Michael Tremer commit f65629dd479a2846e9e4b1af910bf879d133e186 Author: Matthias Fischer Date: Thu Dec 24 11:56:13 2020 +0100 country.cgi: Cosmetic fix for 'Back'-button' =20 While testing Peter's patch for Bug #12560 I noticed that the standard 'b= ack'-button at the end of the page - like in 'ipinfo.cgi' - was implemented as a text= string. =20 I just took the code segment with the 'back'-*image* from 'ipinfo.cgi' to= make this link looking similar to the other pages. =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 4ed49291c2eb23e7043721ed55f07c0135440dcb Author: Peter M=C3=BCller Date: Thu Dec 24 09:19:15 2020 +0100 country.cgi: fix location function call =20 Fixes: #12560 =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit d96d979e2a0bb199b5ae7bec75964f4091996268 Author: Matthias Fischer Date: Thu Dec 24 00:06:55 2020 +0100 dhcpcd: Update to 9.3.4 =20 For details see: https://roy.marples.name/archives/dhcpcd-discuss/0003334.html =20 This version contains the official fix from here: https://roy.marples.name/cgit/dhcpcd.git/commit/?id=3D12cdb2be46e25e1ab99= df18324b787ad8749dff7 =20 This should fix Bug #12552 (dhcpcd-9.3.4 crash with bad system call) on 32bit/i686 systems. =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 631b7056acfd21f03b21f446eb6b26e5bd86f699 Author: Matthias Fischer Date: Thu Dec 24 01:15:19 2020 +0100 htop: Update to 3.0.4 =20 For details see: https://github.com/htop-dev/htop/blob/master/ChangeLog =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/154/filelists/files | 2 ++ doc/language_issues.de | 2 -- doc/language_issues.en | 6 ++-- doc/language_issues.es | 2 -- doc/language_issues.fr | 2 -- doc/language_issues.it | 3 -- doc/language_issues.nl | 2 -- doc/language_issues.pl | 2 -- doc/language_issues.ru | 2 -- doc/language_issues.tr | 2 -- html/cgi-bin/country.cgi | 17 +++++++--- html/cgi-bin/pakfire.cgi | 17 +++++----- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 7 ++--- langs/es/cgi-bin/es.pl | 4 +-- langs/fr/cgi-bin/fr.pl | 6 ++-- langs/it/cgi-bin/it.pl | 7 ++--- langs/nl/cgi-bin/nl.pl | 6 ++-- langs/pl/cgi-bin/pl.pl | 6 ++-- langs/ru/cgi-bin/ru.pl | 6 ++-- langs/tr/cgi-bin/tr.pl | 6 ++-- lfs/dhcpcd | 7 +++-- lfs/htop | 6 ++-- ...86_for_SECCOMP_as_it_just_uses_socketcall.patch | 36 ++++++++++++++++++++= ++ 24 files changed, 96 insertions(+), 62 deletions(-) create mode 100644 src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_ju= st_uses_socketcall.patch Difference in files: diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/cor= e/154/filelists/files index 924a7777c..eea472eaf 100644 --- a/config/rootfiles/core/154/filelists/files +++ b/config/rootfiles/core/154/filelists/files @@ -1,8 +1,10 @@ etc/system-release etc/issue etc/os-release +srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/services.cgi usr/local/bin/sshctrl diff --git a/doc/language_issues.de b/doc/language_issues.de index 6d22fcea4..dfb9e202b 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -39,7 +39,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -116,7 +115,6 @@ WARNING: translation string unused: and WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup config floppy WARNING: translation string unused: backup configuration diff --git a/doc/language_issues.en b/doc/language_issues.en index 3955d3ae7..a5c881941 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -95,6 +95,7 @@ WARNING: untranslated string: abort =3D abort WARNING: untranslated string: acpitemp =3D ACPI - Temperatures WARNING: untranslated string: action =3D Action WARNING: untranslated string: activate =3D Activate +WARNING: untranslated string: active =3D Active WARNING: untranslated string: add =3D Add WARNING: untranslated string: add a host =3D Add a host WARNING: untranslated string: add device =3D Add device @@ -332,6 +333,7 @@ WARNING: untranslated string: august =3D August WARNING: untranslated string: authentication =3D Authentication: WARNING: untranslated string: automatic =3D Automatic WARNING: untranslated string: autonomous system =3D Autonomous System +WARNING: untranslated string: available updates =3D Available updates WARNING: untranslated string: average =3D Average WARNING: untranslated string: back =3D Back WARNING: untranslated string: backup =3D Backup @@ -1420,7 +1422,7 @@ WARNING: untranslated string: pakfire ago =3D ago. WARNING: untranslated string: pakfire available addons =3D Available Addons: WARNING: untranslated string: pakfire configuration =3D Pakfire Configuration WARNING: untranslated string: pakfire core update level =3D Core-Update-Level -WARNING: untranslated string: pakfire install description =3D Please choose = one or more items from the list below and
click the plus to install. +WARNING: untranslated string: pakfire install description =3D Please choose = one or more items from the list below and click the plus to install. WARNING: untranslated string: pakfire install package =3D You want to instal= l the following packages:=20 WARNING: untranslated string: pakfire installed addons =3D Installed Addons: WARNING: untranslated string: pakfire invalid tree =3D Invalid repository se= lected @@ -1435,7 +1437,7 @@ WARNING: untranslated string: pakfire tree stable =3D S= table WARNING: untranslated string: pakfire tree testing =3D Testing WARNING: untranslated string: pakfire tree unstable =3D Unstable WARNING: untranslated string: pakfire uninstall all =3D Do you want to unins= tall the following packages? -WARNING: untranslated string: pakfire uninstall description =3D Please choos= e one or more items from the list below and
click the minus to uninsta= ll. +WARNING: untranslated string: pakfire uninstall description =3D Please choos= e one or more items from the list below and click the minus to uninstall. WARNING: untranslated string: pakfire uninstall package =3D You want to unin= stall the following packages:=20 WARNING: untranslated string: pakfire working =3D Pakfire is working ... Ple= ase wait until all operations have completed successfully. WARNING: untranslated string: pap or chap =3D PAP or CHAP diff --git a/doc/language_issues.es b/doc/language_issues.es index 2cd36a5a1..bff23f3bc 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -18,7 +18,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -90,7 +89,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 279e1ba37..4e2975903 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -43,7 +43,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -121,7 +120,6 @@ WARNING: translation string unused: and WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/doc/language_issues.it b/doc/language_issues.it index 4ac4754dc..aaa96b118 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -96,7 +95,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive @@ -591,7 +589,6 @@ WARNING: translation string unused: pakfire core update a= uto WARNING: translation string unused: pakfire health check WARNING: translation string unused: pakfire register WARNING: translation string unused: pakfire update daily -WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters = in length diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9a767322e..4ab686806 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -95,7 +94,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2cd36a5a1..bff23f3bc 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -18,7 +18,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -90,7 +89,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a333d9939..0317eba8c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -19,7 +19,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -91,7 +90,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a080ee54f..554565f20 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -40,7 +40,6 @@ WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user -WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -118,7 +117,6 @@ WARNING: translation string unused: ansi t1.483 WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps -WARNING: translation string unused: available updates WARNING: translation string unused: avoid dod WARNING: translation string unused: backup archive WARNING: translation string unused: backup clear archive diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index b1c72bb22..6519aa26c 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -53,7 +53,7 @@ print<"; &Header::closebox(); =20 -&Header::closebigbox(); +print < + + +<-> + +
3D'$Lang::tr{'back'}'
+ +END +; =20 -print "\n"; +&Header::closebigbox(); =20 &Header::closepage(); - - diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 39389ad02..dd96a92e9 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -183,7 +183,7 @@ if ($return) { print < - 3D'$Lang::tr{'aktiv'}'  + 3D'$Lang::tr{'active'}'  $Lang::tr{'pakfire working'} @@ -217,7 +217,7 @@ my $packages_update_age =3D &General::age("/opt/pakfire/d= b/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire"); =20 print < + END if ( -e "/var/run/need_reboot") { print ""; @@ -225,18 +225,21 @@ if ( -e "/var/run/need_reboot") { } print < +
$Lang::tr= {'needreboot'}!
$L= ang::tr{'pakfire system state'}: - + + $Lang= ::tr{'available updates'}:
$Lang::tr{'pakfire core update level'}: $core_rel= ease
$Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ag= o'}
$Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::t= r{'pakfire ago'}
$Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::= tr{'pakfire ago'}
$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr= {'pakfire ago'}
- +

+
 -
+
 
$Lang::tr{'pakfi= re available addons'} $Lang::tr{'pakfire= installed addons'} -
+

$Lang::tr{'pakfire install description'}

 +

$Lang::tr{'pakfire uninstall description'}