From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e53c38aea14132da0fff15655735f673aab33c4a Date: Tue, 03 Mar 2020 18:10:28 +0000 Message-ID: <48X4n05yk5z2xyB@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7760024821055450425==" List-Id: --===============7760024821055450425== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, 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 Date: Tue Mar 3 13:25:17 2020 +0100 core142: fix typo's at remove/update dns forwareders changes =20 Signed-off-by: Arne Fitzenreiter commit 1773544d025591d4096ee91bcc598dac19fa0f24 Author: Arne Fitzenreiter Date: Tue Mar 3 13:23:29 2020 +0100 kernel: update to 4.14.172 =20 Signed-off-by: Arne Fitzenreiter commit b5afe1e8d55525462b27e6147182f2bd0623fc56 Author: Arne Fitzenreiter Date: Mon Mar 2 22:25:41 2020 +0000 backup: add /var/ipfire/dns/server to include =20 Signed-off-by: Arne Fitzenreiter commit 3b5131c1a3416c9c9aef1365d3787abea197d37d Author: Arne Fitzenreiter Date: Mon Mar 2 17:54:48 2020 +0000 unbound: drop remove-dns-fowarders at red.down =20 this functions has only reloaded unbound config which is useless at shutting down the red interface. =20 Signed-off-by: Arne Fitzenreiter commit e1c6cd05e3a1f08b28f8d0eea4736c829f12b06f Author: Arne Fitzenreiter Date: Mon Mar 2 08:15:00 2020 +0000 udev: build after kmod =20 eudev depends on kmod to install all needed rules =20 Signed-off-by: Arne Fitzenreiter commit c8b574c3078b35c272960ac0b26de6dded845467 Author: Arne Fitzenreiter Date: Sun Mar 1 21:54:28 2020 +0000 core142: stop squid and suricata while update =20 Signed-off-by: Arne Fitzenreiter commit 770a1507dd750fe98f327919c9da576d6b996469 Author: Arne Fitzenreiter Date: Sun Mar 1 20:41:13 2020 +0100 unbound: speed-up remove forwarders =20 Signed-off-by: Arne Fitzenreiter commit b3ab7916e0102fa7e6f53fbf593072ea3dc30f89 Author: Arne Fitzenreiter Date: Sun Mar 1 19:41:16 2020 +0100 core142: ship unbound initskript =20 Signed-off-by: Arne Fitzenreiter commit 47864e8f3d8050b7a681b4bcbafe33a836013af4 Author: Arne Fitzenreiter Date: Sun Mar 1 19:41:15 2020 +0100 unbound: fix typo at safesearch for googe =20 Signed-off-by: Arne Fitzenreiter commit d98bbcc8494d4037df2572098fa9ea77f932ce1a Author: Arne Fitzenreiter Date: Sun Mar 1 19:41:14 2020 +0100 unbound: run "time-fix" before savesearch resolves =20 Signed-off-by: Arne Fitzenreiter commit 605575033c58c59c9f8673c50ee2f0a61988a0ee Author: Arne Fitzenreiter Date: Sun Mar 1 19:41:13 2020 +0100 unbound: update savesearch after reload configfiles =20 Signed-off-by: Arne Fitzenreiter commit 89440b2d0a8ad6cf1f58b2588e7e8538657fbbd9 Author: St=C3=A9phane Pautrel Date: Fri Feb 28 15:32:21 2020 +0000 lang: Improvements to French translation =20 This patch adds translations for the new DNS part as well as various improvements. =20 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter commit 9acb792b8f4ef315d921207f7f872651b072299e Author: Arne Fitzenreiter Date: Sun Mar 1 19:45:30 2020 +0000 core142: add kmod to updater =20 Signed-off-by: Arne Fitzenreiter commit 1ece41ec51680390ba895130e7aeab6a1cd3a458 Author: Michael Tremer Date: Thu Feb 27 14:53:48 2020 +0000 kmod: Update to 26 =20 This patch links kmod against OpenSSL which is required to decode the kernel modules' PKCS#7 signatures. =20 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- 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 =3D> 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 =3D> core/142}/filelists/kmod (100%) delete mode 100644 src/initscripts/networking/red.down/05-remove-dns-forward= ers 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/c= ommon/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/comm= on/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/co= mmon/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/cor= e/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 =20 # 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 =20 # Extract files extract_files =20 # 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 =20 # update linker config ldconfig @@ -121,6 +126,9 @@ done /usr/local/bin/filesystem-cleanup =20 # Start services +/etc/init.d/unbound restart +/etc/init.d/suricata start +/etc/init.d/squid start =20 # 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 zonesla= ve amount error WARNING: untranslated string: Captive ACTIVATE =3D unknown string WARNING: untranslated string: Captive clients =3D unknown string WARNING: untranslated string: Scan for Songs =3D unknown string -WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string WARNING: untranslated string: dns =3D unknown string -WARNING: untranslated string: dns check servers =3D Check DNS Servers -WARNING: untranslated string: dns configuration =3D DNS Configuration -WARNING: untranslated string: dns enable safe-search =3D Enable Safe Search -WARNING: untranslated string: dns isp assigned nameserver =3D ISP-assigned D= NS server -WARNING: untranslated string: dns isp nameservers and tls not allowed =3D IS= P-assigned DNS servers and TLS cannot be used at the same time. -WARNING: untranslated string: dns mode for qname minimisation =3D QNAME Mini= misation -WARNING: untranslated string: dns no address given =3D No IP Address given. -WARNING: untranslated string: dns no tls hostname given =3D No TLS hostname = given. -WARNING: untranslated string: dns recursor mode =3D Recursor Mode -WARNING: untranslated string: dns tls hostname =3D TLS Hostname -WARNING: untranslated string: dns use isp assigned nameservers =3D Use ISP-a= ssigned DNS servers -WARNING: untranslated string: dns use protocol for dns queries =3D Protocol = for DNS queries WARNING: untranslated string: fwhost cust geoipgrp =3D unknown string WARNING: untranslated string: fwhost err hostip =3D unknown string WARNING: untranslated string: guardian block a host =3D unknown string @@ -859,7 +848,6 @@ WARNING: untranslated string: guardian service =3D unknow= n string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: info messages =3D unknown string WARNING: untranslated string: no data =3D unknown string -WARNING: untranslated string: not validating =3D Not validating WARNING: untranslated string: pakfire ago =3D ago. WARNING: untranslated string: pakfire invalid tree =3D Invalid repository se= lected WARNING: untranslated string: pakfire tree =3D Repository @@ -870,7 +858,4 @@ WARNING: untranslated string: route config changed =3D un= known string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string WARNING: untranslated string: routing table =3D unknown string -WARNING: untranslated string: standard =3D Standard -WARNING: untranslated string: strict =3D Strict WARNING: untranslated string: vpn statistics n2n =3D unknown string -WARNING: untranslated string: working =3D 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' =3D> 'Adresses MAC interdites (une par ligne) = ', 'advproxy basic authentication' =3D> 'Autoriser l\'authentification HTTP bas= ique', 'advproxy cache management' =3D> 'Gestion du cache', -'advproxy cache replacement policy' =3D> 'Politique du cache de remplacement= ', +'advproxy cache replacement policy' =3D> 'Politique cache de remplacement ', 'advproxy cache-digest' =3D> 'Activer la g=C3=A9n=C3=A9ration de Cache-Diges= t ', 'advproxy chgwebpwd ERROR' =3D> 'E R R E U R :', 'advproxy chgwebpwd SUCCESS' =3D> 'S U C C E S :', @@ -320,7 +320,7 @@ 'advproxy errmsg radius server' =3D> 'Adresse IP du serveur RADIUS non valid= e', 'advproxy errmsg time restriction' =3D> 'Restriction horaire non valide', 'advproxy errmsg wpad invalid ip or mask' =3D> 'WPAD : IP ou sous-r=C3=A9sea= u invalide pour le sous-r=C3=A9seau IP exclu', -'advproxy error design' =3D> 'Construction des messages erron=C3=A9s ', +'advproxy error design' =3D> 'Construction messages erron=C3=A9s ', 'advproxy error language' =3D> 'Langage des messages erron=C3=A9s ', 'advproxy fake referer' =3D> 'Fausses r=C3=A9f=C3=A9rences soumises aux site= s externes ', 'advproxy fake useragent' =3D> 'Faux useragent soumis aux sites externes ', @@ -508,6 +508,7 @@ 'blue access use hint' =3D> 'Vous devez saisir l\'adresse IP ou MAC de votre= p=C3=A9riph=C3=A9rique. Vous pouvez =C3=A9galement saisir les deux', 'blue interface' =3D> 'Interface BLEUE', 'broadcast' =3D> 'Diffusion', +'broken' =3D> 'Rompu', 'broken pipe' =3D> 'Lien rompu', 'buffered memory' =3D> 'M=C3=A9moire tampon', 'buffers' =3D> 'tampons', @@ -840,23 +841,36 @@ 'dns address done' =3D> 'Les adresses du serveur DNS vont =C3=AAtre sauvegar= d=C3=A9es.', 'dns address recon' =3D> 'Tentative de reconnexion !', 'dns check failed' =3D> 'La v=C3=A9rification DNS a =C3=A9chou=C3=A9e', +'dns check servers' =3D> 'V=C3=A9rif. serveurs DNS', +'dns configuration' =3D> 'DNS Configuration DNS', +'dns could not add server' =3D> 'Ne peut ajouter le serveur - Motif :', 'dns desc' =3D> 'Si l\'interface ROUGE0 obtient ses informations d\'adresse = IP via le DHCP du fournisseur d\'acc=C3=A8s, les adresses du serveur DNS sero= nt d=C3=A9finies automatiquement. Sinon, vous pouvez =C3=A9galement remplacer= les adresses IP du serveur DNS par celles de votre choix.', +'dns enable safe-search' =3D> 'Activer recherche s=C3=A9curis=C3=A9e', 'dns error 0' =3D> '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' =3D> 'Les adresses IP du premier et du second serveur DNS ne sont pas valides, veuillez revoir vos saisi= es', 'dns error 1' =3D> '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 forward disable dnssec' =3D> 'D=C3=A9sactiver DNSSEC (dangereux)', 'dns forwarding dnssec disabled notice' =3D> '(DNSSEC d=C3=A9sactiv=C3=A9)', 'dns header' =3D> 'Assigner les adresses du serveur DNS seulement pour le DH= CP sur ROUGE0', +'dns isp assigned nameserver' =3D> 'Serveur DNS attribu=C3=A9 par le FAI', +'dns isp nameservers and tls not allowed' =3D> 'Les serveurs DNS et TLS attr= ibu=C3=A9s par le FAI ne peuvent pas =C3=AAtre utilis=C3=A9s en m=C3=AAme tem= ps.', 'dns list' =3D> 'Liste de serveurs DNS publiques gratuits', 'dns menu' =3D> 'Assigner un serveur DNS', +'dns mode for qname minimisation' =3D> 'Minimisation de QNAME', 'dns new 0' =3D> 'Nouvelle adresse IP du premier serveur DN= S :', 'dns new 1' =3D> 'Nouvelle adresse IP du second serveur DNS= :', +'dns no address given' =3D> 'Aucune adresse IP donn=C3=A9e.', +'dns no tls hostname given' =3D> 'Aucun nom d\'h=C3=B4te TLS donn=C3=A9.', 'dns proxy server' =3D> 'Serveur proxy DNS', +'dns recursor mode' =3D> 'Ex=C3=A9cution en mode r=C3=A9cursif.', 'dns saved' =3D> 'Sauvegarde effectu=C3=A9e !', 'dns saved txt' =3D> 'La sauvegarde des deux adresses saisies du serveur DNS= a =C3=A9t=C3=A9 effect=C3=A9e correctement.
Vous devez red=C3=A9marrer = ou vous reconnecter pour que les changements prennent effets !', 'dns server' =3D> 'Serveur DNS', 'dns servers' =3D> 'Serveurs DNS', 'dns title' =3D> 'Nom du domaine syst=C3=A8me', +'dns tls hostname' =3D> 'Nom d\'h=C3=B4te TLS', +'dns use isp assigned nameservers' =3D> 'Utiliser des serveurs DNS attribu= =C3=A9s par le FAI', +'dns use protocol for dns queries' =3D> 'Protocole pour les requ=C3=AAtes DN= S', 'dnsforward' =3D> 'Transfert DNS', 'dnsforward add a new entry' =3D> 'Ajouter une nouvelle entr=C3=A9e', 'dnsforward configuration' =3D> 'Configuration de transfert DNS', @@ -865,11 +879,11 @@ 'dnsforward entries' =3D> 'Entr=C3=A9es actuelles', 'dnsforward forward_servers' =3D> 'Nom des serveurs ', 'dnsforward zone' =3D> 'Zone ', -'dnssec aware' =3D> 'DNSSEC avis=C3=A9', +'dnssec aware' =3D> 'DNSSEC notifi=C3=A9', 'dnssec disabled warning' =3D> 'AVERTISSEMENT : DNSSEC a =C3=A9t=C3=A9 d=C3= =A9sactiv=C3=A9', 'dnssec information' =3D> 'Informations DNSSEC', 'dnssec not supported' =3D> 'DNSSEC non support=C3=A9', -'dnssec validating' =3D> 'Validation DNSSEC', +'dnssec validating' =3D> 'DNSSEC valid=C3=A9', 'do not log this port list' =3D> 'Ne pas inscrire cette liste de ports dans = le journal (r=C3=A9duit la taille du journal)', 'dod' =3D> 'Connexion =C3=A0 la demande', 'dod for dns' =3D> 'Connexion =C3=A0 la demande pour le DNS :', @@ -1121,7 +1135,7 @@ 'fwdfw change' =3D> 'Mettre =C3=A0 jour', 'fwdfw copy' =3D> 'Copie', 'fwdfw delete' =3D> 'Supprime', -'fwdfw dnat' =3D> 'Destination NAT (Port forwarding)', +'fwdfw dnat' =3D> 'Destination NAT (redirection de port)', 'fwdfw dnat error' =3D> 'Vous devez choisir un seul h=C3=B4te pour DNAT. Les= groupes ou r=C3=A9seaux ne sont pas autoris=C3=A9s.', 'fwdfw dnat extport' =3D> 'Le port externe doit =C3=AAtre vide lors de l\'ut= ilisation de r=C3=A8gles NAT source.', 'fwdfw dnat nochoice' =3D> 'Veuillez choisir un NAT source ou un NAT de dest= ination dans la section NAT.', @@ -1399,7 +1413,7 @@ 'ids show' =3D> 'Afficher', 'ids working' =3D> 'Les modifications sont en cours d\'application. Veuillez= patienter jusqu\'=C3=A0 ce que toutes les op=C3=A9rations soient termin=C3= =A9es avec succ=C3=A8s...', 'iface' =3D> 'Iface', -'ignore filter' =3D> 'Filtre d\'exclusion ', +'ignore filter' =3D> 'Filtre exclusion ', 'ike encryption' =3D> 'Chiffrement IKE :', 'ike grouptype' =3D> 'Type de groupe IKE :', 'ike integrity' =3D> 'Int=C3=A9grit=C3=A9 IKE :', @@ -1415,7 +1429,7 @@ 'incoming' =3D> 'entrant', 'incoming compression in bytes per second' =3D> 'Compression entrante', 'incoming firewall access' =3D> 'Acc=C3=A8s entrant du pare-feu', -'incoming overhead in bytes per second' =3D> 'Incoming Overhead', +'incoming overhead in bytes per second' =3D> 'Surcharge entrante (octets/s)', 'incoming traffic in bytes per second' =3D> 'Trafic entrant', 'incorrect password' =3D> 'Mot de passe incorrect', 'info' =3D> 'Info', @@ -1538,10 +1552,10 @@ 'iptmangles' =3D> 'Table IP Mangle ', 'iptnats' =3D> 'Traduction d\'adresses r=C3=A9seaux table IP ', 'ipts' =3D> 'Tables IP ', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'R=C3=A9glages ISDN suppl=C3=A9mentaires :', -'isdn1' =3D> 'ISDN unique', -'isdn2' =3D> 'Double ISDN', +'isdn' =3D> 'RNIS', +'isdn settings' =3D> 'R=C3=A9glages RNIS suppl=C3=A9mentaires :', +'isdn1' =3D> 'RNIS unique', +'isdn2' =3D> 'RNIS double', 'itlb multihit' =3D> 'MultiHit iTLB', 'january' =3D> 'Janvier', 'javascript menu error1' =3D> 'Si les menus d=C3=A9roulants ne fonctionnent = pas, d=C3=A9sactivez le Javascript sur la', @@ -1561,7 +1575,7 @@ 'last activity' =3D> 'Derni=C3=A8re activit=C3=A9', 'lateprompting' =3D> 'Derni=C3=A8re action', 'lease expires' =3D> 'Bail expir=C3=A9', -'least preferred' =3D> 'le moins appr=C3=A9ci=C3=A9', +'least preferred' =3D> 'le moins souhait=C3=A9', 'legend' =3D> 'L=C3=A9gende ', 'length' =3D> 'Longueur', 'lifetime' =3D> 'Dur=C3=A9e de vie :', @@ -1729,7 +1743,7 @@ 'monthly volume start day short' =3D> 'Premier jour', 'months' =3D> 'mois', 'more' =3D> 'plus', -'most preferred' =3D> 'le davantage pr=C3=A9f=C3=A9r=C3=A9', +'most preferred' =3D> 'le pr=C3=A9f=C3=A9r=C3=A9', 'mount' =3D> 'Monter', 'mounted on' =3D> 'Mont=C3=A9 en tant que', 'mpfire' =3D> 'Lecteur de m=C3=A9dias pour IPFire', @@ -1805,6 +1819,7 @@ 'not present' =3D> 'Absent', 'not running' =3D> 'ne fonctionne pas', 'not set' =3D> 'non fix=C3=A9', +'not validating' =3D> 'Pas de validation', 'notes' =3D> 'Notes', 'notice' =3D> 'Remarque ', 'november' =3D> 'Novembre', @@ -1822,6 +1837,7 @@ 'october' =3D> 'Octobre', 'off' =3D> 'off', 'ok' =3D> 'Ok', +'okay' =3D> 'Okay', 'older' =3D> 'Plus anciens', 'on' =3D> 'sur', 'one hour' =3D> 'Une heure', @@ -1893,9 +1909,9 @@ 'outgoing firewall reset' =3D> 'Tout r=C3=A9initialiser', 'outgoing firewall view group' =3D> 'Voir le groupe', 'outgoing firewall warning' =3D> 'Ne pas choisir IP source ou Mac ignore les= ', -'outgoing overhead in bytes per second' =3D> 'Outgoing Overhead', -'outgoing traffic in bytes per second' =3D> 'Trafic sortant', -'override mtu' =3D> 'Outrepasser le MTU par d=C3=A9faut', +'outgoing overhead in bytes per second' =3D> 'Surcharge en sortie (octets/s)= ', +'outgoing traffic in bytes per second' =3D> 'Trafic sortant (octets/s)', +'override mtu' =3D> 'Remplacer le MTU par d=C3=A9faut', 'ovpn' =3D> 'OpenVPN', 'ovpn add conf' =3D> 'Configuration additionnelle', 'ovpn con stat' =3D> 'Statistiques de connexions OpenVPN', @@ -2045,7 +2061,7 @@ 'proxy admin password' =3D> 'Mot de passe admnistrateur du cache ', 'proxy cachemgr' =3D> 'Activer le gestionnaire de cache ', 'proxy errmsg filedescriptors' =3D> 'Mauvais montant de fichier descripteurs= ', -'proxy filedescriptors' =3D> 'Nombre de descripteurs de fichier ', +'proxy filedescriptors' =3D> 'Nombre de descripteurs fichier ', 'proxy log viewer' =3D> 'Rapports de proxy', 'proxy logs' =3D> 'Rapports de proxy', 'proxy no proxy extend' =3D> 'O=C3=B9 sp=C3=A9cifier une liste de destinatio= n sans transit par le proxy', @@ -2286,6 +2302,7 @@ 'sssystem status' =3D> 'Statut syst=C3=A8me', 'sstraffic' =3D> 'Trafic r=C3=A9seau', 'sstraffic graphs' =3D> 'Graphiques du trafic', +'standard' =3D> 'Standard', 'standard login script' =3D> 'Script de connexion standard', 'start' =3D> 'D=C3=A9marrer', 'start address' =3D> 'Adresse de d=C3=A9but :', @@ -2300,6 +2317,7 @@ 'stop' =3D> 'Arr=C3=AAter', 'stop ovpn server' =3D> 'Arr=C3=AAter serveur OpenVPN', 'stopped' =3D> 'ARRETE', +'strict' =3D> 'Strict', 'subject' =3D> 'Sujet', 'subject test' =3D> 'Email de test', 'subject warn' =3D> 'Attention - Le niveau d\'alerte a =C3=A9t=C3=A9 atteint= ', @@ -2534,7 +2552,7 @@ 'updxlrtr save and restart' =3D> 'Sauvegarder et red=C3=A9marrer', 'updxlrtr source' =3D> 'Source', 'updxlrtr source checkup' =3D> 'V=C3=A9rifications des sources', -'updxlrtr source checkup schedule' =3D> 'Fr=C3=A9quence de v=C3=A9rification= des sources ', +'updxlrtr source checkup schedule' =3D> 'Fr=C3=A9quence v=C3=A9rification de= s sources ', 'updxlrtr sources' =3D> 'Sources', 'updxlrtr standard view' =3D> 'Vue standard', 'updxlrtr statistics' =3D> 'Statistiques', @@ -2817,7 +2835,7 @@ 'vpn force mobike' =3D> 'Force utilisation MOBIKE (seulement IKEv2)', 'vpn inactivity timeout' =3D> 'D=C3=A9lai d=C3=A9pass=C3=A9 inactivit=C3=A9', 'vpn incompatible use of defaultroute' =3D> 'hostname=3D%defaultroute non ad= mis', -'vpn keyexchange' =3D> 'Keyexchange', +'vpn keyexchange' =3D> '=C3=89change de cl=C3=A9s', 'vpn local id' =3D> 'ID Local', 'vpn missing remote id' =3D> 'Vous devez sp=C3=A9cifier un nom unique correc= t (DN) pour cette authentification.', 'vpn mtu invalid' =3D> 'MTU doit =C3=AAtre une valeur num=C3=A9rique !', @@ -2866,13 +2884,13 @@ 'wireless configuration' =3D> 'Configuration r=C3=A9seau sans fil', 'wireless network' =3D> 'R=C3=A9seau wifi', 'wlan client' =3D> 'Client r=C3=A9seau sans fil', -'wlan client advanced settings' =3D> 'Param=C3=A8tres avanc=C3=A9s', +'wlan client advanced settings' =3D> 'Param=C3=A8tres avanc=C3=A9s ', 'wlan client and' =3D> 'et', -'wlan client anonymous identity' =3D> 'Identit=C3=A9 anonyme', +'wlan client anonymous identity' =3D> 'Identit=C3=A9 anonyme ', 'wlan client auth auto' =3D> 'Auto', 'wlan client auth peap' =3D> 'PEAP', 'wlan client auth ttls' =3D> 'TTLS', -'wlan client authentication settings' =3D> 'Param=C3=A8tres d\'authentificat= ion', +'wlan client authentication settings' =3D> 'Param=C3=A8tres d\'authentificat= ion ', 'wlan client bssid' =3D> 'BSSID', 'wlan client ccmp' =3D> 'CCMP', 'wlan client configuration' =3D> 'Configuration client sans fil', @@ -2882,7 +2900,7 @@ 'wlan client eap phase2 method' =3D> 'M=C3=A9thode phase 2 EAP', 'wlan client eap state' =3D> 'Statut EAP', 'wlan client edit entry' =3D> 'Modifier la configuration du client sans fil', -'wlan client encryption' =3D> 'Chiffrement', +'wlan client encryption' =3D> 'Chiffrement ', 'wlan client encryption eap' =3D> 'EAP', 'wlan client encryption none' =3D> 'Aucun', 'wlan client encryption wep' =3D> 'WEP', @@ -2890,7 +2908,7 @@ 'wlan client encryption wpa2' =3D> 'WPA2', 'wlan client group cipher' =3D> 'Chiffrer groupe', 'wlan client group key algorithm' =3D> 'GKA', -'wlan client identity' =3D> 'Identit=C3=A9', +'wlan client identity' =3D> 'Identit=C3=A9 ', 'wlan client invalid key length' =3D> 'Longueur de cl=C3=A9 invalide.', 'wlan client method' =3D> 'M=C3=A9thode', 'wlan client new entry' =3D> 'Cr=C3=A9er une nouvelle configuration de clien= t sans fil', @@ -2898,13 +2916,13 @@ 'wlan client pairwise cipher' =3D> 'Chiffrer par paire', 'wlan client pairwise key algorithm' =3D> 'PKA', 'wlan client pairwise key group key' =3D> 'Cl=C3=A9 par paire / cl=C3=A9 de = groupe', -'wlan client password' =3D> 'Mot de passe', -'wlan client psk' =3D> 'Cl=C3=A9 pr=C3=A9-partag=C3=A9e', -'wlan client ssid' =3D> 'SSID', +'wlan client password' =3D> 'Mot de passe ', +'wlan client psk' =3D> 'Cl=C3=A9 pr=C3=A9-partag=C3=A9e ', +'wlan client ssid' =3D> 'SSID ', 'wlan client tkip' =3D> 'TKIP', 'wlan client tls cipher' =3D> 'Chiffrer TLS', 'wlan client tls version' =3D> 'Version TLS', -'wlan client wpa mode' =3D> 'Mode WPA', +'wlan client wpa mode' =3D> 'Mode WPA ', 'wlan client wpa mode all' =3D> 'Auto', 'wlan client wpa mode ccmp ccmp' =3D> 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' =3D> 'CCMP-TKIP', @@ -2941,6 +2959,7 @@ 'wlanap wlan status' =3D> 'Statut WLan', 'wol wakeup' =3D> 'R=C3=A9veil', 'workgroup' =3D> 'Groupe de travail', +'working' =3D> 'Working', 'written bytes' =3D> 'Octets =C3=A9crits', 'xtaccess all error' =3D> 'Vous ne pouvez pas donner l\'acc=C3=A8s externe = =C3=A0 tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' =3D> 'Si vous sp=C3=A9cifiez une plage de ports de = destination, la plage source doit =C3=AAtre identique !', diff --git a/lfs/kmod b/lfs/kmod index 4ef2088fd..39e350c02 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 25 +VER =3D 26 =20 THISAPP =3D kmod-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 34f325cab568f842fdde4f8b2182f220 +$(DL_FILE)_MD5 =3D 1129c243199bdd7db01b55a61aa19601 =20 install : $(TARGET) =20 @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --bindir=3D/bin \ --sysconfdir=3D/etc \ --disable-manpages \ + --with-openssl \ --with-xz \ --with-zlib =20 diff --git a/lfs/linux b/lfs/linux index 4914f7ea2..7f44702d0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ =20 include Config =20 -VER =3D 4.14.171 -ARM_PATCHES =3D 4.14.171-ipfire0 +VER =3D 4.14.172 +ARM_PATCHES =3D 4.14.172-ipfire0 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) CFLAGS =3D CXXFLAGS =3D =20 -PAK_VER =3D 91 +PAK_VER =3D 92 DEPS =3D "" =20 HEADERS_ARCH =3D $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =3D$(DL_FILE) \ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche= s-$(ARM_PATCHES).patch.xz =20 -$(DL_FILE)_MD5 =3D b9b2c64eb3ae7fa6023d2b8c981b5ac4 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D f1d5d1dcb1d60c6f8476938070= a65112 +$(DL_FILE)_MD5 =3D 782746859c7f365aeba49c08705c4c30 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D 3072dd813363b20361f80ecc74= 8a1084 =20 install : $(TARGET) =20 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 } =20 @@ -1133,6 +1131,8 @@ buildipfire() { lfsmake2 backup lfsmake2 openssl [ "${BUILD_ARCH}" =3D "i586" ] && lfsmake2 openssl KCFG=3D'-sse2' + lfsmake2 kmod + lfsmake2 udev lfsmake2 popt lfsmake2 libedit lfsmake2 libusb diff --git a/src/initscripts/networking/red.down/05-remove-dns-forwarders b/s= rc/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() { } =20 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 =20 @@ -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 =20 + # 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" =3D "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 ;; =20 status) statusproc /usr/sbin/unbound ;; =20 - update-forwarders) - $0 reload - - # Make sure DNS works at this point - fix_time_if_dns_fails - ;; - resolve) resolve "${2}" || exit $? ;; =20 *) - echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarder= s|remove-forwarders}" + echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarder= s}" exit 1 ;; esac hooks/post-receive -- IPFire 2.x development tree --===============7760024821055450425==--