[git.ipfire.org] IPFire 2.x development tree branch, next, updated. da310b22465c5147fa5d63bb763d9b1963726eb8 - IPFire-SCM

29 Dec 2020

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  da310b22465c5147fa5d63bb763d9b1963726eb8 (commit)
       via  e49289c9ea0d1ccd1462aa0012d00f434e8ac259 (commit)
       via  2127c97b8f738a1d2b75d817a42d73145bde257c (commit)
       via  ed7f8152662d2371b7624fd4f26499f4236c35c2 (commit)
       via  438fce1f19d6e01058dfa04b0d7fa308d574121a (commit)
      from  2abcb7ee5f25becda8056c01c1e98faf80c57807 (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 da310b22465c5147fa5d63bb763d9b1963726eb8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 29 10:18:44 2020 +0000
core154: Ship logwatch
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e49289c9ea0d1ccd1462aa0012d00f434e8ac259
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Dec 25 13:07:18 2020 +0100
logwatch: Fix unmatched entries from clamav
This - cosmetic - patch fixes the unnecessary unmatched "Activating the newly
    loaded database..."-entries introduced with 'clamav 0.103.0'.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2127c97b8f738a1d2b75d817a42d73145bde257c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 29 10:17:09 2020 +0000
hostapd: Bump package version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ed7f8152662d2371b7624fd4f26499f4236c35c2
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Mon Dec 28 14:40:21 2020 +0100
wlanap.cgi: Cosmetic fix - replace 'Save' image with 'Save' button
Fixed syntax for "value"..
Thanks!
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 438fce1f19d6e01058dfa04b0d7fa308d574121a
Author: Stéphane Pautrel steph78630@gmail.com
Date:   Tue Dec 29 10:16:08 2020 +0000
lang: Update French translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 .../{oldcore/111 => core/154}/filelists/logwatch     |  0
 doc/language_issues.fr                               | 10 +---------
 doc/language_missings                                | 10 ----------
 html/cgi-bin/wlanap.cgi                              |  3 +--
 langs/fr/cgi-bin/fr.pl                               | 20 +++++++++++++++-----
 lfs/hostapd                                          |  2 +-
 lfs/logwatch                                         |  1 +
 .../logwatch-7.5.4-clamav_fix_unmatch_entries.patch  | 11 +++++++++++
 8 files changed, 30 insertions(+), 27 deletions(-)
 copy config/rootfiles/{oldcore/111 => core/154}/filelists/logwatch (100%)
 create mode 100644 src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch
Difference in files:

diff --git a/config/rootfiles/core/154/filelists/logwatch b/config/rootfiles/core/154/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4e2975903..2989678c1 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -769,6 +769,7 @@ WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: tor guard country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -875,11 +876,8 @@ WARNING: translation string unused: zoneconf val ppp assignment error
 WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: asn lookup failed = AS lookup failed
-WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
-WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
@@ -911,13 +909,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: ip basic info = Basic IP information
-WARNING: untranslated string: ip info for = IP information for
 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: tor guard country any = Any country
-WARNING: untranslated string: tor guard nodes = Guard Nodes
-WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
-WARNING: untranslated string: whois results from = WHOIS results from
diff --git a/doc/language_missings b/doc/language_missings
index ad70d5241..e14cdd000 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -960,23 +960,13 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < ansi t1.483
-< asn lookup failed
-< autonomous system
 < bewan adsl pci st
 < bewan adsl usb
 < dhcp deny known clients:
 < dhcp valid range required when deny known clients checked
-< dns enable safe-search youtube
 < g.dtm
 < g.lite
-< ip basic info
-< ip info for
-< tor guard country
-< tor guard country any
-< tor guard nodes
-< tor use guard nodes
 < upload fcdsl.o
-< whois results from
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index fd7e9a679..575b696d7 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -516,8 +516,7 @@ print <<END
 <table width='80%' cellspacing='0'>
 <tr><td align='center'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-       <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
+       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td>
 </tr>
 </table>
 END
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 66af01367..bc0a53df8 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -112,7 +112,7 @@
 'Port Rule' => 'Règle de port',
 'QoS not enabled' => 'La QoS n'est pas active !',
 'Queuelenght' => 'Taille de la file d'attente ',
-'Remote IP' => ' IP / Nom hôte distant (DynDNS) :',
+'Remote IP' => 'IP / Nom hôte distant (DynDNS) :',
 'Remote VPN IP' => 'Sous-réseau VPN (ex. 10.0.10.0/255.255.255.0) :',
 'Resolv' => 'Résoudre/réessayer :',
 'Scan for Files' => 'Recherche de fichiers',
@@ -449,6 +449,7 @@
 'are you sure' => 'Etes-vous sûr ?',
 'arp table entries' => 'Table d'entrées ARP :',
 'artist' => 'Artiste',
+'asn lookup failed' => 'La recherche AS a échoué',
 'atm device' => 'Périphérique :',
 'atm settings' => 'Réglages ATM',
 'attemps' => 'Tentatives',
@@ -456,7 +457,8 @@
 'august' => 'Août',
 'authentication' => 'Authentification :',
 'automatic' => 'Automatique',
-'available updates' => 'Mises à jour disponibles',
+'autonomous system' => 'Système autonome',
+'available updates' => 'Mises à jour disponibles :',
 'average' => 'Moyenne',
 'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande ! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l'un des trois numéros de réseau réservés, par exemple 10 / 8, 172.16/12, 192.168/16',
 'back' => 'Retour',
@@ -857,6 +859,7 @@
 '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 la recherche sécurisée',
+'dns enable safe-search youtube' => 'Inclure YouTube dans la 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.',
@@ -1535,7 +1538,9 @@
 'ip alias added' => 'Alias d'IP externe ajoutée',
 'ip alias changed' => 'Alias d'IP externe modifiée',
 'ip alias removed' => 'Alias d'IP externe supprimée',
+'ip basic info' => 'Information IP basique',
 'ip info' => 'Information IP',
+'ip info for' => 'Information IP pour',
 'ipfire has now rebooted' => 'IPFire va à présent redémarrer.',
 'ipfire has now shutdown' => 'IPFire va à présent s'arrêter.',
 'ipfire side' => 'Côté IPFire :',
@@ -2002,7 +2007,7 @@
 'pakfire core update auto' => 'Installer automatiquement les mises à jour du noyau et des modules :',
 'pakfire core update level' => 'Version de mise à jour du noyau ',
 'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :',
-'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous et cliquer sur le signe PLUS pour le(s) installer.',
+'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe PLUS pour le(s) installer.',
 'pakfire install package' => 'Vous souhaitez installer le(s) module(s) suivant(s) : ',
 'pakfire installed addons' => 'Modules installés :',
 'pakfire invalid tree' => 'Dépôt choisi invalide',
@@ -2018,7 +2023,7 @@
 'pakfire tree testing' => 'En test',
 'pakfire tree unstable' => 'Instable',
 'pakfire uninstall all' => 'Voulez-vous désinstaller ce(s) paquet(s) ?',
-'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous et cliquer sur le signe MOINS pour le(s) désinstaller.',
+'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.',
 'pakfire uninstall package' => 'Vous souhaitez désinstaller le(s) module(s) suivant(s) : ',
 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :',
 'pakfire updates' => 'Mise à jour disponible :',
@@ -2104,7 +2109,7 @@
 'proxy reports weekly' => 'Rapports hebdomadaires',
 'psk' => 'PSK',
 'ptr' => 'PTR',
-'ptr lookup failed' => 'La recherche inversée a échouée',
+'ptr lookup failed' => 'La recherche inversée a échoué',
 'pulse' => 'Impulsion',
 'pulse dial' => 'Numérotation par impulsions :',
 'qos add subclass' => 'Ajouter une sous-classe',
@@ -2454,6 +2459,9 @@
 'tor exit country' => 'Pays de sortie',
 'tor exit country any' => 'N'importe quel pays',
 'tor exit nodes' => 'Noeuds de sortie',
+'tor guard country' => 'Pays de garde',
+'tor guard country any' => 'N'importe quel pays',
+'tor guard nodes' => 'Noeuds de garde',
 'tor relay address' => 'Adresse relais',
 'tor relay configuration' => 'Configuration relais Tor',
 'tor relay enabled' => 'Activer relais Tor',
@@ -2473,6 +2481,7 @@
 'tor traffic limit soft' => 'Limite de trafic presque atteinte. Ne pas accepter de nouvelles connexions.',
 'tor traffic read written' => 'Trafic total (lu / écrit)',
 'tor use exit nodes' => 'Utiliser uniquement ces noeuds de sortie (un par ligne)',
+'tor use guard nodes' => 'Utiliser uniquement ces noeuds de garde (un par ligne)',
 'total connection time' => 'Temps total de connexion',
 'total hits for log section' => 'Nombre d'occurrences pour la section',
 'traffic back' => 'Retour',
@@ -2915,6 +2924,7 @@
 'week-graph' => 'Semaine',
 'weekly firewallhits' => 'Contacts hebdomadaires du pare-feu',
 'weeks' => 'semaine(s)',
+'whois results from' => 'Le WHOIS résulte de',
 'wildcards' => 'Jokers',
 'winbind daemon' => 'Service Winbind',
 'wins server' => 'Serveur Wins',
diff --git a/lfs/hostapd b/lfs/hostapd
index f70d09f4b..3cac20c8a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 52
+PAK_VER    = 53
DEPS       =
diff --git a/lfs/logwatch b/lfs/logwatch
index 7aa145121..0ad9a83f5 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch
@cd $(DIR_APP) && chmod 755 install_logwatch.sh
    cd $(DIR_APP) && yes "" | ./install_logwatch.sh
diff --git a/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch
new file mode 100644
index 000000000..10fb8afcf
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch
@@ -0,0 +1,11 @@
+diff -U 3 a/scripts/services/clamav b/scripts/services/clamav
+--- a/scripts/services/clamav	Fri Sep 21 00:46:14 2020
++++ b/scripts/services/clamav	Mon Dec 25 09:26:26 2020
+@@ -77,6 +77,7 @@
+        ( $ThisLine =~ /Bytecode: Security mode set to /) or
+        ( $ThisLine =~ /^No stats for Database check/ ) or
+        ( $ThisLine =~ /^Received \d+ file descriptor(s) from systemd.$/) or
++       ( $ThisLine =~ /^Activating the newly loaded database.../ ) or
+        0 # This line prevents blame shifting as lines are added above
+        ) {
+        # We do not care about these.
hooks/post-receive
--
IPFire 2.x development tree

    