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, master has been updated via e53c38aea14132da0fff15655735f673aab33c4a (commit) via 1773544d025591d4096ee91bcc598dac19fa0f24 (commit) via b5afe1e8d55525462b27e6147182f2bd0623fc56 (commit) via 3b5131c1a3416c9c9aef1365d3787abea197d37d (commit) via e1c6cd05e3a1f08b28f8d0eea4736c829f12b06f (commit) via c8b574c3078b35c272960ac0b26de6dded845467 (commit) via 770a1507dd750fe98f327919c9da576d6b996469 (commit) via b3ab7916e0102fa7e6f53fbf593072ea3dc30f89 (commit) via 47864e8f3d8050b7a681b4bcbafe33a836013af4 (commit) via d98bbcc8494d4037df2572098fa9ea77f932ce1a (commit) via 605575033c58c59c9f8673c50ee2f0a61988a0ee (commit) via 89440b2d0a8ad6cf1f58b2588e7e8538657fbbd9 (commit) via 9acb792b8f4ef315d921207f7f872651b072299e (commit) via 1ece41ec51680390ba895130e7aeab6a1cd3a458 (commit) from 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc (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 e53c38aea14132da0fff15655735f673aab33c4a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 3 13:25:17 2020 +0100

core142: fix typo's at remove/update dns forwareders changes

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 1773544d025591d4096ee91bcc598dac19fa0f24 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 3 13:23:29 2020 +0100

kernel: update to 4.14.172

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit b5afe1e8d55525462b27e6147182f2bd0623fc56 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 2 22:25:41 2020 +0000

backup: add /var/ipfire/dns/server to include

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 3b5131c1a3416c9c9aef1365d3787abea197d37d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 2 17:54:48 2020 +0000

unbound: drop remove-dns-fowarders at red.down

this functions has only reloaded unbound config which is useless at shutting down the red interface.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit e1c6cd05e3a1f08b28f8d0eea4736c829f12b06f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 2 08:15:00 2020 +0000

udev: build after kmod

eudev depends on kmod to install all needed rules

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit c8b574c3078b35c272960ac0b26de6dded845467 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 21:54:28 2020 +0000

core142: stop squid and suricata while update

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 770a1507dd750fe98f327919c9da576d6b996469 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 20:41:13 2020 +0100

unbound: speed-up remove forwarders

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit b3ab7916e0102fa7e6f53fbf593072ea3dc30f89 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 19:41:16 2020 +0100

core142: ship unbound initskript

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 47864e8f3d8050b7a681b4bcbafe33a836013af4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 19:41:15 2020 +0100

unbound: fix typo at safesearch for googe

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit d98bbcc8494d4037df2572098fa9ea77f932ce1a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 19:41:14 2020 +0100

unbound: run "time-fix" before savesearch resolves

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 605575033c58c59c9f8673c50ee2f0a61988a0ee Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 19:41:13 2020 +0100

unbound: update savesearch after reload configfiles

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 89440b2d0a8ad6cf1f58b2588e7e8538657fbbd9 Author: Stéphane Pautrel stephane.pautrel@gmail.com Date: Fri Feb 28 15:32:21 2020 +0000

lang: Improvements to French translation

This patch adds translations for the new DNS part as well as various improvements.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 9acb792b8f4ef315d921207f7f872651b072299e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 1 19:45:30 2020 +0000

core142: add kmod to updater

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 1ece41ec51680390ba895130e7aeab6a1cd3a458 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 27 14:53:48 2020 +0000

kmod: Update to 26

This patch links kmod against OpenSSL which is required to decode the kernel modules' PKCS#7 signatures.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/backup/include | 1 + config/rootfiles/common/aarch64/initscripts | 1 - config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/kmod | 2 +- config/rootfiles/common/x86_64/initscripts | 1 - config/rootfiles/core/142/filelists/files | 2 + .../{oldcore/125 => core/142}/filelists/kmod | 0 config/rootfiles/core/142/update.sh | 12 +++- doc/language_issues.fr | 19 +----- doc/language_missings | 19 ------ langs/fr/cgi-bin/fr.pl | 75 ++++++++++++++-------- lfs/kmod | 5 +- lfs/linux | 10 +-- make.sh | 4 +- .../networking/red.down/05-remove-dns-forwarders | 4 -- src/initscripts/system/unbound | 29 ++++----- 17 files changed, 87 insertions(+), 99 deletions(-) copy config/rootfiles/{oldcore/125 => core/142}/filelists/kmod (100%) delete mode 100644 src/initscripts/networking/red.down/05-remove-dns-forwarders

Difference in files: diff --git a/config/backup/include b/config/backup/include index 1190eda81..d33dcf099 100644 --- a/config/backup/include +++ b/config/backup/include @@ -31,6 +31,7 @@ /var/ipfire/*/*.conf /var/ipfire/*/config /var/ipfire/dhcp/* +/var/ipfire/dns/server /var/ipfire/dnsforward/* /var/ipfire/*/enable /var/ipfire/*/*enable* diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 34ea1433f..3c8dfc70a 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 34ea1433f..3c8dfc70a 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 9350b0e90..3f56c49cc 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index 4c9b448f7..ff9cda26d 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -9,6 +9,6 @@ sbin/rmmod #usr/lib/libkmod.la #usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.3.3 +usr/lib/libkmod.so.2.3.4 #usr/lib/pkgconfig/libkmod.pc #usr/share/bash-completion/completions/kmod diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 9350b0e90..3f56c49cc 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index 4d6c69adb..0ac4861cd 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/init.d/unbound etc/suricata/suricata.yaml lib/udev/network-hotplug-bridges opt/pakfire/etc/pakfire.conf @@ -12,4 +13,5 @@ srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/backup/include var/ipfire/suricata/ruleset-sources diff --git a/config/rootfiles/core/142/filelists/kmod b/config/rootfiles/core/142/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/core/142/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh index 581e8fd19..dd1377c1c 100644 --- a/config/rootfiles/core/142/update.sh +++ b/config/rootfiles/core/142/update.sh @@ -88,13 +88,18 @@ rm -rf /usr/lib/python2.7/site-packages/ddns rm -rf /usr/lib/pppd/2.4.7

# Stop services +/etc/init.d/squid stop +/etc/init.d/suricata stop + +# drop unbound remove and update forwarders +rm -f /etc/rc.d/init.d/networking/red.down/05-*-dns-forwarders

# Extract files extract_files

# move update forwarders below firewall -mv -f /etc/rc.d/init.d/netowrking/red.up/05-update-dns-forwarders \ - /etc/rc.d/init.d/netowrking/red.up/22-update-dns-forwarders +mv -f /etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders \ + /etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders

# update linker config ldconfig @@ -121,6 +126,9 @@ done /usr/local/bin/filesystem-cleanup

# Start services +/etc/init.d/unbound restart +/etc/init.d/suricata start +/etc/init.d/squid start

# remove lm_sensor config after collectd was started # to reserch sensors at next boot with updated kernel diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 928c37a46..3edee88df 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -231,6 +231,7 @@ WARNING: translation string unused: dns address deleted WARNING: translation string unused: dns address deleted txt WARNING: translation string unused: dns address done WARNING: translation string unused: dns address recon +WARNING: translation string unused: dns could not add server WARNING: translation string unused: dns desc WARNING: translation string unused: dns error 0 WARNING: translation string unused: dns error 01 @@ -511,6 +512,7 @@ WARNING: translation string unused: noservicename WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes +WARNING: translation string unused: okay WARNING: translation string unused: online help en WARNING: translation string unused: only red WARNING: translation string unused: open to all @@ -810,21 +812,8 @@ WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: Captive ACTIVATE = unknown string WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Scan for Songs = unknown string -WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: dns = unknown string -WARNING: untranslated string: dns check servers = Check DNS Servers -WARNING: untranslated string: dns configuration = DNS Configuration -WARNING: untranslated string: dns enable safe-search = Enable Safe Search -WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server -WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. -WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation -WARNING: untranslated string: dns no address given = No IP Address given. -WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode -WARNING: untranslated string: dns tls hostname = TLS Hostname -WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers -WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -859,7 +848,6 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: no data = unknown string -WARNING: untranslated string: not validating = Not validating WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire invalid tree = Invalid repository selected WARNING: untranslated string: pakfire tree = Repository @@ -870,7 +858,4 @@ 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: standard = Standard -WARNING: untranslated string: strict = Strict WARNING: untranslated string: vpn statistics n2n = unknown string -WARNING: untranslated string: working = Working diff --git a/doc/language_missings b/doc/language_missings index a427f5706..31ea82788 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -936,30 +936,11 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ -< broken -< dns check servers -< dns configuration -< dns could not add server -< dns enable safe-search -< dns isp assigned nameserver -< dns isp nameservers and tls not allowed -< dns mode for qname minimisation -< dns no address given -< dns no tls hostname given -< dns recursor mode -< dns tls hostname -< dns use isp assigned nameservers -< dns use protocol for dns queries -< not validating -< okay < pakfire invalid tree < pakfire tree < pakfire tree stable < pakfire tree testing < pakfire tree unstable -< standard -< strict -< working ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 6729cd6c5..ec81e3e36 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -256,7 +256,7 @@ '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 ', +'advproxy cache replacement policy' => 'Politique cache de remplacement ', 'advproxy cache-digest' => 'Activer la génération de Cache-Digest ', 'advproxy chgwebpwd ERROR' => 'E R R E U R :', 'advproxy chgwebpwd SUCCESS' => 'S U C C E S :', @@ -320,7 +320,7 @@ 'advproxy errmsg radius server' => 'Adresse IP du serveur RADIUS non valide', 'advproxy errmsg time restriction' => 'Restriction horaire non valide', 'advproxy errmsg wpad invalid ip or mask' => 'WPAD : IP ou sous-réseau invalide pour le sous-réseau IP exclu', -'advproxy error design' => 'Construction des messages erronés ', +'advproxy error design' => 'Construction messages erronés ', '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 ', @@ -508,6 +508,7 @@ 'blue access use hint' => 'Vous devez saisir l'adresse IP ou MAC de votre périphérique. Vous pouvez également saisir les deux', 'blue interface' => 'Interface BLEUE', 'broadcast' => 'Diffusion', +'broken' => 'Rompu', 'broken pipe' => 'Lien rompu', 'buffered memory' => 'Mémoire tampon', 'buffers' => 'tampons', @@ -840,23 +841,36 @@ '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 check servers' => 'Vérif. serveurs DNS', +'dns configuration' => 'DNS Configuration DNS', +'dns could not add server' => 'Ne peut ajouter le serveur - Motif :', '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 enable safe-search' => 'Activer recherche sécurisée', 'dns error 0' => 'L'adresse IP du <strong>premier</strong> serveur DNS n'est pas valide, veuillez revoir votre saisie<br />La saisie de l'adresse du <strong>second</strong> serveur DNS est valide.', 'dns error 01' => 'Les adresses IP du <strong>premier</strong> et du <strong>second</strong> serveur DNS ne sont pas valides, veuillez revoir vos saisies', 'dns error 1' => 'L'adresse IP du <strong>second</strong> serveur DNS n'est pas valide, veuillez revoir votre saisie<br />La saisie de l'adresse du <strong>premier</strong> serveur DNS est valide.', 'dns forward disable dnssec' => 'Désactiver DNSSEC (dangereux)', 'dns forwarding dnssec disabled notice' => '(DNSSEC désactivé)', 'dns header' => 'Assigner les adresses du serveur DNS seulement pour le DHCP sur ROUGE0', +'dns isp assigned nameserver' => 'Serveur DNS attribué par le FAI', +'dns isp nameservers and tls not allowed' => 'Les serveurs DNS et TLS attribués par le FAI ne peuvent pas être utilisés en même temps.', 'dns list' => 'Liste de serveurs DNS publiques gratuits', 'dns menu' => 'Assigner un serveur DNS', +'dns mode for qname minimisation' => 'Minimisation de QNAME', 'dns new 0' => 'Nouvelle adresse IP du <strong>premier</strong> serveur DNS :', 'dns new 1' => 'Nouvelle adresse IP du <strong>second</strong> serveur DNS :', +'dns no address given' => 'Aucune adresse IP donnée.', +'dns no tls hostname given' => 'Aucun nom d'hôte TLS donné.', 'dns proxy server' => 'Serveur proxy DNS', +'dns recursor mode' => 'Exécution en mode récursif.', 'dns saved' => 'Sauvegarde effectuée !', 'dns saved txt' => 'La sauvegarde des deux adresses saisies du serveur DNS a été effectée correctement.<br />Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets !', 'dns server' => 'Serveur DNS', 'dns servers' => 'Serveurs DNS', 'dns title' => 'Nom du domaine système', +'dns tls hostname' => 'Nom d'hôte TLS', +'dns use isp assigned nameservers' => 'Utiliser des serveurs DNS attribués par le FAI', +'dns use protocol for dns queries' => 'Protocole pour les requêtes DNS', 'dnsforward' => 'Transfert DNS', 'dnsforward add a new entry' => 'Ajouter une nouvelle entrée', 'dnsforward configuration' => 'Configuration de transfert DNS', @@ -865,11 +879,11 @@ 'dnsforward entries' => 'Entrées actuelles', 'dnsforward forward_servers' => 'Nom des serveurs ', 'dnsforward zone' => 'Zone ', -'dnssec aware' => 'DNSSEC avisé', +'dnssec aware' => 'DNSSEC notifié', 'dnssec disabled warning' => 'AVERTISSEMENT : DNSSEC a été désactivé', 'dnssec information' => 'Informations DNSSEC', 'dnssec not supported' => 'DNSSEC non supporté', -'dnssec validating' => 'Validation DNSSEC', +'dnssec validating' => 'DNSSEC validé', 'do not log this port list' => 'Ne pas inscrire cette liste de ports dans le journal (réduit la taille du journal)', 'dod' => 'Connexion à la demande', 'dod for dns' => 'Connexion à la demande pour le DNS :', @@ -1121,7 +1135,7 @@ 'fwdfw change' => 'Mettre à jour', 'fwdfw copy' => 'Copie', 'fwdfw delete' => 'Supprime', -'fwdfw dnat' => 'Destination NAT (Port forwarding)', +'fwdfw dnat' => 'Destination NAT (redirection de port)', 'fwdfw dnat error' => 'Vous devez choisir un seul hôte pour DNAT. Les groupes ou réseaux ne sont pas autorisés.', 'fwdfw dnat extport' => 'Le port externe doit être vide lors de l'utilisation de règles NAT source.', 'fwdfw dnat nochoice' => 'Veuillez choisir un NAT source ou un NAT de destination dans la section NAT.', @@ -1399,7 +1413,7 @@ 'ids show' => 'Afficher', 'ids working' => 'Les modifications sont en cours d'application. Veuillez patienter jusqu'à ce que toutes les opérations soient terminées avec succès...', 'iface' => 'Iface', -'ignore filter' => 'Filtre d'exclusion ', +'ignore filter' => 'Filtre exclusion ', 'ike encryption' => 'Chiffrement IKE :', 'ike grouptype' => 'Type de groupe IKE :', 'ike integrity' => 'Intégrité IKE :', @@ -1415,7 +1429,7 @@ 'incoming' => 'entrant', 'incoming compression in bytes per second' => 'Compression entrante', 'incoming firewall access' => 'Accès entrant du pare-feu', -'incoming overhead in bytes per second' => 'Incoming Overhead', +'incoming overhead in bytes per second' => 'Surcharge entrante (octets/s)', 'incoming traffic in bytes per second' => 'Trafic entrant', 'incorrect password' => 'Mot de passe incorrect', 'info' => 'Info', @@ -1538,10 +1552,10 @@ 'iptmangles' => 'Table IP Mangle ', 'iptnats' => 'Traduction d'adresses réseaux table IP ', 'ipts' => 'Tables IP ', -'isdn' => 'ISDN', -'isdn settings' => 'Réglages ISDN supplémentaires :', -'isdn1' => 'ISDN unique', -'isdn2' => 'Double ISDN', +'isdn' => 'RNIS', +'isdn settings' => 'Réglages RNIS supplémentaires :', +'isdn1' => 'RNIS unique', +'isdn2' => 'RNIS double', 'itlb multihit' => 'MultiHit iTLB', 'january' => 'Janvier', 'javascript menu error1' => 'Si les menus déroulants ne fonctionnent pas, désactivez le Javascript sur la', @@ -1561,7 +1575,7 @@ 'last activity' => 'Dernière activité', 'lateprompting' => 'Dernière action', 'lease expires' => 'Bail expiré', -'least preferred' => 'le moins apprécié', +'least preferred' => 'le moins souhaité', 'legend' => 'Légende ', 'length' => 'Longueur', 'lifetime' => 'Durée de vie :', @@ -1729,7 +1743,7 @@ 'monthly volume start day short' => 'Premier jour', 'months' => 'mois', 'more' => 'plus', -'most preferred' => 'le davantage préféré', +'most preferred' => 'le préféré', 'mount' => 'Monter', 'mounted on' => 'Monté en tant que', 'mpfire' => 'Lecteur de médias pour IPFire', @@ -1805,6 +1819,7 @@ 'not present' => '<b>Absent</b>', 'not running' => 'ne fonctionne pas', 'not set' => 'non fixé', +'not validating' => 'Pas de validation', 'notes' => 'Notes', 'notice' => 'Remarque ', 'november' => 'Novembre', @@ -1822,6 +1837,7 @@ 'october' => 'Octobre', 'off' => 'off', 'ok' => 'Ok', +'okay' => 'Okay', 'older' => 'Plus anciens', 'on' => 'sur', 'one hour' => 'Une heure', @@ -1893,9 +1909,9 @@ 'outgoing firewall reset' => 'Tout réinitialiser', 'outgoing firewall view group' => 'Voir le groupe', 'outgoing firewall warning' => 'Ne pas choisir IP source ou Mac ignore les', -'outgoing overhead in bytes per second' => 'Outgoing Overhead', -'outgoing traffic in bytes per second' => 'Trafic sortant', -'override mtu' => 'Outrepasser le MTU par défaut', +'outgoing overhead in bytes per second' => 'Surcharge en sortie (octets/s)', +'outgoing traffic in bytes per second' => 'Trafic sortant (octets/s)', +'override mtu' => 'Remplacer le MTU par défaut', 'ovpn' => 'OpenVPN', 'ovpn add conf' => 'Configuration additionnelle', 'ovpn con stat' => 'Statistiques de connexions OpenVPN', @@ -2045,7 +2061,7 @@ 'proxy admin password' => 'Mot de passe admnistrateur du cache ', 'proxy cachemgr' => 'Activer le gestionnaire de cache ', 'proxy errmsg filedescriptors' => 'Mauvais montant de fichier descripteurs', -'proxy filedescriptors' => 'Nombre de descripteurs de fichier ', +'proxy filedescriptors' => 'Nombre de descripteurs fichier ', 'proxy log viewer' => 'Rapports de proxy', 'proxy logs' => 'Rapports de proxy', 'proxy no proxy extend' => 'Où spécifier une liste de destination sans transit par le proxy', @@ -2286,6 +2302,7 @@ 'sssystem status' => 'Statut système', 'sstraffic' => 'Trafic réseau', 'sstraffic graphs' => 'Graphiques du trafic', +'standard' => 'Standard', 'standard login script' => 'Script de connexion standard', 'start' => 'Démarrer', 'start address' => 'Adresse de début :', @@ -2300,6 +2317,7 @@ 'stop' => 'Arrêter', 'stop ovpn server' => 'Arrêter serveur OpenVPN', 'stopped' => 'ARRETE', +'strict' => 'Strict', 'subject' => 'Sujet', 'subject test' => 'Email de test', 'subject warn' => 'Attention - Le niveau d'alerte a été atteint', @@ -2534,7 +2552,7 @@ 'updxlrtr save and restart' => 'Sauvegarder et redémarrer', 'updxlrtr source' => 'Source', 'updxlrtr source checkup' => 'Vérifications des sources', -'updxlrtr source checkup schedule' => 'Fréquence de vérification des sources ', +'updxlrtr source checkup schedule' => 'Fréquence vérification des sources ', 'updxlrtr sources' => 'Sources', 'updxlrtr standard view' => 'Vue standard', 'updxlrtr statistics' => 'Statistiques', @@ -2817,7 +2835,7 @@ 'vpn force mobike' => 'Force utilisation MOBIKE (seulement IKEv2)', 'vpn inactivity timeout' => 'Délai dépassé inactivité', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute non admis', -'vpn keyexchange' => 'Keyexchange', +'vpn keyexchange' => 'Échange de clés', 'vpn local id' => 'ID Local', 'vpn missing remote id' => 'Vous devez spécifier un nom unique correct (DN) pour cette authentification.', 'vpn mtu invalid' => 'MTU doit être une valeur numérique !', @@ -2866,13 +2884,13 @@ 'wireless configuration' => 'Configuration réseau sans fil', 'wireless network' => 'Réseau wifi', 'wlan client' => 'Client réseau sans fil', -'wlan client advanced settings' => 'Paramètres avancés', +'wlan client advanced settings' => 'Paramètres avancés ', 'wlan client and' => 'et', -'wlan client anonymous identity' => 'Identité anonyme', +'wlan client anonymous identity' => 'Identité anonyme ', 'wlan client auth auto' => 'Auto', 'wlan client auth peap' => 'PEAP', 'wlan client auth ttls' => 'TTLS', -'wlan client authentication settings' => 'Paramètres d'authentification', +'wlan client authentication settings' => 'Paramètres d'authentification ', 'wlan client bssid' => 'BSSID', 'wlan client ccmp' => 'CCMP', 'wlan client configuration' => 'Configuration client sans fil', @@ -2882,7 +2900,7 @@ 'wlan client eap phase2 method' => 'Méthode phase 2 EAP', 'wlan client eap state' => 'Statut EAP', 'wlan client edit entry' => 'Modifier la configuration du client sans fil', -'wlan client encryption' => 'Chiffrement', +'wlan client encryption' => 'Chiffrement ', 'wlan client encryption eap' => 'EAP', 'wlan client encryption none' => 'Aucun', 'wlan client encryption wep' => 'WEP', @@ -2890,7 +2908,7 @@ 'wlan client encryption wpa2' => 'WPA2', 'wlan client group cipher' => 'Chiffrer groupe', 'wlan client group key algorithm' => 'GKA', -'wlan client identity' => 'Identité', +'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', @@ -2898,13 +2916,13 @@ 'wlan client pairwise cipher' => 'Chiffrer par paire', 'wlan client pairwise key algorithm' => 'PKA', 'wlan client pairwise key group key' => 'Clé par paire / clé de groupe', -'wlan client password' => 'Mot de passe', -'wlan client psk' => 'Clé pré-partagée', -'wlan client ssid' => 'SSID', +'wlan client password' => 'Mot de passe ', +'wlan client psk' => 'Clé pré-partagée ', +'wlan client ssid' => 'SSID ', 'wlan client tkip' => 'TKIP', 'wlan client tls cipher' => 'Chiffrer TLS', 'wlan client tls version' => 'Version TLS', -'wlan client wpa mode' => 'Mode WPA', +'wlan client wpa mode' => 'Mode WPA ', 'wlan client wpa mode all' => 'Auto', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', @@ -2941,6 +2959,7 @@ 'wlanap wlan status' => 'Statut WLan', 'wol wakeup' => 'Réveil', 'workgroup' => 'Groupe de travail', +'working' => 'Working', 'written bytes' => 'Octets écrits', 'xtaccess all error' => 'Vous ne pouvez pas donner l'accès externe à tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !', diff --git a/lfs/kmod b/lfs/kmod index 4ef2088fd..39e350c02 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@

include Config

-VER = 25 +VER = 26

THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 34f325cab568f842fdde4f8b2182f220 +$(DL_FILE)_MD5 = 1129c243199bdd7db01b55a61aa19601

install : $(TARGET)

@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --bindir=/bin \ --sysconfdir=/etc \ --disable-manpages \ + --with-openssl \ --with-xz \ --with-zlib

diff --git a/lfs/linux b/lfs/linux index 4914f7ea2..7f44702d0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@

include Config

-VER = 4.14.171 -ARM_PATCHES = 4.14.171-ipfire0 +VER = 4.14.172 +ARM_PATCHES = 4.14.172-ipfire0

THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =

-PAK_VER = 91 +PAK_VER = 92 DEPS = ""

HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz

-$(DL_FILE)_MD5 = b9b2c64eb3ae7fa6023d2b8c981b5ac4 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = f1d5d1dcb1d60c6f8476938070a65112 +$(DL_FILE)_MD5 = 782746859c7f365aeba49c08705c4c30 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 3072dd813363b20361f80ecc748a1084

install : $(TARGET)

diff --git a/make.sh b/make.sh index 07c0f52c2..984fc95b2 100755 --- a/make.sh +++ b/make.sh @@ -1111,7 +1111,6 @@ buildbase() { lfsmake2 pkg-config lfsmake2 make lfsmake2 man - lfsmake2 kmod lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -1121,7 +1120,6 @@ buildbase() { lfsmake2 tar lfsmake2 texinfo lfsmake2 util-linux - lfsmake2 udev lfsmake2 vim }

@@ -1133,6 +1131,8 @@ buildipfire() { lfsmake2 backup lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' + lfsmake2 kmod + lfsmake2 udev lfsmake2 popt lfsmake2 libedit lfsmake2 libusb diff --git a/src/initscripts/networking/red.down/05-remove-dns-forwarders b/src/initscripts/networking/red.down/05-remove-dns-forwarders deleted file mode 100644 index 671cca9df..000000000 --- a/src/initscripts/networking/red.down/05-remove-dns-forwarders +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Remove DNS forwarders for unbound -exec /etc/init.d/unbound remove-forwarders diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index b6b57f1c1..c845c436f 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -274,8 +274,6 @@ get_memory_amount() { }

fix_time_if_dns_fails() { - # Sometimes the first try fails so do it twice - resolve "ping.ipfire.org" &>/dev/null # If DNS is working, everything is fine if resolve "ping.ipfire.org" &>/dev/null; then return 0 @@ -534,7 +532,7 @@ update_safe_search() { for domain in ${google_tlds[@]}; do unbound-control local_zone "${domain}" transparent >/dev/null for address in ${addresses}; do - unbound-control local_data: "www.${domain} ${LOCAL_TTL} IN A ${address}" + unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}" done >/dev/null done

@@ -587,37 +585,38 @@ case "$1" in sleep 1 $0 start ;; - reload|remove-forwarders) + reload|update-forwarders) # Update configuration files write_forward_conf write_hosts_conf

+ # Call unbound-control and perform the reload + /usr/sbin/unbound-control -q reload + + # Dummy Resolve to wait for unbound + resolve "ping.ipfire.org" &>/dev/null + + if [ "$1" = "update-forwarders" ]; then + # Make sure DNS works at this point + fix_time_if_dns_fails + fi + # Update Safe Search rules if the system is online. if [ -e "/var/ipfire/red/active" ]; then update_safe_search fi - - # Call unbound-control and perform the reload - /usr/sbin/unbound-control -q reload ;;

status) statusproc /usr/sbin/unbound ;;

- update-forwarders) - $0 reload - - # Make sure DNS works at this point - fix_time_if_dns_fails - ;; - resolve) resolve "${2}" || exit $? ;;

*) - echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarders|remove-forwarders}" + echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarders}" exit 1 ;; esac

hooks/post-receive -- IPFire 2.x development tree