[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73a92c604cf27df8b31c3ae15f0d6981e88b504d
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 michael.tremer@ipfire.org Date: Thu Dec 24 12:01:12 2020 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 642316370f9cfa65175ae1cbed462a3b6c59622c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 24 12:00:39 2020 +0000
core154: Ship pakfire.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6666b93d11b3add035baaf5a41a1ef16f4da9e19 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Dec 24 01:09:04 2020 +0100
Update (and cosmetic fixes) for 'pakfire.cgi': Added GUI entry for existing, but unused translation string
While preparing the Core153 update, I found by chance that a language string had been added from Core152 to Core153 which I couldn't find in any CGI-file.
The translation suggested that this string ('Available Updates') could belong to 'pakfire.cgi'.
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 before.
So tried to add these missing heading. I hope I made it right...
Some cosmetic fixes: I also added some space around the text for 'Available Addons' and 'Installed Addons' because the text lines weren't separated. There is no seen wordwrapping. This required deleting some unwanted '<br />' in the affected translation strings.
I tried this about 4 years ago, but somehow this patch got lost.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0b1d45849f9df9ac145359a02cd383c7baff6c5b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 24 11:59:46 2020 +0000
core154: Ship country.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f65629dd479a2846e9e4b1af910bf879d133e186 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Dec 24 11:56:13 2020 +0100
country.cgi: Cosmetic fix for 'Back'-button'
While testing Peter's patch for Bug #12560 I noticed that the standard 'back'-button at the end of the page - like in 'ipinfo.cgi' - was implemented as a text string.
I just took the code segment with the 'back'-*image* from 'ipinfo.cgi' to make this link looking similar to the other pages.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4ed49291c2eb23e7043721ed55f07c0135440dcb Author: Peter Müller peter.mueller@ipfire.org Date: Thu Dec 24 09:19:15 2020 +0100
country.cgi: fix location function call
Fixes: #12560
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d96d979e2a0bb199b5ae7bec75964f4091996268 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Dec 24 00:06:55 2020 +0100
dhcpcd: Update to 9.3.4
For details see: https://roy.marples.name/archives/dhcpcd-discuss/0003334.html
This version contains the official fix from here: https://roy.marples.name/cgit/dhcpcd.git/commit/?id=12cdb2be46e25e1ab99df183...
This should fix Bug #12552 (dhcpcd-9.3.4 crash with bad system call) on 32bit/i686 systems.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 631b7056acfd21f03b21f446eb6b26e5bd86f699 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Dec 24 01:15:19 2020 +0100
htop: Update to 3.0.4
For details see: https://github.com/htop-dev/htop/blob/master/ChangeLog
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
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_just_uses_socketcall.patch
Difference in files: diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/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 = abort WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: action = Action WARNING: untranslated string: activate = Activate +WARNING: untranslated string: active = Active WARNING: untranslated string: add = Add WARNING: untranslated string: add a host = Add a host WARNING: untranslated string: add device = Add device @@ -332,6 +333,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 updates = Available updates WARNING: untranslated string: average = Average WARNING: untranslated string: back = Back WARNING: untranslated string: backup = Backup @@ -1420,7 +1422,7 @@ WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire available addons = Available Addons: WARNING: untranslated string: pakfire configuration = Pakfire Configuration WARNING: untranslated string: pakfire core update level = Core-Update-Level -WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and <br /> click the plus to install. +WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and click the plus to install. WARNING: untranslated string: pakfire install package = You want to install the following packages: WARNING: untranslated string: pakfire installed addons = Installed Addons: WARNING: untranslated string: pakfire invalid tree = Invalid repository selected @@ -1435,7 +1437,7 @@ WARNING: untranslated string: pakfire tree stable = Stable WARNING: untranslated string: pakfire tree testing = Testing WARNING: untranslated string: pakfire tree unstable = Unstable WARNING: untranslated string: pakfire uninstall all = Do you want to uninstall the following packages? -WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and <br /> click the minus to uninstall. +WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and click the minus to uninstall. WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages: WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully. WARNING: untranslated string: pap or chap = 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 auto 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<<END; END
# Get a list of all supported country codes. -my @countries = &Location::database_countries(); +my @countries = &Location::Functions::get_locations();
# Loop through whole country list. foreach my $country (@countries) { @@ -96,10 +96,17 @@ foreach my $country (@countries) { print "</table>"; &Header::closebox();
-&Header::closebigbox(); +print <<END +<div align='center'> +<table width='80%'> +<tr> +<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> +</tr> +</table> +</div> +END +;
-print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n"; +&Header::closebigbox();
&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 <<END; <table> <tr><td> - <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' title='$Lang::tr{'aktiv'}' /> + <img src='/images/indicator.gif' alt='$Lang::tr{'active'}' title='$Lang::tr{'active'}' /> <td> $Lang::tr{'pakfire working'} <tr><td colspan='2' align='center'> @@ -217,7 +217,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire");
print <<END; - <table width='95%' cellpadding='5' > + <table width='95%' cellpadding='5'> END if ( -e "/var/run/need_reboot") { print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>"; @@ -225,18 +225,21 @@ if ( -e "/var/run/need_reboot") { } print <<END; <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b> - <td width="50%"> + + <td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'available updates'}:</b></tr> + <tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr /> $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br /> $Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'} <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='hidden' name='ACTION' value='update' /> + <input type='hidden' name='ACTION' value='update' /><br /> <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br /> </form> +<br /> <td align="center"> - <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="UPDPAKS" size="5" disabled> END &Pakfire::dblist("upgrade", "forweb"); @@ -250,7 +253,7 @@ END <tr><td colspan="2"><!-- Just an empty line --> <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b> <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b> - <tr><td align="center"> + <tr><td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire install description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="INSPAKS" size="10" multiple> @@ -264,7 +267,7 @@ print <<END; <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' /> </form>
- <td align="center"> + <td style="padding:5px 10px 20px 20px" align="center"> <p>$Lang::tr{'pakfire uninstall description'}</p> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <select name="DELPAKS" size="10" multiple> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b72e4d245..87181c184 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -453,7 +453,7 @@ 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', 'autonomous system' => 'Autonomes System', -'available updates' => 'Verfügbare Updates:', +'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.', 'back' => 'ZURÜCK', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 500913240..625c6899f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -452,7 +452,7 @@ 'authentication' => 'Authentication:', 'automatic' => 'Automatic', 'autonomous system' => 'Autonomous System', -'available updates' => 'Available updates:', +'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', 'back' => 'Back', @@ -2002,7 +2002,7 @@ 'pakfire core update auto' => 'Install core and addon updates automatically:', 'pakfire core update level' => 'Core-Update-Level', 'pakfire health check' => 'Check if mirror is reachable (ping):', -'pakfire install description' => 'Please choose one or more items from the list below and <br /> click the plus to install.', +'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Installed Addons:', 'pakfire invalid tree' => 'Invalid repository selected', @@ -2018,10 +2018,9 @@ 'pakfire tree testing' => 'Testing', 'pakfire tree unstable' => 'Unstable', 'pakfire uninstall all' => 'Do you want to uninstall the following packages?', -'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.', +'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Search for updates daily:', -'pakfire updates' => 'Available Update:', 'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.', 'pap or chap' => 'PAP or CHAP', 'parentclass' => 'Parentclass', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 93a15bba0..9a39ffd16 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1363,7 +1363,7 @@ 'pakfire core update auto' => 'Instalar actualizaciones de Core y de addons automáticamente', 'pakfire core update level' => 'Nivel de actualización del Core', 'pakfire health check' => 'Verificar disponibilidad del mirror (ping):', -'pakfire install description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo + para instalar', +'pakfire install description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo + para instalar', 'pakfire install package' => 'Ud. desea instalar los siguientes paquetes:', 'pakfire installed addons' => 'Addons instalados:', 'pakfire last core list update' => 'Última lista de actualización de core hecha', @@ -1374,7 +1374,7 @@ 'pakfire register' => 'Registrar en el servidor pakfire:', 'pakfire system state' => 'Status del sistema', 'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?', -'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo - para desinstalar', +'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo - para desinstalar', 'pakfire uninstall package' => 'Ud. desea desinstalar los siguientes paquetes:', 'pakfire update daily' => 'Buscar actualizaciones diariamente:', 'pakfire updates' => 'Actualización disponible:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a2d27939c..66af01367 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -456,7 +456,7 @@ 'august' => 'Août', 'authentication' => 'Authentification :', 'automatic' => 'Automatique', -'available updates' => 'Mises à jour disponibles :', +'available updates' => 'Mises à jour disponibles', 'average' => 'Moyenne', 'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande ! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l'un des trois numéros de réseau réservés, par exemple 10 / 8, 172.16/12, 192.168/16', 'back' => 'Retour', @@ -2002,7 +2002,7 @@ 'pakfire core update auto' => 'Installer automatiquement les mises à jour du noyau et des modules :', 'pakfire core update level' => 'Version de mise à jour du noyau ', 'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :', -'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe PLUS pour le(s) installer.', +'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous et cliquer sur le signe PLUS pour le(s) installer.', 'pakfire install package' => 'Vous souhaitez installer le(s) module(s) suivant(s) : ', 'pakfire installed addons' => 'Modules installés :', 'pakfire invalid tree' => 'Dépôt choisi invalide', @@ -2018,7 +2018,7 @@ 'pakfire tree testing' => 'En test', 'pakfire tree unstable' => 'Instable', 'pakfire uninstall all' => 'Voulez-vous désinstaller ce(s) paquet(s) ?', -'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.', +'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous et cliquer sur le signe MOINS pour le(s) désinstaller.', 'pakfire uninstall package' => 'Vous souhaitez désinstaller le(s) module(s) suivant(s) : ', 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :', 'pakfire updates' => 'Mise à jour disponible :', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 14436de4b..28c7b79ad 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -374,7 +374,7 @@ 'august' => 'Agosto', 'authentication' => 'Authentication:', 'automatic' => 'Automatic', -'available updates' => 'Available updates:', +'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', 'back' => 'BACK', @@ -1752,7 +1752,7 @@ 'pakfire core update auto' => 'Install core and addon updates automatically:', 'pakfire core update level' => 'Core-Update-Level', 'pakfire health check' => 'Controllare se il mirror è raggiungibile (ping):', -'pakfire install description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fai clic sul segno più per installare.', +'pakfire install description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fai clic sul segno più per installare.', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Addons installati:', 'pakfire last core list update' => 'Ultimo aggiornamento della lista di sistema', @@ -1763,10 +1763,9 @@ 'pakfire register' => 'Registrati sul pakfire-server:', 'pakfire system state' => 'Stato del Sistema', 'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?', -'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fare clic sul meno per disinstallare..', +'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fare clic sul meno per disinstallare..', 'pakfire uninstall package' => 'You want to uninstall the following packages: ', 'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:', -'pakfire updates' => 'Available Update:', 'pakfire working' => 'Pakfire sta lavorando... Per favore attendi il termine delle operazioni', 'pap or chap' => 'PAP or CHAP', 'parentclass' => 'Parentclass', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 191a16927..4ada179c1 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -372,7 +372,7 @@ 'august' => 'Augustus', 'authentication' => 'Authenticatie:', 'automatic' => 'Automatisch', -'available updates' => 'Beschikbare updates:', +'available updates' => 'Beschikbare updates', 'average' => 'Gemiddeld', 'avoid dod' => 'Gebruik deze optie niet met inbellen op afroep! Wordt voornamelijk gebruikt als IPFire achter een router staat. Uw RODE IP moet dan binnen het bereik vallen van een van de drie gereserveerde netwerken, bijv. 10/8, 172.16/12, 192.168/16', 'back' => 'TERUG', @@ -1708,7 +1708,7 @@ 'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:', 'pakfire core update level' => 'Core-updateniveau', 'pakfire health check' => 'Controleer of de mirror bereikbaar is (ping):', -'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de plus om te installeren.', +'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en klik op de plus om te installeren.', 'pakfire install package' => 'U wilt de volgende pakketten installeren: ', 'pakfire installed addons' => 'Geïnstalleerde extensies:', 'pakfire last core list update' => 'Laatste core-lijst update gemaakt', @@ -1719,7 +1719,7 @@ 'pakfire register' => 'Registreer bij de pakfire-server:', 'pakfire system state' => 'Systeemstatus', 'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?', -'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de min om te deinstalleren.', +'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en klik op de min om te deinstalleren.', 'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ', 'pakfire update daily' => 'Zoek dagelijks naar updates:', 'pakfire updates' => 'Beschikbare update:', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 63c8a1793..59ca85cb9 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -354,7 +354,7 @@ 'august' => 'Sierpień', 'authentication' => 'Uwierzytelnianie:', 'automatic' => 'Automatycznie', -'available updates' => 'Dostępne aktualizacje:', +'available updates' => 'Dostępne aktualizacje', 'average' => 'Srednia', 'avoid dod' => 'Nie używaj tej opcji jeżeli wykorzystujesz wdzanianie na żądanie! Zazwyczaj wykorzystywane jeżeli IPFire jest za routerem. Interfejs RED musi być w jednej z 3 sieci np. 10/8, 172.16/12, 192.168/16', 'back' => 'WRÓĆ', @@ -1375,7 +1375,7 @@ 'pakfire core update auto' => 'Instaluj aktualizacje jądra automatycznie:', 'pakfire core update level' => 'Aktualizacja jądra', 'pakfire health check' => 'Sprawdź czy mirror jest dostępny (ping):', -'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć plus aby zainstalować.', +'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć plus aby zainstalować.', 'pakfire install package' => 'Zamierzasz zainstalować następujące pakiety: ', 'pakfire installed addons' => 'Zainstalowane dodatki:', 'pakfire last core list update' => 'Sprawdzenie aktualizacja jądra:', @@ -1386,7 +1386,7 @@ 'pakfire register' => 'Register at pakfire-server:', 'pakfire system state' => 'Status systemu', 'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?', -'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć minus aby odinstalować.', +'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć minus aby odinstalować.', 'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ', 'pakfire update daily' => 'Szukaj aktualizacje codziennie:', 'pakfire updates' => 'Dostępne aktualizacje:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 4f69dc47a..abcebab28 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -352,7 +352,7 @@ 'august' => 'Август', 'authentication' => 'Аутентификация:', 'automatic' => 'Автоматически', -'available updates' => 'Доступные обновления:', +'available updates' => 'Доступные обновления', 'average' => 'Average', 'avoid dod' => 'Не используйте эту опцию с дозвоном по требованию! Обычно используется, когда IPFire находится за роутером. Ваш RED IP должен находиться в одной из трёх зарезервированных сетей то есть 10/8, 172.16/12, 192.168/16', 'back' => 'НАЗАД', @@ -1370,7 +1370,7 @@ 'pakfire core update auto' => 'Устанавливать обновления ядра и аддонов автоматически:', 'pakfire core update level' => 'Уровень обновления системы', 'pakfire health check' => 'Пинговать зеркало на доступность:', -'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите плюсик для установки.', +'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите плюсик для установки.', 'pakfire install package' => 'Вы собираетесь установить следующие пакеты: ', 'pakfire installed addons' => 'Установленные Аддоны:', 'pakfire last core list update' => 'Обновление core-списков', @@ -1381,7 +1381,7 @@ 'pakfire register' => 'Регистрировать на pakfire-сервере:', 'pakfire system state' => 'Статус системы', 'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?', -'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите минус для удаления.', +'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите минус для удаления.', 'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ', 'pakfire update daily' => 'Ежедневный поиск обновлений:', 'pakfire updates' => 'Доступное обновление:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 34e8bdcf7..81d9509b7 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -438,7 +438,7 @@ 'august' => 'Ağustos', 'authentication' => 'Kimlik doğrulama:', 'automatic' => 'Otomatik', -'available updates' => 'Mevcut güncellemeler:', +'available updates' => 'Mevcut güncellemeler', 'average' => 'Ortalama', 'avoid dod' => 'Bu seçeneği çevirmeli ağ ile isteğe göre kullanmayın. Genellikle bu, IPFire sisteminiz bir yönlendirici arkasındaysa kullanılır. KIRMIZI IP adresiniz üç bölüme ayrılmış ağ numaralarından oluşmalıdır. Örneğin: 10/8, 172.16/12, 192.168/16', 'back' => 'GERİ', @@ -1897,7 +1897,7 @@ 'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:', 'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi', 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):', -'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />eklemek için artı simgesine tıklayınız.', +'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra eklemek için artı simgesine tıklayınız.', 'pakfire install package' => 'Aşağıdaki paketleri yüklemek istediniz: ', 'pakfire installed addons' => 'Kurulu eklentiler:', 'pakfire last core list update' => 'Son çekirdek listesi güncellemesi', @@ -1908,7 +1908,7 @@ 'pakfire register' => 'Pakfire sunucusuna kayıt:', 'pakfire system state' => 'Sistem durumu', 'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?', -'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.', +'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra kaldırmak için eksi simgesine tıklayınız.', 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ', 'pakfire update daily' => 'Günlük güncellemeleri ara:', 'pakfire updates' => 'Mevcut Güncelleme:', diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 3bd33dc56..4e34e19d5 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@
include Config
-VER = 9.1.4 +VER = 9.3.4
THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dd77711cf3232002bb075f5210269f88 +$(DL_FILE)_MD5 = badb02dfc69fe9bbeec35a02efcdb4db
install : $(TARGET)
@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch + cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \ --dbdir=/var/ipfire/dhcpc \ --libexecdir=/var/ipfire/dhcpc \ diff --git a/lfs/htop b/lfs/htop index c081d6dc9..12622beec 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@
include Config
-VER = 3.0.3 +VER = 3.0.4
THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 14 +PAK_VER = 15
DEPS =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b51b9b42b92c1f71656244ba3164da50 +$(DL_FILE)_MD5 = d2ed5c2c060399319675874c44942838
install : $(TARGET)
diff --git a/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch new file mode 100644 index 000000000..9efcde219 --- /dev/null +++ b/src/patches/dhcpcd/01_Fix_Linux_i386_for_SECCOMP_as_it_just_uses_socketcall.patch @@ -0,0 +1,36 @@ +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 050a30cf..d31d720d 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -32,6 +32,7 @@ + + #include <linux/audit.h> + #include <linux/filter.h> ++#include <linux/net.h> + #include <linux/seccomp.h> + #include <linux/sockios.h> + +@@ -304,6 +305,23 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_sendto + SECCOMP_ALLOW(__NR_sendto), + #endif ++#ifdef __NR_socketcall ++ /* i386 needs this and demonstrates why SECCOMP ++ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) ++ * as this is soooo tied to the kernel API which changes per arch ++ * and likely libc as well. */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), ++ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), ++#endif + #ifdef __NR_shutdown + SECCOMP_ALLOW(__NR_shutdown), + #endif
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer