IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7859 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5c62e4739107a7bb167c31c0f353f1ff8a150f2d
by Michael Tremer 03 Jan '19

03 Jan '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 5c62e4739107a7bb167c31c0f353f1ff8a150f2d (commit) from 26707c0aeb54d8ab47c5e684ef99367e73834e19 (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 5c62e4739107a7bb167c31c0f353f1ff8a150f2d Author: Peter Müller <peter.mueller(a)link38.eu> Date: Thu Jan 3 18:05:40 2019 +0100 prevent kernel address space leak via dmesg or /proc files Enable runtime sysctl hardening in order to avoid kernel addresses being disclosed via dmesg (in case it was built in without restrictions) or various /proc files. See https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommend… for further information. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: setup/setup.nm | 4 +++- setup/sysctl/kernel-hardening.conf | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 setup/sysctl/kernel-hardening.conf Difference in files: diff --git a/setup/setup.nm b/setup/setup.nm index 78d1a5df3..e79fff10d 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 10 +release = 11 arch = noarch groups = Base Build System/Base @@ -53,6 +53,8 @@ build %{BUILDROOT}%{sysconfdir}/sysctl.d/printk.conf install -m 644 %{DIR_APP}/sysctl/swappiness.conf \ %{BUILDROOT}%{sysconfdir}/sysctl.d/swappiness.conf + install -m 644 %{DIR_APP}/sysctl/kernel-hardening.conf \ + %{BUILDROOT}%{sysconfdir}/sysctl.d/kernel-hardening.conf end end diff --git a/setup/sysctl/kernel-hardening.conf b/setup/sysctl/kernel-hardening.conf new file mode 100644 index 000000000..6751bbef6 --- /dev/null +++ b/setup/sysctl/kernel-hardening.conf @@ -0,0 +1,6 @@ +# Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc). +kernel.kptr_restrict = 1 + +# Avoid kernel memory address exposures via dmesg. +kernel.dmesg_restrict = 1 + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7f90513e611040a99422b951884062e14271adc4
by Michael Tremer 03 Jan '19

03 Jan '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2aff684f37afc08d6fa4520188e460e888cee2d8
by Michael Tremer 03 Jan '19

03 Jan '19

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 2aff684f37afc08d6fa4520188e460e888cee2d8 (commit) via 3407695fbcbe525d7bb860f2f796c6947b201b9c (commit) via cd309fe6a2f4b319272f94bd448fb17fce23b8fd (commit) via 0a12cd70393d3ee6f64e3d81422212eab55468f9 (commit) via 6e1aa54da0e172bf931ef13a3e1c7ad6de9b5a20 (commit) via 34ad12b165639d86f9a9709dc264cbd36c1bd2ca (commit) via e6f7f8e7ba0e716acede7f6cadf9a284d115440b (commit) from 4c83d9fbdcf137c126d0b5ed0935dbe18c9733f3 (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 2aff684f37afc08d6fa4520188e460e888cee2d8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 3 15:12:39 2019 +0000 libvirt: The package no longer depends on jansson Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3407695fbcbe525d7bb860f2f796c6947b201b9c Author: Stéphane Pautrel <stephane.pautrel(a)gmail.com> Date: Thu Jan 3 15:02:53 2019 +0000 Update of French translation This improves the translation and enhances consistency in many places. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cd309fe6a2f4b319272f94bd448fb17fce23b8fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 3 14:58:47 2019 +0000 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0a12cd70393d3ee6f64e3d81422212eab55468f9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Dec 26 14:37:25 2018 +0100 dnsforward.cgi: fix for language string Hi, In https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=1a26564e95b5694337e… the language string 'dnsforward forward_server' => 'DNS-Server', was deleted and replaced by 'dnsforward forward_servers' => 'DNS-Server', IMHO this leads to an empty string in 'dnsforward.cgi', line 223: ... <td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}: <img src='/blob.gif' alt='*' /></td> ... I changed this line... Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6e1aa54da0e172bf931ef13a3e1c7ad6de9b5a20 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 27 01:57:18 2018 +0100 attr 2.4.47: Update for rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 34ad12b165639d86f9a9709dc264cbd36c1bd2ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 3 14:53:34 2019 +0000 core127: Ship updated VPN CGI files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e6f7f8e7ba0e716acede7f6cadf9a284d115440b Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Thu Jan 3 03:57:16 2019 +0100 database_attribute: Deliver/create index.txt.attr Fixes #11904 Since OpenSSL-1.1.0x the database attribute file for IPSec and OpenVPN wasn´t created while initial PKI generation. OpenVPN delivered an error message but IPSec did crashed within the first attempt. This problem persists also after X509 deletion and new generation. index.txt.attr will now be delivered by the system but also deleted and recreated while setting up a new x509. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../includes/lcdproc => ovpn/certs/index.txt.attr} | 0 config/rootfiles/common/attr | 7 +- config/rootfiles/common/configroot | 1 + config/rootfiles/common/openvpn | 1 + config/rootfiles/core/127/filelists/files | 2 + doc/language_issues.de | 1 - doc/language_issues.en | 1 - doc/language_issues.es | 1 - doc/language_issues.fr | 5 +- doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 + doc/language_missings | 3 - html/cgi-bin/dnsforward.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 9 + html/cgi-bin/vpnmain.cgi | 9 + langs/fr/cgi-bin/fr.pl | 242 +++++++++++---------- lfs/configroot | 2 +- lfs/libvirt | 4 +- 21 files changed, 157 insertions(+), 138 deletions(-) copy config/{backup/includes/lcdproc => ovpn/certs/index.txt.attr} (100%) Difference in files: diff --git a/config/ovpn/certs/index.txt.attr b/config/ovpn/certs/index.txt.attr new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index e8c2055fb..edfefa7e1 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -28,15 +28,18 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man1/attr.1 #usr/share/man/man1/getfattr.1 #usr/share/man/man1/setfattr.1 +#usr/share/man/man2/fgetxattr.2 #usr/share/man/man2/flistxattr.2 #usr/share/man/man2/fremovexattr.2 #usr/share/man/man2/fsetxattr.2 #usr/share/man/man2/getxattr.2 -#usr/share/man/man2/setxattr.2 +#usr/share/man/man2/lgetxattr.2 +#usr/share/man/man2/listxattr.2 #usr/share/man/man2/llistxattr.2 #usr/share/man/man2/lremovexattr.2 -#usr/share/man/man2/removexattr.2 #usr/share/man/man2/lsetxattr.2 +#usr/share/man/man2/removexattr.2 +#usr/share/man/man2/setxattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index c72768165..6f5d2fe2f 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -19,6 +19,7 @@ var/ipfire/captive/settings var/ipfire/captive/voucher_out var/ipfire/certs #var/ipfire/certs/index.txt +var/ipfire/certs/index.txt.attr #var/ipfire/certs/serial var/ipfire/connscheduler #var/ipfire/connscheduler/connscheduler.conf diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 131d79873..547842db3 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -25,6 +25,7 @@ var/ipfire/ovpn/caconfig var/ipfire/ovpn/ccd #var/ipfire/ovpn/certs var/ipfire/ovpn/certs/index.txt +var/ipfire/ovpn/certs/index.txt.attr var/ipfire/ovpn/certs/serial var/ipfire/ovpn/crls var/ipfire/ovpn/n2nconf diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index 0e9d80520..e93bece38 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -5,3 +5,5 @@ var/ipfire/langs etc/rc.d/init.d/aws etc/rc.d/init.d/unbound srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index 6b770e5e3..e2048d7d1 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -706,7 +706,6 @@ WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: captive = unknown string WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules WARNING: untranslated string: dead peer detection = Dead Peer Detection -WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 72a56b96d..d0390c66d 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -650,7 +650,6 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware diff --git a/doc/language_issues.es b/doc/language_issues.es index caf8fc497..538115aae 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -755,7 +755,6 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 7b9119764..463a16f7c 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -195,6 +195,7 @@ WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary WARNING: translation string unused: dns server +WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link @@ -507,7 +508,6 @@ WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio -WARNING: translation string unused: ovpn_fragment WARNING: translation string unused: ovpn_mssfix WARNING: translation string unused: ovpn_mtudisc WARNING: translation string unused: ovpn_processprio @@ -784,12 +784,9 @@ WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unk WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: no data = unknown string -WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string WARNING: untranslated string: vpn statistics n2n = unknown string -WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan -WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.it b/doc/language_issues.it index 301c0c28d..6a541735f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -173,6 +173,7 @@ WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary WARNING: translation string unused: dns server +WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link diff --git a/doc/language_issues.nl b/doc/language_issues.nl index bbd78eeeb..daa5d6a96 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -172,6 +172,7 @@ WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary WARNING: translation string unused: dns server +WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link diff --git a/doc/language_issues.pl b/doc/language_issues.pl index caf8fc497..538115aae 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -755,7 +755,6 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d5a2fc336..4a55a54da 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -759,7 +759,6 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b32d216b5..7a9179996 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -195,6 +195,7 @@ WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary WARNING: translation string unused: dns server +WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link diff --git a/doc/language_missings b/doc/language_missings index 188455681..938a9551e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -784,9 +784,6 @@ ############################################################################ < dnsforward forward_servers < invalid ip or hostname -< ovpn warning rfc3280 -< wlanap neighbor scan -< wlanap neighbor scan warning ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index 521a7a20b..0439817b9 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -220,7 +220,7 @@ print <<END </tr> <tr> - <td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}: <img src='/blob.gif' alt='*' /></td> + <td width='20%' class='base'>$Lang::tr{'dnsforward forward_servers'}: <img src='/blob.gif' alt='*' /></td> <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td> </tr> </table> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 976300fc7..4fb234995 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -174,7 +174,12 @@ sub cleanssldatabase print FILE ""; close FILE; } + if (open(FILE, ">${General::swroot}/ovpn/certs/index.txt.attr")) { + print FILE ""; + close FILE; + } unlink ("${General::swroot}/ovpn/certs/index.txt.old"); + unlink ("${General::swroot}/ovpn/certs/index.txt.attr.old"); unlink ("${General::swroot}/ovpn/certs/serial.old"); unlink ("${General::swroot}/ovpn/certs/01.pem"); } @@ -189,7 +194,11 @@ sub newcleanssldatabase if (! -s ">${General::swroot}/ovpn/certs/index.txt") { system ("touch ${General::swroot}/ovpn/certs/index.txt"); } + if (! -s ">${General::swroot}/ovpn/certs/index.txt.attr") { + system ("touch ${General::swroot}/ovpn/certs/index.txt.attr"); + } unlink ("${General::swroot}/ovpn/certs/index.txt.old"); + unlink ("${General::swroot}/ovpn/certs/index.txt.attr.old"); unlink ("${General::swroot}/ovpn/certs/serial.old"); } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 21fd1f4cd..a5d27c8d8 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -149,7 +149,12 @@ sub cleanssldatabase { print FILE ""; close FILE; } + if (open(FILE, ">${General::swroot}/certs/index.txt.attr")) { + print FILE ""; + close FILE; + } unlink ("${General::swroot}/certs/index.txt.old"); + unlink ("${General::swroot}/certs/index.txt.attr.old"); unlink ("${General::swroot}/certs/serial.old"); unlink ("${General::swroot}/certs/01.pem"); } @@ -162,7 +167,11 @@ sub newcleanssldatabase { if (! -s ">${General::swroot}/certs/index.txt") { system ("touch ${General::swroot}/certs/index.txt"); } + if (! -s ">${General::swroot}/certs/index.txt.attr") { + system ("touch ${General::swroot}/certs/index.txt.attr"); + } unlink ("${General::swroot}/certs/index.txt.old"); + unlink ("${General::swroot}/certs/index.txt.attr.old"); unlink ("${General::swroot}/certs/serial.old"); # unlink ("${General::swroot}/certs/01.pem"); numbering evolves. Wrong place to delete } diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 9fa05fef5..b89254b59 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -240,7 +240,7 @@ 'advproxy RADIUS use negative access list' => 'Utilisation négative de contrôle d\'accès', 'advproxy RADIUS use positive access list' => 'Utilisation positive de contrôle d\'accès', 'advproxy RADIUS user based access restrictions' => 'Utilisateur en fonction des restrictions d\'accès', -'advproxy UA enable filter' => 'Activer la vérification du navigateur', +'advproxy UA enable filter' => 'Activer la vérification du navigateur ', 'advproxy access' => 'Accès', 'advproxy admin mail' => 'Email administrateur du cache ', 'advproxy advanced proxy' => 'Proxy avancé', @@ -249,8 +249,8 @@ 'advproxy allowed subnets' => 'Sous-réseaux autorisés (un par ligne) ', 'advproxy allowed web browsers' => 'Clients autorisés pour l\'accès web', 'advproxy back to main page' => 'Retour à l\'accueil', -'advproxy banned ip clients' => 'Adresses IP interdites (une par ligne)', -'advproxy banned mac clients' => 'Adresses MAC interdites (une par ligne)', +'advproxy banned ip clients' => 'Adresses IP interdites (une par ligne) ', +'advproxy banned mac clients' => 'Adresses MAC interdites (une par ligne) ', 'advproxy basic authentication' => 'Autoriser l\'authentification HTTP basique', 'advproxy cache management' => 'Gestion du cache', 'advproxy cache replacement policy' => 'Politique du cache de remplacement ', @@ -267,7 +267,7 @@ 'advproxy clear cache' => 'Effacer le cache', 'advproxy client IP forwarding' => 'Adresse ip du client \'transféré\' ', 'advproxy common settings' => 'Paramètres communs', -'advproxy content based throttling' => 'Activer le contenu en fonction de la capacité', +'advproxy content based throttling' => 'Activer le contenu en fonction de la capacité ', 'advproxy cre disabled' => 'L\'interface de gestion a été désactivée par l\'administrateur', 'advproxy cre group definitions' => 'Groupe de définitions de classe', 'advproxy cre supervisors' => 'Superviseur des adresses IP (une par ligne)', @@ -316,10 +316,10 @@ 'advproxy errmsg radius secret' => 'Pass-phrase RADIUS requise', 'advproxy errmsg radius server' => 'Adresse IP du serveur RADIUS non valide', 'advproxy errmsg time restriction' => 'Restriction horaire non valide', -'advproxy error design' => 'Construction des messages erronées', -'advproxy error language' => 'Langage des messages erronés', -'advproxy fake referer' => 'Fausses références soumises aux sites externes', -'advproxy fake useragent' => 'Faux useragent soumis aux sites externes', +'advproxy error design' => 'Construction des messages erronées ', +'advproxy error language' => 'Langage des messages erronés ', +'advproxy fake referer' => 'Fausses références soumises aux sites externes ', +'advproxy fake useragent' => 'Faux useragent soumis aux sites externes ', 'advproxy friday' => 'Ven', 'advproxy from' => 'De', 'advproxy group access control' => 'Contrôle d\'accès basé sur le groupe', @@ -330,9 +330,9 @@ 'advproxy log query' => 'Termes de recherche en rapports ', 'advproxy log settings' => 'Configuration des rapports', 'advproxy log useragent' => 'Rapport des robots (de recherche) ', -'advproxy max download size' => 'Volume de téléchargement maximal (Ko)', +'advproxy max download size' => 'Volume de téléchargement maximal (Ko) ', 'advproxy max size' => 'Volume d\'objet maximal (Ko) ', -'advproxy max upload size' => 'Volume d\'envoi maximal (Ko)', +'advproxy max upload size' => 'Volume d\'envoi maximal (Ko) ', 'advproxy memory replacement policy' => 'Politique de remplacement de mémoire ', 'advproxy min size' => 'Volume d\'objet minimal (Ko) ', 'advproxy mode allow' => 'autoriser', @@ -350,14 +350,14 @@ 'advproxy offline mode' => 'Autoriser le mode hors connexion ', 'advproxy on' => 'Proxy allumé', 'advproxy privacy' => 'Privé', -'advproxy proxy port' => 'Port proxy', -'advproxy proxy port transparent' => 'Port transparent', +'advproxy proxy port' => 'Port proxy ', +'advproxy proxy port transparent' => 'Port transparent ', 'advproxy ram cache size' => 'Taille cache mémoire (Mo) ', 'advproxy redirector children' => 'Nombre de processus de filtre', 'advproxy reset' => 'Relancer', 'advproxy saturday' => 'Sam', 'advproxy save and restart' => 'Sauvegarder et redémarrer', -'advproxy squid version' => 'Version Squid Cache', +'advproxy squid version' => 'Version Squid Cache ', 'advproxy squidclamav' => 'SquidClamav', 'advproxy ssadvanced proxy' => 'Proxy avancé', 'advproxy ssl ports' => 'Ports SSL autorisés (un par ligne) ', @@ -365,10 +365,10 @@ 'advproxy standard ports' => 'Ports standards autorisés (un par ligne) ', 'advproxy sunday' => 'Dim', 'advproxy supervisor password' => 'Mot de passe superviseur', -'advproxy suppress version' => 'Informations sur la version supprimée', -'advproxy throttle binary' => 'Fichiers binaires', -'advproxy throttle dskimg' => 'Images CD', -'advproxy throttle mmedia' => 'Multimédia', +'advproxy suppress version' => 'Informations sur la version supprimée ', +'advproxy throttle binary' => 'Fichiers binaires ', +'advproxy throttle dskimg' => 'Images CD ', +'advproxy throttle mmedia' => 'Multimédia ', 'advproxy throttling per host on' => 'Limite par hôte', 'advproxy throttling total on' => 'Limite globale', 'advproxy throttling unlimited' => 'illimité', @@ -379,8 +379,8 @@ 'advproxy transparent on' => 'Transparent sur', 'advproxy tuesday' => 'Mar', 'advproxy unknown' => 'Inconnu', -'advproxy unrestricted ip clients' => 'Adresses IP sans restriction (une par ligne)', -'advproxy unrestricted mac clients' => 'Adresses MAC sans restriction (une par ligne)', +'advproxy unrestricted ip clients' => 'Adresses IP sans restriction (une par ligne) ', +'advproxy unrestricted mac clients' => 'Adresses MAC sans restriction (une par ligne) ', 'advproxy update accelerator' => 'Mise à jour accélérateur', 'advproxy update information' => 'Une mise à jour est disponible pour le téléchargement. Visitez <a href="http://www.advproxy.net" target="_blank"> http://www.advproxy.net </ a> pour plus d\'informations.', 'advproxy update notification' => 'Alerte de mise à jour !', @@ -391,7 +391,7 @@ 'advproxy url filter' => 'Filtre URL', 'advproxy username forwarding' => 'Nom d\'utilisateur transféré ', 'advproxy via forwarding' => 'Adresse proxy transférée ', -'advproxy visible hostname' => 'Nom d\'hôte visible', +'advproxy visible hostname' => 'Nom d\'hôte visible ', 'advproxy web browser' => 'Navigateur web', 'advproxy wednesday' => 'Mer', 'again' => 'De nouveau :', @@ -404,7 +404,7 @@ 'album' => 'Album', 'alcatelusb help' => 'Pour utiliser les modems Speedtouch 330 ou Speedtouch USB, vous devez charger le firmware dans votre PC IPFire. Veuillez télécharger le Firmware Embarqué paquet pour SpeedTouch 330 depuis speedtouch.com; dézippez le et chargez le fichier approprié à votre modem : KQD6_3.xxx quand Rev<4 ou ZZZL_3.xxx pour Rev=4 en utilisant le formulaire ci-dessous.', 'alcatelusb upload' => 'Charger le firmware Speedtouch USB', -'alias ip' => 'Alias IP', +'alias ip' => 'Alias IP ', 'aliases' => 'Alias', 'aliases not active' => 'Les alias ne seront pas actifs tant que votre interface ROUGE est en mode STATIQUE', 'all' => 'Tous', @@ -511,7 +511,7 @@ 'cached memory' => 'Mémoire tampon ', 'cached swap' => 'Swap tampon', 'calamaris available reports' => 'Rapports disponibles ', -'calamaris byte unit' => 'Echelle de bits ', +'calamaris byte unit' => 'Unité (octets) ', 'calamaris create report' => 'Créer un rapport', 'calamaris enable content report' => 'Autoriser le contenu du rapport ', 'calamaris enable distribution histogram' => 'Autoriser l\'histogramme de distribution ', @@ -618,8 +618,8 @@ 'clear cache' => 'Vider le cache', 'clear playlist' => 'Liste de lecture vide', 'clenabled' => 'Fournir du temps au réseau local', -'click to disable' => 'Activé (cliquer pour désactiver)', -'click to enable' => 'Désactivé (cliquer pour activer)', +'click to disable' => 'Activé (cocher pour désactiver)', +'click to enable' => 'Désactivé (cocher pour activer)', 'client' => 'Nom de la station (ordinateur)', 'clock has not been synchronized' => 'L\'horloge n\'est pas synchronisée', 'clock last synchronized at' => 'L\'horloge a été synchronisée à :', @@ -789,10 +789,10 @@ 'dhcp fixed lease help1' => 'L\'adresse IP doit être saisie comme FQDN', 'dhcp mode' => 'DHCP', 'dhcp server' => 'Serveur DHCP', -'dhcp server disabled' => 'Serveur DHCP éteint. Arrêté.', -'dhcp server disabled on blue interface' => 'Serveur DHCP arrêté sur l\'interface BLEUE', -'dhcp server enabled' => 'Serveur DHCP démarré. Redémarrage.', -'dhcp server enabled on blue interface' => 'Serveur DHCP démarré sur l\'interface BLEUE', +'dhcp server disabled' => 'Serveur DHCP eteint. Arrete.', +'dhcp server disabled on blue interface' => 'Serveur DHCP arrete sur l\'interface BLEUE', +'dhcp server enabled' => 'Serveur DHCP demarre. Redemarrage.', +'dhcp server enabled on blue interface' => 'Serveur DHCP demarre sur l\'interface BLEUE', 'dhcp-options' => 'Options Push DHCP', 'dial' => 'Connexion', 'dial profile' => 'Contact avec le profil', @@ -826,11 +826,11 @@ 'dns address done' => 'Les adresses du serveur DNS vont être sauvegardées.', 'dns address recon' => 'Tentative de reconnexion !', 'dns check failed' => 'La vérification DNS a échouée', -'dns desc' => 'Si l\'interface ROUGE0 obtient ses informations d\'adresse IP via le DHCP du fournisseur d\'accès, les adresses du serveur DNS seront définies automatiquement. Maintenant, vous pouvez également changer les adresses IP du serveur DNS par celles de votre choix.', +'dns desc' => 'Si l\'interface ROUGE0 obtient ses informations d\'adresse IP via le DHCP du fournisseur d\'accès, les adresses du serveur DNS seront définies automatiquement. Sinon, vous pouvez également remplacer les adresses IP du serveur DNS par celles de votre choix.', 'dns error 0' => 'L\'adresse IP du premier serveur DNS n\'est pas valide, veuillez revoir votre saisie La saisie de l\'adresse du second serveur DNS est valide.', 'dns error 01' => 'Les adresses IP du premier et du second serveur DNS ne sont pas valides, veuillez revoir vos saisies', 'dns error 1' => 'L\'adresse IP du second serveur DNS n\'est pas valide, veuillez revoir votre saisie La saisie de l\'adresse du premier serveur DNS est valide.', -'dns header' => 'Assigner les adresses du serveur DNS seulemement pour le DHCP sur ROUGE0', +'dns header' => 'Assigner les adresses du serveur DNS seulement pour le DHCP sur ROUGE0', 'dns list' => 'Liste de serveurs DNS publiques gratuits', 'dns menu' => 'Assigner un serveur DNS', 'dns new 0' => 'Nouvelle adresse IP du premier serveur DNS :', @@ -846,8 +846,8 @@ 'dnsforward configuration' => 'Configuration de transfert DNS', 'dnsforward edit an entry' => 'Modifier une entrée existante', 'dnsforward entries' => 'Entrées actuelles', -'dnsforward forward_server' => 'Nom du serveur', -'dnsforward zone' => 'Zone', +'dnsforward forward_server' => 'Nom du serveur ', +'dnsforward zone' => 'Zone ', 'dnssec aware' => 'DNSSEC Aware', 'dnssec disabled warning' => 'AVERTISSEMENT : DNSSEC a été désactivé', 'dnssec information' => 'Informations DNSSEC', @@ -870,14 +870,14 @@ 'dos charset' => 'DOS Charset', 'down and up speed' => 'Entrez votre débit descendant et montant et cliquez sur Sauvegarder.', 'downlink' => 'Downlink', -'downlink speed' => 'Débit descendant - download (kbit/sec)', +'downlink speed' => 'Débit descendant - download (kbit/sec) ', 'downlink std class' => 'Classe standard de téléchargement ', 'download' => 'Téléchargement ', 'download ca certificate' => 'Téléchargez le certificat CA', 'download certificate' => 'Téléchargez le certificat', 'download dh parameter' => 'Télécharger paramètres Diffie-Hellman', 'download host certificate' => 'Téléchargez le certificat de l\'hôte', -'download new ruleset' => 'Téléchargez un nouveau règlement', +'download new ruleset' => 'Télécharger de nouvelles règles', 'download pkcs12 file' => 'Téléchargez le fichier PKCS12', 'download root certificate' => 'Téléchargez le certificat Root', 'download tls-auth key' => 'Télécharger la clé tls-auth', @@ -1053,9 +1053,9 @@ 'firmware upload' => 'Charger firmware / pilotes', 'first' => 'Premier', 'five minutes' => '5 minutes', -'fixed ip lease added' => 'Bail IP fixe ajouté', -'fixed ip lease modified' => 'Bail IP fixe modifié', -'fixed ip lease removed' => 'Bail IP fixe supprimé', +'fixed ip lease added' => 'Bail adresse IP fixe ajoute', +'fixed ip lease modified' => 'Bail adresse IP fixe modifie', +'fixed ip lease removed' => 'Bail adresse IP fixe supprime', 'flag' => 'Drap.', 'force update' => 'Forcer la mise à jour', 'force user' => 'Obliger tous les nouveaux fichiers à l\'utilisateur', @@ -1335,7 +1335,7 @@ 'host configuration' => 'Configuration de l\'hôte', 'host deny' => 'Liste des hôtes non autorisés', 'host ip' => 'Adresse IP de l\'hôte ', -'host to net vpn' => 'Réseau privé virtuel (VPN) de l\'hôte au net (client nomade)', +'host to net vpn' => 'Réseau privé virtuel (VPN) de l\'hôte au réseau (client nomade) ', 'hostname' => 'Nom hôte ', 'hostname and domain already in use' => 'Le nom d\'hôte et de domaine sont déjà utilisés.', 'hostname cant be empty' => 'Le nom d\'hôte ne peut pas être vide.', @@ -1466,7 +1466,7 @@ 'invalid vpi vpci' => 'Réglages VPI/VPCI non valide', 'invalid wins address' => 'Adresse du serveur WINS non valide.', 'invert' => 'Inverser', -'ip address' => 'Adresse IP', +'ip address' => 'Adresse IP ', 'ip address in use' => 'Adresse IP déjà en cours d\'utilisation', 'ip address outside subnets' => 'Adresse IP hors des sous-réseaux', 'ip alias added' => 'Alias d\'IP externe ajoutée', @@ -1474,7 +1474,7 @@ 'ip alias removed' => 'Alias d\'IP externe supprimée', 'ip info' => 'Information IP', 'ipfire has now rebooted' => 'IPFire va à présent redémarrer.', -'ipfire has now shutdown' => 'IPFire va à présent s\'éteindre.', +'ipfire has now shutdown' => 'IPFire va à présent s\'arrêter.', 'ipfire side' => 'Côté IPFire :', 'ipfire side is invalid' => 'Côté IPFire non valide.', 'ipfires hostname' => 'Nom d\'hôte d\'IPFire ', @@ -1483,9 +1483,9 @@ 'ipsec network' => 'Réseau IPsec', 'ipsec no connections' => 'Aucune connexion IPsec active', 'iptable rules' => 'Règles table IP', -'iptmangles' => 'Mangles IPTable', -'iptnats' => 'Traduction d\'adresses réseaux table IP', -'ipts' => 'Tables IP', +'iptmangles' => 'Mangles IPTable ', +'iptnats' => 'Traduction d\'adresses réseaux table IP ', +'ipts' => 'Tables IP ', 'isdn' => 'ISDN', 'isdn settings' => 'Réglages ISDN supplémentaires :', 'isdn1' => 'ISDN unique', @@ -1569,7 +1569,7 @@ 'mac address saved' => 'Sauvegarde réussie !', 'mac address saved txt' => 'L\'adresse MAC a été correctement sauvegardée, mais les changements prendront effets après un redémarrage ou une reconnexion.', 'mac address title' => 'Contrôle d\'accès des adresses MAC', -'mac desc' => 'Ici, vous pouvez changer l\'adresse MAC de ROUGE0. L\'adresse doit être saisie en héxadécimal (0-9,a-f), une adresse valide est par exemple 00-01-02-0e-b8-d6 ou 00:01:02:0e:b8:d6.', +'mac desc' => 'Ici, vous pouvez changer l\'adresse MAC de ROUGE0. L\'adresse doit être saisie en hexadécimal (0-9,a-f), une adresse valide est par exemple 00-01-02-0e-b8-d6 ou 00:01:02:0e:b8:d6.', 'mac filter' => 'Filtre MAC', 'mac new' => 'Nouvelle adresse MAC :', 'mac1 new' => 'Nouvelle adresse MAC 1 (vdsl-inet) :', @@ -1714,9 +1714,9 @@ 'network time' => 'Utiliser un serveur de temps automatique :', 'network time from' => 'Obtenir l\'heure depuis un serveur de temps automatique', 'network traffic graphs' => 'Graphiques de l\'activité réseau', -'network traffic graphs external' => 'Graphique du trafic net (externe)', -'network traffic graphs internal' => 'Graphique du trafic net (interne)', -'network traffic graphs others' => 'Réseau (autres)', +'network traffic graphs external' => 'Graphique du trafic réseau (externe)', +'network traffic graphs internal' => 'Graphique du trafic réseau (interne)', +'network traffic graphs others' => 'Graphique de la qualité réseau (autres)', 'network updated' => 'Réseau personnalisé mis à jour', 'networks settings' => 'Réglages pare-feu - réseau', 'never' => 'Jamais', @@ -1878,8 +1878,8 @@ 'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.', 'ovpn subnet overlap' => 'Le sous-réseau OpenVPN se chevauche avec : ', +'ovpn warning rfc3280' => 'Votre certificat d\'hôte n\'est pas conforme avec la RFC3280. Veuillez mettre à jour la dernière version d\'IPFire et générer dès que possible un nouveau certificat racine et hôte. Tous les clients OpenVPN doivent ensuite être renouvelés !', 'ovpn_fastio' => 'Fast-IO', -'ovpn_fragment' => 'Taille des fragments', 'ovpn_mssfix' => 'Taille MSSFIX', 'ovpn_mtudisc' => 'Découverte MTU', 'ovpn_processprio' => 'Priorité du processus', @@ -2056,7 +2056,7 @@ 'resetglobals' => 'Réinitialiser les paramètres globaux', 'resetpolicy' => 'Réinitialiser la politique par défaut', 'resetshares' => 'réinitialiser les partages ?', -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Réinitialiser la configuration VPN va supprimer le CA root, le certificat hôte et tous les certificats basés sur les connexions', +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Réinitialiser la configuration VPN va supprimer le CA root, le certificat hôte et tous les certificats basés sur les connexions ', 'restart' => 'Relancer', 'restart ovpn server' => 'Relancer le serveur OpenVPN', 'restore' => 'Restaurer', @@ -2196,7 +2196,7 @@ 'ssh fingerprint' => 'Empreinte digitale', 'ssh host keys' => 'Clef SSH de l\'hôte', 'ssh is disabled' => 'SSH est desactive. Arret.', -'ssh is enabled' => 'SSH est active. Redemarrage.', +'ssh is enabled' => 'SSH est active. Redemarrage.', 'ssh key' => 'Clef', 'ssh key size' => 'Taille (bits)', 'ssh keys' => 'Autoriser l\'authentification par clef publique', @@ -2238,7 +2238,7 @@ 'subject warn' => 'Attention - Le niveau d\'alerte a été atteint', 'subnet' => 'Sous-réseau', 'subnet is invalid' => 'Le masque réseau est non valide', -'subscripted user rules' => 'Régles Sourcefire VRT avec abonnement', +'subscripted user rules' => 'Règles Sourcefire VRT avec abonnement', 'successfully refreshed updates list' => 'La liste des mises à jour a été rafraîchie avec succès.', 'summaries kept' => 'Conserver pour les résumés', 'sunday' => 'Dimanche', @@ -2257,7 +2257,7 @@ 'tcp more reliable' => 'TCP (plus fiable)', 'telephone not set' => 'Téléphone non défini.', 'template' => 'Préétabli', -'template warning' => 'Vous avez deux options pour établir la Qos : La première, vous cliquez sur le bouton de sauvegarde et générez les classes et règles qui vous conviennent. La seconde, vous cliquez sur le bouton préétabli et les classes et règles seront mises en place par un modèle.', +'template warning' => 'Vous avez deux options pour établir la Qos : La première, vous cliquez sur le bouton de sauvegarde et générez les classes et règles qui vous conviennent. La seconde, vous cliquez sur le bouton préétabli et les classes et règles seront mises en place par un modèle.', 'ten minutes' => '10 minutes', 'teovpn_fragment' => 'Taille de fragment', 'test' => 'test', @@ -2299,9 +2299,9 @@ 'tor accounting interval' => 'Interval (UTC)', 'tor accounting limit' => 'Accounting limit (Mo)', 'tor accounting period' => 'Accounting period', -'tor accounting period daily' => 'quotidienne', -'tor accounting period monthly' => 'mensuelle', -'tor accounting period weekly' => 'hebdomadaire', +'tor accounting period daily' => 'Quotidienne', +'tor accounting period monthly' => 'Mensuelle', +'tor accounting period weekly' => 'Hebdomadaire', 'tor acls' => 'Contrôle d\'accès', 'tor allowed subnets' => 'Sous-réseaux alloués (un par ligne)', 'tor bandwidth burst' => 'Max. burst', @@ -2410,7 +2410,7 @@ 'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page Système > Mises à jour.', 'updxlrtr 3 months' => 'trois mois', 'updxlrtr 6 months' => 'six mois', -'updxlrtr all files' => 'tous les fichiers ...', +'updxlrtr all files' => 'tous les fichiers...', 'updxlrtr cache dir' => 'Répertoire du cache', 'updxlrtr cache maintenance' => 'Maintenance du cache', 'updxlrtr cache size' => 'Taille du cache (octets)', @@ -2427,7 +2427,7 @@ 'updxlrtr configuration' => 'Mise à jour de l\'accélérateur', 'updxlrtr current downloads' => 'Les fichiers suivants sont en cours de téléchargement dans le cache local :', 'updxlrtr current files' => 'Les fichiers courants sont dans le cache local', -'updxlrtr daily' => 'quotidiennement', +'updxlrtr daily' => 'Quotidienne', 'updxlrtr data from cache' => 'Données du cache (octets)', 'updxlrtr disk usage' => 'Utilisation du disque', 'updxlrtr efficiency index' => 'Indice d\'efficacité du cache ', @@ -2449,7 +2449,7 @@ 'updxlrtr max disk usage' => 'Utilisation maximum du disque ', 'updxlrtr max download rate' => 'Taux de téléchargement maximum externe (kbit/s) ', 'updxlrtr month' => 'un mois', -'updxlrtr monthly' => 'mensuellement', +'updxlrtr monthly' => 'Mensuelle', 'updxlrtr not accessed' => 'utilisés la dernière fois depuis', 'updxlrtr not enabled' => 'La mise à jour de l\'accélérateur n\'est pas activée sur la page web du proxy', 'updxlrtr other' => 'Autre', @@ -2462,7 +2462,7 @@ 'updxlrtr save and restart' => 'Sauvegarder et redémarrer', 'updxlrtr source' => 'Source', 'updxlrtr source checkup' => 'Vérifications des sources', -'updxlrtr source checkup schedule' => 'Calendrier de vérification des sources ', +'updxlrtr source checkup schedule' => 'Fréquence de vérification des sources ', 'updxlrtr sources' => 'Sources', 'updxlrtr standard view' => 'Vue standard', 'updxlrtr statistics' => 'Statistiques', @@ -2478,12 +2478,12 @@ 'updxlrtr used by' => 'Utilisé par', 'updxlrtr web proxy service required' => 'Le proxy web doit être activé pour utiliser la mise à jour Accélérateur', 'updxlrtr week' => 'une semaine', -'updxlrtr weekly' => 'hebdomadairement', +'updxlrtr weekly' => 'Hebdomadaire', 'updxlrtr year' => 'une année', 'upgrade' => 'Améliorer', 'uplink' => 'Uplink', 'uplink bit rate' => 'Uplink Bit Rate', -'uplink speed' => 'Débit montant - upload (kbit/sec)', +'uplink speed' => 'Débit montant - upload (kbit/sec) ', 'uplink std class' => 'Classe standard de la connexion ', 'upload' => 'Envoi ', 'upload a certificate' => 'Envoyer un certificat :', @@ -2506,19 +2506,19 @@ 'uptime load average' => 'Charge moyenne', 'url filter' => 'Filtre de contenu', 'urlfilter access' => 'Accès', -'urlfilter activity detection' => 'Détection d\'activité', -'urlfilter add new time constraint rule' => 'Ajouter une nouvelle règle de contrainte de temps', -'urlfilter add new user quota rule' => 'Ajouter une nouvelle règle sur le quota de l\'utilisateur', +'urlfilter activity detection' => 'Détection d\'activité ', +'urlfilter add new time constraint rule' => 'Ajouter une nouvelle règle de contrainte de temps ', +'urlfilter add new user quota rule' => 'Ajouter une nouvelle règle sur le quota de l\'utilisateur ', 'urlfilter add rule' => 'Ajouter', 'urlfilter advanced settings' => 'Paramètres avancés', 'urlfilter allow' => 'Autoriser', 'urlfilter allow access' => 'Autoriser l\'accès', 'urlfilter allowed domains' => 'Domaines autorisés (un par ligne)', 'urlfilter allowed urls' => 'URLs autorisées (une par ligne)', -'urlfilter assigned quota users' => 'Utilisateurs assignés (un par ligne)', +'urlfilter assigned quota users' => 'Utilisateurs assignés (un par ligne) ', 'urlfilter assigned users' => 'Utilisateurs assignés', 'urlfilter automatic blacklist update' => 'Mise à jour automatique de la liste noire', -'urlfilter automatic update schedule' => 'Mettre à jour le calendrier automatiquement', +'urlfilter automatic update schedule' => 'Fréquence de mise à jour automatique ', 'urlfilter back to main page' => 'Revenir à la page principale', 'urlfilter background image' => 'Filtre d\'URLs contenant des images de fonds', 'urlfilter background text' => 'Afin d\'avoir une image de fond personnalisée pour les pages bloquées, envoyez le fichier .jpg', @@ -2526,61 +2526,61 @@ 'urlfilter backup error' => 'Impossible de créer un fichier de sauvegarde', 'urlfilter backup settings' => 'Sauvegarder les réglages du filtre d\'URL', 'urlfilter banned clients' => 'Adresses IP bannies', -'urlfilter blacklist age 1' => 'La dernière mise à jour de la liste noire a été faite il y a', +'urlfilter blacklist age 1' => 'La dernière mise à jour de la liste noire a eu lieu il y a', 'urlfilter blacklist age 2' => 'jours', -'urlfilter blacklist category name' => 'Nom de la catégorie de la liste noire', +'urlfilter blacklist category name' => 'Nom de la catégorie de la liste noire ', 'urlfilter blacklist editor' => 'Editeur de liste noire', 'urlfilter blacklist editor info' => 'Créer et éditer votre propre fichier de liste noire', 'urlfilter blacklist name' => 'Nom de la liste noire', 'urlfilter blacklist update' => 'Mise à jour de la liste noire', 'urlfilter block' => 'Bloquer', 'urlfilter block access' => 'Bloquer l\'accès', -'urlfilter block all' => 'Bloquer toutes les url non autorisées explicitement', +'urlfilter block all' => 'Bloquer toutes les url non autorisées explicitement ', 'urlfilter block archives' => 'Bloquer fichiers d\'archives compressés ', 'urlfilter block audio-video' => 'Bloquer fichiers audio / vidéo ', 'urlfilter block categories' => 'Bloquer catégories', 'urlfilter block executables' => 'Bloquer fichiers exécutables ', -'urlfilter block ip' => 'Bloquer sites atteints par leur IP', -'urlfilter block settings' => ' Réglages filtre URL', +'urlfilter block ip' => 'Bloquer les sites atteints par leur IP ', +'urlfilter block settings' => ' Réglages de filtre URL', 'urlfilter blocked domains' => 'Domaines bloqués (un par ligne)', 'urlfilter blocked expressions' => 'Expressions bloquées (comme expressions régulières)', 'urlfilter blocked urls' => 'URL bloquées (une par ligne)', 'urlfilter category' => 'Catégorie', 'urlfilter category all' => 'tout', 'urlfilter category data error' => 'Liste noire vide', -'urlfilter category log' => 'Classer les journaux par catégorie', +'urlfilter category log' => 'Classer les journaux par catégorie ', 'urlfilter category name error' => 'Nom catégorie liste noire requis', 'urlfilter client' => 'Client', 'urlfilter configuration' => 'Configuration filtre URL', 'urlfilter constraint definition' => 'Définition', -'urlfilter constraint outside' => 'Dehors', -'urlfilter constraint within' => 'Dedans', +'urlfilter constraint outside' => 'Hors', +'urlfilter constraint within' => 'Avec', 'urlfilter copy rule' => 'Copie', -'urlfilter current files' => 'Fichiers courant du dépôt local', +'urlfilter current files' => 'Fichiers courant du dépôt local ', 'urlfilter custom blacklist' => 'Liste noire perso', 'urlfilter custom expression list' => 'Liste de mots clés perso', -'urlfilter custom url' => 'Source URL perso', +'urlfilter custom url' => 'Source URL perso ', 'urlfilter custom url required' => 'Source URL perso requise', 'urlfilter custom whitelist' => 'Liste blanche perso', -'urlfilter daily' => 'quotidiennement', +'urlfilter daily' => 'Quotidienne', 'urlfilter disabled' => 'désactivé', 'urlfilter domains' => 'Domaine (un par ligne)', -'urlfilter dont restart urlfilter' => 'Ne pas redémarrer filtre URL', +'urlfilter dont restart urlfilter' => 'Ne pas redémarrer le filtre URL ', 'urlfilter dst' => 'Destination', 'urlfilter dst error' => 'Il doit y avoir au moins une catégorie sélectionnée', 'urlfilter edit domains urls expressions' => 'Modifier domaines, URLs et expressions', 'urlfilter edit time constraint rule' => 'Modifier une règle existante de contrainte de temps', 'urlfilter edit user quota rule' => 'Modifier une règle de quota utilisateur', -'urlfilter empty ads' => 'Bloquer "pubs" avec fenêtre vide', +'urlfilter empty ads' => 'Bloquer "pubs" avec fenêtre vide ', 'urlfilter empty repository' => 'Fichier du dépot local est vide', -'urlfilter enable automatic blacklist update' => 'Activer mise à jour automatique', +'urlfilter enable automatic blacklist update' => 'Activer la mise à jour automatique ', 'urlfilter enable custom blacklist' => 'Activer liste noire perso ', 'urlfilter enable custom expression list' => 'Activer la liste d\'expressions personnalisées ', 'urlfilter enable custom whitelist' => 'Activer liste blanche perso ', -'urlfilter enable expression lists' => 'Activer la liste de mots clés perso', -'urlfilter enable full backup' => 'Inclure liste noire complète', +'urlfilter enable expression lists' => 'Activer la liste de mots clés perso ', +'urlfilter enable full backup' => 'Inclure liste noire complète ', 'urlfilter enable jpeg' => 'Activer image d\'arrière plan', -'urlfilter enable log' => 'Activer le journal', +'urlfilter enable log' => 'Activer le journal ', 'urlfilter enable rewrite rules' => 'Activer fichier local de redirection ', 'urlfilter enabled' => 'Activé :', 'urlfilter example' => 'Exemple : www.domain.com', @@ -2597,7 +2597,7 @@ 'urlfilter from' => 'De', 'urlfilter hourly' => 'par heure', 'urlfilter import blacklist' => 'Importer liste noire', -'urlfilter import text' => 'Pour importer une liste noire précédemment sauvée, charger le fichier .tar.gz suivant', +'urlfilter import text' => 'Pour importer une liste noire précédemment sauvée, charger le fichier .tar.gz suivant ', 'urlfilter install blacklist' => 'Installer liste noire', 'urlfilter install information' => 'La nouvelle liste noire va être automatiquement compilée pour préparer les bases de données. Ceci peut durer plusieurs minutes et dépend de la taille de la liste noire.', 'urlfilter invalid content' => 'Le fichier n\'est pas une liste noire compatible squidGuard', @@ -2612,17 +2612,17 @@ 'urlfilter log viewer' => 'Rapport de filtre URL', 'urlfilter logs' => 'Rapports de filtre URL', 'urlfilter maintenance' => 'Maintenance filtre URL', -'urlfilter manage local file repository' => 'Gérer fichier de dépôt local', +'urlfilter manage local file repository' => 'Gérer fichier de dépôt local ', 'urlfilter manage repository' => 'Gérer dépôt', 'urlfilter minutes' => 'minutes', 'urlfilter mode allow' => 'autoriser', 'urlfilter mode block' => 'bloquer', 'urlfilter mon' => 'Lun', 'urlfilter monday' => 'Lundi', -'urlfilter monthly' => 'Mensuellement', -'urlfilter msg text 1' => 'Message ligne 1', -'urlfilter msg text 2' => 'Message ligne 2', -'urlfilter msg text 3' => 'Message ligne 3', +'urlfilter monthly' => 'Mensuelle', +'urlfilter msg text 1' => 'Message ligne 1 ', +'urlfilter msg text 2' => 'Message ligne 2 ', +'urlfilter msg text 3' => 'Message ligne 3 ', 'urlfilter network access control' => 'Contrôle d\'accès réseau en fonction', 'urlfilter no categories' => 'Aucune catégorie disponible', 'urlfilter not enabled' => 'Filtre URL n\'est pas activé sur le proxy page web', @@ -2630,10 +2630,10 @@ 'urlfilter quota time error' => 'Valeur non valide pour quota de temps', 'urlfilter quota user error' => 'Au moins un nom d\'utilisateur est requis', 'urlfilter redirect template' => 'Redirection modèle de page', -'urlfilter redirectpage' => 'Redirige vers cette URL', +'urlfilter redirectpage' => 'Redirige vers cette URL ', 'urlfilter remove file' => 'Supprime le fichier du dépôt', 'urlfilter renewal' => 'Renouvellement', -'urlfilter renewal period' => 'Période de renouvellement', +'urlfilter renewal period' => 'Période de renouvellement ', 'urlfilter repository information' => 'Les requêtes de téléchargement pour ces fichiers seront redirigées depuis la source originale vers le fichier local du dépôt.', 'urlfilter reset' => 'Remettre à zéro', 'urlfilter restart' => 'Redémarrer filtre URL', @@ -2643,21 +2643,21 @@ 'urlfilter restore results' => 'Restaurer résultats', 'urlfilter restore settings' => 'Restaurer paramètres filtre URL', 'urlfilter restore success' => 'Configuration filtre URL restaurée. Filtre URL doit être redémarré pour activer les nouveaux paramètres.', -'urlfilter restore text' => 'Pour restaurer une configuration précédemment sauvée, charger le fichier de sauvegarde .tar.gz suivant', -'urlfilter safesearch' => 'Activer SafeSearch', +'urlfilter restore text' => 'Pour restaurer une configuration précédemment sauvée, charger le fichier de sauvegarde .tar.gz suivant ', +'urlfilter safesearch' => 'Activer SafeSearch ', 'urlfilter sat' => 'Sam', 'urlfilter saturday' => 'Samedi', 'urlfilter save and restart' => 'Sauvegarder et redémarrer', 'urlfilter save schedule' => 'Valider paramètres de mise à jour', -'urlfilter select blacklist' => 'Sélectionner liste noire existante', +'urlfilter select blacklist' => 'Choisir une liste noire existante ', 'urlfilter select multi' => 'Presser \'Ctrl\' pour sélectionner plusieurs catégories', -'urlfilter select source' => 'Sélectionner source de téléchargement', +'urlfilter select source' => 'Choisir une source de téléchargement ', 'urlfilter set time constraints' => 'Fixer les contraintes de temps', 'urlfilter set user quota' => 'Fixer quotas utilisateur', -'urlfilter show category' => 'Montrer la catégorie de page bloquée', -'urlfilter show dnserror' => 'Utiliser "DNS Error" pour les url bloquées', -'urlfilter show ip' => 'Montrer adresse IP page bloquée', -'urlfilter show url' => 'Montrer adresse url page bloquée', +'urlfilter show category' => 'Montrer la catégorie de page bloquée ', +'urlfilter show dnserror' => 'Utiliser "Erreur DNS" pour les url bloquées ', +'urlfilter show ip' => 'Montrer adresse IP page bloquée ', +'urlfilter show url' => 'Montrer adresse url page bloquée ', 'urlfilter source' => 'Hôte(s) ou réseau(x) source(s)', 'urlfilter src' => 'Source', 'urlfilter src error' => 'Source ne peut être vide', @@ -2671,7 +2671,7 @@ 'urlfilter time space' => 'Espace temps', 'urlfilter timebased access control' => 'Contrôle d\'accès basé sur le temps', 'urlfilter timespace error' => 'Erreur dans la déclaration d\'espace/temps', -'urlfilter to' => 'Vers', +'urlfilter to' => 'A', 'urlfilter tue' => 'Mar', 'urlfilter tuesday' => 'Mardi', 'urlfilter unfiltered clients' => 'Adresses IP non filtrées', @@ -2684,23 +2684,23 @@ 'urlfilter upload blacklist' => 'Télécharger liste noire', 'urlfilter upload file' => 'Télécharger fichier', 'urlfilter upload file information 1' => 'Note', -'urlfilter upload file information 2' => 'Filtre URL doit être redémarré pour activer les changements du dépot.', -'urlfilter upload file text' => 'Pour ajouter un fichier au dépot local, charger le fichier suivant', -'urlfilter upload information' => 'La nouvelle liste noire va être automatiquement compilée pour préparer les bases de données. Le temps dépend de la taille de la liste noire et peut durer plusieurs minutes. Attendre la fin de cette tâche pour relancer filtre URL.', +'urlfilter upload file information 2' => 'Le filtre URL doit être redémarré pour activer les changements du dépot.', +'urlfilter upload file text' => 'Pour ajouter un fichier au dépot local, charger le fichier suivant ', +'urlfilter upload information' => 'La nouvelle liste noire va être automatiquement compilée pour préparer les bases de données. Le temps dépend de la taille de la liste noire et peut durer plusieurs minutes. Veuillez attendre la fin de cette tâche pour relancer le filtre URL.', 'urlfilter upload success' => 'Chargement liste noire complété avec succès.', -'urlfilter upload text' => 'Pour installer une mise à jour, uploader le fichier .tar.gz suivant', +'urlfilter upload text' => 'Pour installer une mise à jour, uploader le fichier .tar.gz suivant ', 'urlfilter url filter' => 'Filtre d\'URL', -'urlfilter urlfilter blacklist editor' => 'Editeur de la liste noire du filtre d\'URL', +'urlfilter urlfilter blacklist editor' => 'Editeur de la liste noire du filtre d\'URL ', 'urlfilter urls' => 'URLs (une par ligne)', -'urlfilter user time quota' => 'Quota de temps (en minutes)', +'urlfilter user time quota' => 'Quota de temps (en minutes) ', 'urlfilter username' => 'Nom d\'utilisateur', -'urlfilter username log' => 'Log identifiant', +'urlfilter username log' => 'Log identifiant ', 'urlfilter web proxy service required' => 'Le service proxy web doit être activé pour utiliser les filtres d\'URL', 'urlfilter wed' => 'Mer', 'urlfilter wednesday' => 'Mercredi', 'urlfilter weekday error' => 'Au moins un jour doit être sélectionné', -'urlfilter weekly' => 'hebdomadairement', -'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis', +'urlfilter weekly' => 'Hebdomadaire', +'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis ', 'urlfilter wrong filetype' => 'Le fichier n\'a pas l\'extension .tar.gz', 'use' => 'Utiliser', 'use a pre-shared key' => 'Utiliser une clé pré-partagée :', @@ -2737,13 +2737,13 @@ 'vpn aggrmode' => 'Mode agressif IKE autorisé. Eviter si possible (la clé pré-partagée est transmise en clair) !', 'vpn altname syntax' => 'SubjectAltName est une liste séparée par des virgules d\'email, DNS, URI, RID et de les objets du IP. Email: une adresse d\'email. Email Syntaxe: copie prend le champ email du certificat à être utilisé. DNS: un nom de domaine valide. URI: tout URI valide. RID: identificateur d\'objet enregistré. IP: une adresse IP. Remarque : Jeu de caractères est limité et le cas est significatif. Exemple : email :info(a)ipfire.org, email :copier, DNS:www.ipfire.org, IP:127.0.0.1, URI:http://url/quelque/chose', 'vpn auth-dn' => 'Le pair est identifié par soit IPV4_ADDR, FQDN, USER_FQDN ou la chaine DER_ASN1_DN dans le champ Remote ID', -'vpn broken' => 'Broken', +'vpn broken' => 'Rompu', 'vpn configuration main' => 'VPN configuration - Principal', 'vpn connecting' => 'CONNEXION', -'vpn delayed start' => 'Délai avant le lancement du VPN (secondes)', +'vpn delayed start' => 'Délai avant le lancement du VPN (secondes) ', 'vpn delayed start help' => 'Si requis, ce délai peut être utilisé pour autoriser les mises à jour de DNS dynamique à la propagation appropriée. 60 est une valeur souvent utilisée lorsque l\'interface ROUGE est une IP dynamique.', 'vpn force mobike' => 'Force using MOBIKE (only IKEv2)', -'vpn inactivity timeout' => 'Inactivity Timeout', +'vpn inactivity timeout' => 'Délai dépassé inactivité', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute non admis', 'vpn keyexchange' => 'Keyexchange', 'vpn local id' => 'ID Local', @@ -2755,10 +2755,10 @@ 'vpn on orange' => 'VPN sur ORANGE', 'vpn on-demand' => 'A-LA-DEMANDE', 'vpn payload compression' => 'Négocier la compression de charge utile', -'vpn red name' => 'IP publique ou nom de domaine complet pour l\'interface ROUGE ou <%defaultroute>', +'vpn red name' => 'IP publique ou nom de domaine complet pour l\'interface ROUGE ou <%defaultroute> ', 'vpn remote id' => 'ID distant', 'vpn start action' => 'Démarrer l\'action', -'vpn start action add' => 'Attendre l\'initiation de la connexion', +'vpn start action add' => 'Attendre l\'initialisation de la connexion', 'vpn start action route' => 'A la demande', 'vpn start action start' => 'Toujours démarré', 'vpn statistic n2n' => 'Stats OpenVPN (site-à-site)', @@ -2802,7 +2802,7 @@ 'wlan client ccmp' => 'CCMP', 'wlan client configuration' => 'Configuration client sans fil', 'wlan client disconnected' => 'Déconnecté', -'wlan client duplicate ssid' => 'Duplicate SSID', +'wlan client duplicate ssid' => 'SSID en double', 'wlan client eap authentication method' => 'Méthode d\'authentification EAP', 'wlan client eap phase2 method' => 'Méthode phase 2 EAP', 'wlan client eap state' => 'Statut EAP', @@ -2813,21 +2813,21 @@ 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', -'wlan client group cipher' => 'Group cipher', +'wlan client group cipher' => 'Chiffrer groupe', 'wlan client group key algorithm' => 'GKA', 'wlan client identity' => 'Identité', 'wlan client invalid key length' => 'Longueur de clé invalide.', 'wlan client method' => 'Méthode', 'wlan client new entry' => 'Créer une nouvelle configuration de client sans fil', 'wlan client new network' => 'Nouveau réseau', -'wlan client pairwise cipher' => 'Pairwise cipher', +'wlan client pairwise cipher' => 'Chiffrer par paire', 'wlan client pairwise key algorithm' => 'PKA', -'wlan client pairwise key group key' => 'Pairwise key/group key', +'wlan client pairwise key group key' => 'Clé par paire / clé de groupe', 'wlan client password' => 'Mot de passe', -'wlan client psk' => 'Pre-shared key', +'wlan client psk' => 'Clé pré-partagée', 'wlan client ssid' => 'SSID', 'wlan client tkip' => 'TKIP', -'wlan client tls cipher' => 'TLS Cipher', +'wlan client tls cipher' => 'Chiffrer TLS', 'wlan client tls version' => 'Version TLS', 'wlan client wpa mode' => 'Mode WPA', 'wlan client wpa mode all' => 'Auto', @@ -2847,6 +2847,8 @@ 'wlanap invalid wpa' => 'Longueur non valide dans la Passphrase WPA. Doit comporter entre 8 et 63 caractères.', 'wlanap link dhcp' => 'Configuration DHCP du réseau local sans fil', 'wlanap link wireless' => 'Activer les clients LAN sans fil', +'wlanap neighbor scan' => 'Balayage des réseaux proches', +'wlanap neighbor scan warning' => 'Attention ! La désactivation peut enfreindre les règles réglementaires !', 'wlanap no interface' => 'L\'interface choisie n\'est pas une carte LAN sans fil !', 'wlanap none' => 'aucun', 'wlanap notifications' => 'Notifications', diff --git a/lfs/configroot b/lfs/configroot index 4701d9e39..c66dcdedb 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -62,7 +62,7 @@ $(TARGET) : # Touch empty files for i in auth/users backup/include.user backup/exclude.user \ - captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt ddns/config ddns/settings ddns/ipcache dhcp/settings \ + captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \ diff --git a/lfs/libvirt b/lfs/libvirt index 0bda497ce..d0742e810 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 18 +PAK_VER = 19 -DEPS = "jansson libpciaccess libyajl ncat qemu" +DEPS = "libpciaccess libyajl ncat qemu" ############################################################################### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 26707c0aeb54d8ab47c5e684ef99367e73834e19
by Michael Tremer 03 Jan '19

03 Jan '19

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 170e118fe5a7d1d8794bf71cc5018df6d5318466
by Michael Tremer 03 Jan '19

03 Jan '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 170e118fe5a7d1d8794bf71cc5018df6d5318466 (commit) from 55a95ac7168863a617f9ee19fc769ae943168981 (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 170e118fe5a7d1d8794bf71cc5018df6d5318466 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 3 10:56:30 2019 +0000 kernel: Build in AT keyboard support This is the default PS/2 keyboard on virtual machines, some laptops and so on. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/config-generic | 2 +- kernel/kernel.nm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/kernel/config-generic b/kernel/config-generic index c9654e42a..3c9d9bcc9 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -2300,7 +2300,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5520 is not set # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set -CONFIG_KEYBOARD_ATKBD=m +CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 1e14de497..9b1460cda 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.20 -release = 9 +release = 10 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4c83d9fbdcf137c126d0b5ed0935dbe18c9733f3
by Michael Tremer 02 Jan '19

02 Jan '19

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 4c83d9fbdcf137c126d0b5ed0935dbe18c9733f3 (commit) from cdaad0cdd33e63232fe8939644825619576b6be3 (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 4c83d9fbdcf137c126d0b5ed0935dbe18c9733f3 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Jan 2 16:43:42 2019 +0100 mc: Update to 4.8.22 For details see: http://midnight-commander.org/wiki/NEWS-4.8.22 Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/mc | 2 ++ lfs/mc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 4733af6fa..06c536ed4 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -179,6 +179,7 @@ usr/share/mc/syntax/m4.syntax usr/share/mc/syntax/mail.syntax usr/share/mc/syntax/makefile.syntax usr/share/mc/syntax/markdown.syntax +usr/share/mc/syntax/meson.syntax usr/share/mc/syntax/ml.syntax usr/share/mc/syntax/named.syntax usr/share/mc/syntax/nemerle.syntax @@ -198,6 +199,7 @@ usr/share/mc/syntax/puppet.syntax usr/share/mc/syntax/python.syntax usr/share/mc/syntax/r.syntax usr/share/mc/syntax/ruby.syntax +usr/share/mc/syntax/rust.syntax usr/share/mc/syntax/sh.syntax usr/share/mc/syntax/slang.syntax usr/share/mc/syntax/smalltalk.syntax diff --git a/lfs/mc b/lfs/mc index 1aa07c133..6600702e5 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.8.20 +VER = 4.8.22 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 16 +PAK_VER = 17 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7f808b01f3f7d9aa52152a9efb86dbca +$(DL_FILE)_MD5 = 62bba2bfccadf08eb554321899f475bc install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cdaad0cdd33e63232fe8939644825619576b6be3
by Michael Tremer 02 Jan '19

02 Jan '19

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 cdaad0cdd33e63232fe8939644825619576b6be3 (commit) via c86d893830560165e065cd44ee44f13c2d7e97a7 (commit) via 13827014fcee7d3094529feb2be17513602e5421 (commit) via 49deea707bc6db5683ecc139070d5c83b89b7c48 (commit) from 4c76d08b2a1ef5ac9ff8b546c0d887e342adec1c (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 cdaad0cdd33e63232fe8939644825619576b6be3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 16:24:39 2019 +0000 libvirt: Bump package version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c86d893830560165e065cd44ee44f13c2d7e97a7 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jan 1 18:39:03 2019 +0100 squid: Update to 4.5 For details see: http://www.squid-cache.org/Versions/v4/changesets/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 13827014fcee7d3094529feb2be17513602e5421 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 31 00:36:23 2018 +0000 core127: Ship updated wget Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 49deea707bc6db5683ecc139070d5c83b89b7c48 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 27 18:16:35 2018 +0100 wget: Update to 1.20.1 This is a bugfix release: "due to some privacy issues in default settings of Wget, we introduce this bugfix release. The --xattr option (saving original URL and Referer into extended file attributes) was introduced and enabled by default since Wget 1.19. It possibly saved - possibly unrecognized by the user - credentials, access tokes etc that were included in the requested URL. We changed three details as a countermeasure, see below in the NEWS section. With Best Regards, Tim ... NEWS * Changes in Wget 1.20.1 ** --xattr is no longer default since it introduces privacy issues. ** --xattr saves the Referer as scheme/host/port, user/pw/path/query/fragment are no longer saved to prevent privacy issues. ** --xattr saves the Original URL without user/password to prevent privacy issues." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/104 => core/127}/filelists/wget | 0 lfs/libvirt | 2 +- lfs/squid | 9 +- lfs/wget | 4 +- ..._netdb_exchange_with_a_TLS_cache_peer_307.patch | 91 -------------- ..._tarball_format_formally_to_make_dist_325.patch | 22 ---- .../03_The_handshake_logformat_code_331.patch | 132 --------------------- ...ch => squid-4.5-fix-max-file-descriptors.patch} | 4 +- 8 files changed, 8 insertions(+), 256 deletions(-) copy config/rootfiles/{oldcore/104 => core/127}/filelists/wget (100%) delete mode 100644 src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch delete mode 100644 src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch delete mode 100644 src/patches/squid/03_The_handshake_logformat_code_331.patch rename src/patches/squid/{squid-4.4-fix-max-file-descriptors.patch => squid-4.5-fix-max-file-descriptors.patch} (92%) Difference in files: diff --git a/config/rootfiles/core/127/filelists/wget b/config/rootfiles/core/127/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/core/127/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/lfs/libvirt b/lfs/libvirt index aba2f1339..0bda497ce 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 17 +PAK_VER = 18 DEPS = "jansson libpciaccess libyajl ncat qemu" diff --git a/lfs/squid b/lfs/squid index aaa2d0b96..6033ab394 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 4.4 +VER = 4.5 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 892504ca9700e1f139a53f84098613bd +$(DL_FILE)_MD5 = 8275da5846f9f2243ad2625e5aef2ee0 install : $(TARGET) @@ -72,10 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/03_The_handshake_logformat_code_331.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/wget b/lfs/wget index 5ccb0029f..b8c83d10d 100644 --- a/lfs/wget +++ b/lfs/wget @@ -24,7 +24,7 @@ include Config -VER = 1.20 +VER = 1.20.1 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9f1515d083b769e9ff7642ce6016518e +$(DL_FILE)_MD5 = f6ebe9c7b375fc9832fb1b2028271fb7 install : $(TARGET) diff --git a/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch b/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch deleted file mode 100644 index 09f8961dc..000000000 --- a/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit bc54d7a6f7ec510a25966f2f800d3ea874657546 -Author: chi-mf <43963496+chi-mf(a)users.noreply.github.com> -Date: 2018-10-30 04:48:40 +0000 - - Fix netdb exchange with a TLS cache_peer (#307) - - Squid uses http-scheme URLs when sending netdb exchange (and possibly - other) requests to a cache_peer. If a DIRECT path is selected for that - cache_peer URL, then Squid sends a clear text HTTP request to that - cache_peer. If that cache_peer expects a TLS connection, it will reject - that request (with, e.g., error:transaction-end-before-headers), - resulting in an HTTP 503 or 504 netdb fetch error. - - Workaround this by adding an internalRemoteUri() parameter to indicate - whether https or http URL scheme should be used. Netdb fetches from - CachePeer::secure peers now get an https scheme and, hence, a TLS - connection. - -diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc -index 0f488de..526093f 100644 ---- a/src/icmp/net_db.cc -+++ b/src/icmp/net_db.cc -@@ -1282,7 +1282,7 @@ netdbExchangeStart(void *data) - #if USE_ICMP - CachePeer *p = (CachePeer *)data; - static const SBuf netDB("netdb"); -- char *uri = internalRemoteUri(p->host, p->http_port, "/squid-internal-dynamic/", netDB); -+ char *uri = internalRemoteUri(p->secure.encryptTransport, p->host, p->http_port, "/squid-internal-dynamic/", netDB); - debugs(38, 3, "Requesting '" << uri << "'"); - const MasterXaction::Pointer mx = new MasterXaction(XactionInitiator::initIcmp); - HttpRequest *req = HttpRequest::FromUrl(uri, mx); -diff --git a/src/internal.cc b/src/internal.cc -index 6ebc7a6..ff7b4d6 100644 ---- a/src/internal.cc -+++ b/src/internal.cc -@@ -82,7 +82,7 @@ internalStaticCheck(const SBuf &urlPath) - * makes internal url with a given host and port (remote internal url) - */ - char * --internalRemoteUri(const char *host, unsigned short port, const char *dir, const SBuf &name) -+internalRemoteUri(bool encrypt, const char *host, unsigned short port, const char *dir, const SBuf &name) - { - static char lc_host[SQUIDHOSTNAMELEN]; - assert(host && !name.isEmpty()); -@@ -115,7 +115,7 @@ internalRemoteUri(const char *host, unsigned short port, const char *dir, const - static MemBuf mb; - - mb.reset(); -- mb.appendf("http://" SQUIDSBUFPH, SQUIDSBUFPRINT(tmp.authority())); -+ mb.appendf("%s://" SQUIDSBUFPH, encrypt ? "https" : "http", SQUIDSBUFPRINT(tmp.authority())); - - if (dir) - mb.append(dir, strlen(dir)); -@@ -132,7 +132,10 @@ internalRemoteUri(const char *host, unsigned short port, const char *dir, const - char * - internalLocalUri(const char *dir, const SBuf &name) - { -- return internalRemoteUri(getMyHostname(), -+ // XXX: getMy*() may return https_port info, but we force http URIs -+ // because we have not checked whether the callers can handle https. -+ const bool secure = false; -+ return internalRemoteUri(secure, getMyHostname(), - getMyPort(), dir, name); - } - -diff --git a/src/internal.h b/src/internal.h -index c91f9ac..13a43a6 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -24,7 +24,7 @@ void internalStart(const Comm::ConnectionPointer &clientConn, HttpRequest *, Sto - bool internalCheck(const SBuf &urlPath); - bool internalStaticCheck(const SBuf &urlPath); - char *internalLocalUri(const char *dir, const SBuf &name); --char *internalRemoteUri(const char *, unsigned short, const char *, const SBuf &); -+char *internalRemoteUri(bool, const char *, unsigned short, const char *, const SBuf &); - const char *internalHostname(void); - int internalHostnameIs(const char *); - -diff --git a/src/peer_digest.cc b/src/peer_digest.cc -index 36a8705..f515aaa 100644 ---- a/src/peer_digest.cc -+++ b/src/peer_digest.cc -@@ -323,7 +323,7 @@ peerDigestRequest(PeerDigest * pd) - if (p->digest_url) - url = xstrdup(p->digest_url); - else -- url = xstrdup(internalRemoteUri(p->host, p->http_port, "/squid-internal-periodic/", SBuf(StoreDigestFileName))); -+ url = xstrdup(internalRemoteUri(p->secure.encryptTransport, p->host, p->http_port, "/squid-internal-periodic/", SBuf(StoreDigestFileName))); - debugs(72, 2, url); - - const MasterXaction::Pointer mx = new MasterXaction(XactionInitiator::initCacheDigest); diff --git a/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch b/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch deleted file mode 100644 index 58ceaa034..000000000 --- a/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 3c23ae8c7431344f8fc50bb5ee8f4b56d08c10a4 -Author: Amos Jeffries <yadij(a)users.noreply.github.com> -Date: 2018-11-11 04:29:58 +0000 - - Maintenance: add .xz tarball format formally to make dist (#325) - - Automake can now handle generating this format itself and the - experiments of providing it for downstream have gone well. - -diff --git a/configure.ac b/configure.ac -index 3f8af6d..f668567 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ AC_PREREQ(2.61) - AC_CONFIG_HEADERS([include/autoconf.h]) - AC_CONFIG_AUX_DIR(cfgaux) - AC_CONFIG_SRCDIR([src/main.cc]) --AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects]) -+AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects dist-xz]) - AC_REVISION($Revision$)dnl - AC_PREFIX_DEFAULT(/usr/local/squid) - AM_MAINTAINER_MODE diff --git a/src/patches/squid/03_The_handshake_logformat_code_331.patch b/src/patches/squid/03_The_handshake_logformat_code_331.patch deleted file mode 100644 index 2ce8bdc4a..000000000 --- a/src/patches/squid/03_The_handshake_logformat_code_331.patch +++ /dev/null @@ -1,132 +0,0 @@ -commit 0022167d80725513d95b38aaebc90086fc0b6938 (tag: refs/tags/M-staged-PR331, refs/remotes/origin/v4) -Author: Christos Tsantilas <christos(a)chtsanti.net> -Date: 2018-11-14 15:17:06 +0000 - - The %>handshake logformat code (#331) - - Logging client "handshake" bytes is useful in at least two contexts: - - * Runtime traffic bypass and bumping/splicing decisions. Identifying - popular clients like Skype for Business (that uses a TLS handshake but - then may not speak TLS) is critical for handling their traffic - correctly. Squid does not have enough ACLs to interrogate most TLS - handshake aspects. Adding more ACLs may still be a good idea, but - initial sketches for SfB handshakes showed rather complex - ACLs/configurations, _and_ no reasonable ACLs would be able to handle - non-TLS handshakes. An external ACL receiving the handshake is in a - much better position to analyze/fingerprint it according to custom - admin needs. - - * A logged handshake can be used to analyze new/unusual traffic or even - trigger security-related alarms. - - The current support is limited to cases where Squid was saving handshake - for other reasons. With enough demand, this initial support can be - extended to all protocols and port configurations. - - This is a Measurement Factory project. - -diff --git a/src/cf.data.pre b/src/cf.data.pre -index fa8af56..a8ca587 100644 ---- a/src/cf.data.pre -+++ b/src/cf.data.pre -@@ -4394,6 +4394,37 @@ DOC_START - <qos Server connection TOS/DSCP value set by Squid - <nfmark Server connection netfilter mark set by Squid - -+ >handshake Raw client handshake -+ Initial client bytes received by Squid on a newly -+ accepted TCP connection or inside a just established -+ CONNECT tunnel. Squid stops accumulating handshake -+ bytes as soon as the handshake parser succeeds or -+ fails (determining whether the client is using the -+ expected protocol). -+ -+ For HTTP clients, the handshake is the request line. -+ For TLS clients, the handshake consists of all TLS -+ records up to and including the TLS record that -+ contains the last byte of the first ClientHello -+ message. For clients using an unsupported protocol, -+ this field contains the bytes received by Squid at the -+ time of the handshake parsing failure. -+ -+ See the on_unsupported_protocol directive for more -+ information on Squid handshake traffic expectations. -+ -+ Current support is limited to these contexts: -+ - http_port connections, but only when the -+ on_unsupported_protocol directive is in use. -+ - https_port connections (and CONNECT tunnels) that -+ are subject to the ssl_bump peek or stare action. -+ -+ To protect binary handshake data, this field is always -+ base64-encoded (RFC 4648 Section 4). If logformat -+ field encoding is configured, that encoding is applied -+ on top of base64. Otherwise, the computed base64 value -+ is recorded as is. -+ - Time related format codes: - - ts Seconds since epoch -diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h -index ad230bb..a6f8fd9 100644 ---- a/src/format/ByteCode.h -+++ b/src/format/ByteCode.h -@@ -46,6 +46,8 @@ typedef enum { - LFT_CLIENT_LOCAL_TOS, - LFT_CLIENT_LOCAL_NFMARK, - -+ LFT_CLIENT_HANDSHAKE, -+ - /* client connection local squid.conf details */ - LFT_LOCAL_LISTENING_IP, - LFT_LOCAL_LISTENING_PORT, -diff --git a/src/format/Format.cc b/src/format/Format.cc -index c1e19b4..8fd6720 100644 ---- a/src/format/Format.cc -+++ b/src/format/Format.cc -@@ -8,6 +8,7 @@ - - #include "squid.h" - #include "AccessLogEntry.h" -+#include "base64.h" - #include "client_side.h" - #include "comm/Connection.h" - #include "err_detail_type.h" -@@ -547,6 +548,24 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS - } - break; - -+ case LFT_CLIENT_HANDSHAKE: -+ if (al->request && al->request->clientConnectionManager.valid()) { -+ const auto &handshake = al->request->clientConnectionManager->preservedClientData; -+ if (const auto rawLength = handshake.length()) { -+ // add 1 byte to optimize the c_str() conversion below -+ char *buf = sb.rawAppendStart(base64_encode_len(rawLength) + 1); -+ -+ struct base64_encode_ctx ctx; -+ base64_encode_init(&ctx); -+ auto encLength = base64_encode_update(&ctx, buf, rawLength, reinterpret_cast<const uint8_t*>(handshake.rawContent())); -+ encLength += base64_encode_final(&ctx, buf + encLength); -+ -+ sb.rawAppendFinish(buf, encLength); -+ out = sb.c_str(); -+ } -+ } -+ break; -+ - case LFT_TIME_SECONDS_SINCE_EPOCH: - // some platforms store time in 32-bit, some 64-bit... - outoff = static_cast<int64_t>(current_time.tv_sec); -diff --git a/src/format/Token.cc b/src/format/Token.cc -index 186ade5..06c60cf 100644 ---- a/src/format/Token.cc -+++ b/src/format/Token.cc -@@ -141,6 +141,7 @@ static TokenTableEntry TokenTableMisc[] = { - TokenTableEntry("<qos", LFT_SERVER_LOCAL_TOS), - TokenTableEntry(">nfmark", LFT_CLIENT_LOCAL_NFMARK), - TokenTableEntry("<nfmark", LFT_SERVER_LOCAL_NFMARK), -+ TokenTableEntry(">handshake", LFT_CLIENT_HANDSHAKE), - TokenTableEntry("err_code", LFT_SQUID_ERROR ), - TokenTableEntry("err_detail", LFT_SQUID_ERROR_DETAIL ), - TokenTableEntry("note", LFT_NOTE ), diff --git a/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch b/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch similarity index 92% rename from src/patches/squid/squid-4.4-fix-max-file-descriptors.patch rename to src/patches/squid/squid-4.5-fix-max-file-descriptors.patch index 8d1a4e03a..57fd0a6a6 100644 --- a/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch +++ b/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch @@ -1,6 +1,6 @@ --- configure.ac.~ Wed Apr 20 14:26:07 2016 +++ configure.ac Fri Apr 22 17:20:46 2016 -@@ -3156,6 +3156,9 @@ +@@ -3160,6 +3160,9 @@ ;; esac @@ -10,7 +10,7 @@ dnl --with-maxfd present for compatibility with Squid-2. dnl undocumented in ./configure --help to encourage using the Squid-3 directive AC_ARG_WITH(maxfd,, -@@ -3186,8 +3189,6 @@ +@@ -3190,8 +3193,6 @@ esac ]) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4c76d08b2a1ef5ac9ff8b546c0d887e342adec1c
by Arne Fitzenreiter 02 Jan '19

02 Jan '19

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 4c76d08b2a1ef5ac9ff8b546c0d887e342adec1c (commit) from 67c9261257542c09407f54280e3b4e764c24ebaa (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 4c76d08b2a1ef5ac9ff8b546c0d887e342adec1c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 2 15:33:16 2019 +0100 kernel: fix generation of framebuffer blacklist modules are now xz compressed. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 346378819..645ebb9e1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -211,14 +211,14 @@ ifeq "$(LASTKERNEL)" "1" echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf # Blacklist old framebuffer modules - for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \ + for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko.xz); do \ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done # Blacklist new drm framebuffer modules - for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \ + for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko.xz); do \ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf + sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf # Disable ipv6 at runtime echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 55a95ac7168863a617f9ee19fc769ae943168981
by Michael Tremer 30 Dec '18

30 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 55a95ac7168863a617f9ee19fc769ae943168981 (commit) from 06b014b20404a2ee81e7a6c6a61646f0a197017a (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 55a95ac7168863a617f9ee19fc769ae943168981 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 30 18:34:03 2018 +0000 kernel: Enable MSR module This is required for cpupower Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/config-x86-generic | 4 ++-- kernel/kernel.nm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index cfb0bced4..0bdeab015 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -151,8 +151,8 @@ CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_X86_MSR is not set -CONFIG_X86_CPUID=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y # CONFIG_X86_CPA_STATISTICS is not set diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 50424e1bd..1e14de497 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.20 -release = 8 +release = 9 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 06b014b20404a2ee81e7a6c6a61646f0a197017a
by Michael Tremer 30 Dec '18

30 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 06b014b20404a2ee81e7a6c6a61646f0a197017a (commit) via fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e (commit) via f55e2a21c45014acc599899915578df6395137dd (commit) via fa4b3a6b1ecb03f49f8d53cc7e2ced0ce2df49dc (commit) from 29c70149e3a04f360d5f013ee58b11cd13018aca (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 06b014b20404a2ee81e7a6c6a61646f0a197017a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 30 14:28:53 2018 +0000 kernel: Configure cpufreq governor to performance This patch also enabled all cpufreq drivers as modules Fixes: #11373 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 30 14:23:52 2018 +0000 kernel: Change ASPM policy to default Fixes: #11372 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f55e2a21c45014acc599899915578df6395137dd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 30 14:22:13 2018 +0000 kernel: Disable support for 6RD Fixes: #11370 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fa4b3a6b1ecb03f49f8d53cc7e2ced0ce2df49dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 30 14:20:51 2018 +0000 kernel: configure: Pass arch as an extra argument Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/README.md | 12 +++++------- kernel/config-arm-generic | 10 +++++++--- kernel/config-arm32-generic | 17 +++++++++-------- kernel/config-generic | 12 +++++++----- kernel/config-x86-generic | 6 ++---- kernel/kernel.nm | 2 +- kernel/scripts/configure | 25 ++++++++++--------------- 7 files changed, 41 insertions(+), 43 deletions(-) Difference in files: diff --git a/kernel/README.md b/kernel/README.md index 26a3f79a7..90083aaa4 100644 --- a/kernel/README.md +++ b/kernel/README.md @@ -17,7 +17,8 @@ the kernel directory: # pakfire-builder shell kernel.nm (pakfire-shell)> cd /usr/src/packages/kernel-x.y.z... -The following commands are available: +The following commands are available. Appending the <arch> argument allows you +to edit a specific architecture. Default is x86_64. #### oldconfig @@ -25,7 +26,7 @@ You can run this when updating the kernel to a new release or after changing any options manually. All unset or updated options will be prompted for and all configuration files for all architectures will be updated. - (pakfire-shell)> scripts/configure oldconfig + (pakfire-shell)> scripts/configure oldconfig <arch> #### olddefconfig @@ -39,13 +40,10 @@ If you want to edit the configuration using the kernel's config editor. All configuration files will be updated afterwards and potentially prompted for options that diverge for different architectures. - (pakfire-shell)> scripts/configure menuconfig - -Appending the --arch= argument allows you to edit a specific architecture. -Default is x86_64. + (pakfire-shell)> scripts/configure menuconfig <arch> #### listnewconfig This will list all unset options. - (pakfire-shell)> scripts/configure listnewconfig + (pakfire-shell)> scripts/configure listnewconfig <arch> diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 8ca1a8835..af3ab1afc 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -39,8 +39,6 @@ CONFIG_PCI_DOMAINS_GENERIC=y CONFIG_PCI_SYSCALL=y # CONFIG_PCIEAER_INJECT is not set # CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCI_STUB is not set # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set @@ -63,10 +61,16 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_CPU_PM=y +# +# CPU Idle +# +CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y +CONFIG_DT_IDLE_STATES=y + # # ARM CPU Idle Drivers # -# CONFIG_ARM_CPUIDLE is not set +CONFIG_ARM_CPUIDLE=y # # CPU frequency scaling drivers diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index d05c9d68e..14f999bcb 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -108,6 +108,7 @@ CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y # CONFIG_EXYNOS5420_MCPM is not set +CONFIG_EXYNOS_CPU_SUSPEND=y CONFIG_PLAT_SAMSUNG=y # @@ -398,8 +399,8 @@ CONFIG_AUTO_ZRELADDR=y # CPU frequency scaling drivers # CONFIG_ARM_BIG_LITTLE_CPUFREQ=m -# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set -CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y +CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m +CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m CONFIG_ARM_HIGHBANK_CPUFREQ=m CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_ARM_MEDIATEK_CPUFREQ=m @@ -407,16 +408,16 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y CONFIG_ARM_STI_CPUFREQ=m CONFIG_ARM_TEGRA20_CPUFREQ=y CONFIG_ARM_TEGRA124_CPUFREQ=m -# CONFIG_ARM_TI_CPUFREQ is not set +CONFIG_ARM_TI_CPUFREQ=y # # ARM CPU Idle Drivers # -# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set -# CONFIG_ARM_HIGHBANK_CPUIDLE is not set -# CONFIG_ARM_ZYNQ_CPUIDLE is not set -# CONFIG_ARM_U8500_CPUIDLE is not set -# CONFIG_ARM_EXYNOS_CPUIDLE is not set +CONFIG_ARM_BIG_LITTLE_CPUIDLE=y +CONFIG_ARM_HIGHBANK_CPUIDLE=y +CONFIG_ARM_ZYNQ_CPUIDLE=y +CONFIG_ARM_U8500_CPUIDLE=y +CONFIG_ARM_EXYNOS_CPUIDLE=y CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # diff --git a/kernel/config-generic b/kernel/config-generic index f44d360e2..c9654e42a 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -246,15 +246,15 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_ATTR_SET=y CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y @@ -286,6 +286,8 @@ CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y @@ -638,7 +640,7 @@ CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y +# CONFIG_IPV6_SIT_6RD is not set CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_GRE=m diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 6b3ae388d..cfb0bced4 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -286,12 +286,12 @@ CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_AMD_FREQ_SENSITIVITY is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_P4_CLOCKMOD=y +CONFIG_X86_P4_CLOCKMOD=m # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=y +CONFIG_X86_SPEEDSTEP_LIB=m # # CPU Idle @@ -308,8 +308,6 @@ CONFIG_MMCONF_FAM10H=y # CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIE_ECRC=y -# CONFIG_PCIEASPM_DEFAULT is not set -CONFIG_PCIEASPM_POWERSAVE=y # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_PF_STUB=m diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 5dce3cf73..50424e1bd 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.20 -release = 5 +release = 8 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> diff --git a/kernel/scripts/configure b/kernel/scripts/configure index 2d45dd16e..b2c1fa371 100755 --- a/kernel/scripts/configure +++ b/kernel/scripts/configure @@ -164,8 +164,13 @@ function merge_config() { # This function runs an interactive "make oldconfig". function make_config() { - local arch="${1}" - shift + local action="${1}" + local arch="${2}" + + # Default to x86_64 when no arch is given + if [ -z "${arch}" ]; then + arch="x86_64" + fi # Detect kernel arch local kernel_arch="$(get_kernel_arch "${arch}")" @@ -182,7 +187,7 @@ function make_config() { cat ${config_in} > .config echo "You may now edit the configuration..." - make ARCH=${kernel_arch} "$@" + make ARCH=${kernel_arch} "${action}" cat .config > ${config_out} popd @@ -296,7 +301,6 @@ function diff_configs() { rm -rf ${tmpdir} } -ARCH="x86_64" KERNEL_DIR="$(search_kernel_dir)" # Parse commandline. @@ -313,16 +317,7 @@ while [ $# -gt 0 ]; do ;; listnewconfig|menuconfig|merge|oldconfig|olddefconfig) action=${arg} - ;; - - # Parse switches - --arch=*) - ARCH="${arg#*=}" - - if ! get_platform "${ARCH}" &>/dev/null; then - echo "Unknown architecture: ${ARCH}" >&2 - exit 2 - fi + break ;; esac done @@ -343,7 +338,7 @@ case "${action}" in exit $? ;; listnewconfig|menuconfig|oldconfig|olddefconfig) - make_config "${ARCH}" "${action}" + make_config "${action}" "$@" exit $? ;; esac hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM