From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262
Date: Thu, 01 Jul 2021 11:13:49 +0000
Message-ID: <4GFwZQ28kgz2xKm@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2800807650637038128=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2800807650637038128==
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, next has been updated
       via  29e59d8c3ecbea5b1f4ebc2bd76384d40e903262 (commit)
       via  17f0494bf28d4d607b15fa5d562a14ead495e7ea (commit)
       via  0a48e5694bfbd0377442ede7499ec5f7535c3012 (commit)
       via  c30403504255320cfc6301907d3c997e812b90e2 (commit)
       via  f38464e9fd218adaafa0995f09998dfb62576b18 (commit)
       via  10f012edffd157d4f92d0dd64c81dc87c7af5195 (commit)
       via  addeeb1f79825fdf2e03c089d661686050b336d5 (commit)
       via  274ca65bc5ef66fb98e7543789d94408915878d1 (commit)
       via  b959b9f5a6a838bef737955bcd5e97ef2c96d598 (commit)
       via  27ca856f728c840d90130abd41576ef57e65eae5 (commit)
       via  05de8ec3c85950387f1e0da7f4074f7b2b207b3a (commit)
       via  f56040805375784a7c695d7324365c115262eb72 (commit)
       via  016859ffe4910a0b7b3a71875d67c31aab369a1b (commit)
       via  8f73d902e34466ca85023e2cddaad68ea2cb91f5 (commit)
       via  556edb5adc8c37d07acf141a14d10b562a9cab73 (commit)
       via  1ca8bd7aa2cdb9311aa2d6d75e4fce55a1b91e18 (commit)
      from  4b25f1d86dcea9d4fab3590294e5346c399b22ab (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 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jul 1 10:10:17 2021 +0000

    core158: Fully terminate apache before restarting it
   =20
    Asking apache to restart itself fails when the binary is changed and
    some symbols cannot be resolved. We therefore terminate all processes
    and start them again.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 17f0494bf28d4d607b15fa5d562a14ead495e7ea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jul 1 10:09:40 2021 +0000

    core158: Fix name of vnstat initscript
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0a48e5694bfbd0377442ede7499ec5f7535c3012
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 28 19:29:27 2021 +0000

    core158: Actually drop motion instead of monit
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c30403504255320cfc6301907d3c997e812b90e2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 28 17:32:52 2021 +0000

    core158: Uninstall all dropped add-ons
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f38464e9fd218adaafa0995f09998dfb62576b18
Author: St=C3=A9phane Pautrel <steph78630(a)gmail.com>
Date:   Mon Jun 28 16:12:21 2021 +0000

    Update French translation
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 10f012edffd157d4f92d0dd64c81dc87c7af5195
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 24 17:45:17 2021 +0000

    Revert "OpenSSH: restrict file permissions for sshd_config to 0600"
   =20
    This reverts commit a9fb87809eccdc7ea7736659ceec929a028761d4.
   =20
    This prevents the SSH configuration being parsed by the web user
    interface.
   =20
    Reported-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit addeeb1f79825fdf2e03c089d661686050b336d5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 24 09:17:57 2021 +0000

    Revert "ncat: Update to 7.91"
   =20
    This reverts commit ee3b6ba0c7d3cc88667922f96db2ac0bd5630625.
   =20
    ncat segfaults straight away (#12647)
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 274ca65bc5ef66fb98e7543789d94408915878d1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Jun 22 14:56:52 2021 +0200

    ovpnmain.cgi: Fix typos.
   =20
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b959b9f5a6a838bef737955bcd5e97ef2c96d598
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Jun 22 14:52:36 2021 +0200

    ovpnmain.cgi: Call correct system_output() function.
   =20
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 27ca856f728c840d90130abd41576ef57e65eae5
Merge: f56040805 05de8ec3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 21 19:41:25 2021 +0000

    Merge branch 'core157'

commit f56040805375784a7c695d7324365c115262eb72
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 17:45:05 2021 +0200

    ovpnmain.cgi: Fix detection of used DH key lenght.
   =20
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 016859ffe4910a0b7b3a71875d67c31aab369a1b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 14:44:58 2021 +0200

    vpnmain.cgi: Fix typo.
   =20
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8f73d902e34466ca85023e2cddaad68ea2cb91f5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 14:44:57 2021 +0200

    pppsetup.cgi: Fix typos.
   =20
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 556edb5adc8c37d07acf141a14d10b562a9cab73
Merge: 1ca8bd7aa 4b25f1d86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 21 10:04:11 2021 +0000

    Merge remote-tracking branch 'origin/next'

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

Summary of changes:
 .../151 =3D> core/158}/filelists/armv5tel/boost      |  0
 .../{oldcore/151 =3D> core/158}/filelists/i586/boost |  0
 .../{oldcore/100 =3D> core/158}/filelists/lua        |  0
 .../151 =3D> core/158}/filelists/x86_64/boost        |  0
 config/rootfiles/core/158/update.sh                | 21 ++++++++++++++++--
 doc/language_issues.en                             |  3 ---
 doc/language_issues.fr                             |  6 +-----
 doc/language_missings                              |  6 ------
 html/cgi-bin/ovpnmain.cgi                          | 25 +++++++++++++++-----=
--
 html/cgi-bin/pppsetup.cgi                          |  6 +++---
 html/cgi-bin/vpnmain.cgi                           |  2 +-
 langs/fr/cgi-bin/fr.pl                             | 22 ++++++++++++-------
 lfs/ncat                                           |  6 +++---
 lfs/openssh                                        |  2 +-
 14 files changed, 59 insertions(+), 40 deletions(-)
 copy config/rootfiles/{oldcore/151 =3D> core/158}/filelists/armv5tel/boost (=
100%)
 copy config/rootfiles/{oldcore/151 =3D> core/158}/filelists/i586/boost (100%)
 copy config/rootfiles/{oldcore/100 =3D> core/158}/filelists/lua (100%)
 copy config/rootfiles/{oldcore/151 =3D> core/158}/filelists/x86_64/boost (10=
0%)

Difference in files:
diff --git a/config/rootfiles/core/158/filelists/armv5tel/boost b/config/root=
files/core/158/filelists/armv5tel/boost
new file mode 120000
index 000000000..bb17e08d6
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/armv5tel/boost
@@ -0,0 +1 @@
+../../../../common/armv5tel/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/158/filelists/i586/boost b/config/rootfile=
s/core/158/filelists/i586/boost
new file mode 120000
index 000000000..3ff5a3be4
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/i586/boost
@@ -0,0 +1 @@
+../../../../common/i586/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/158/filelists/lua b/config/rootfiles/core/=
158/filelists/lua
new file mode 120000
index 000000000..951f661c5
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/lua
@@ -0,0 +1 @@
+../../../common/lua
\ No newline at end of file
diff --git a/config/rootfiles/core/158/filelists/x86_64/boost b/config/rootfi=
les/core/158/filelists/x86_64/boost
new file mode 120000
index 000000000..9ed31e1d5
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/x86_64/boost
@@ -0,0 +1 @@
+../../../../common/x86_64/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/158/update.sh b/config/rootfiles/core/158/=
update.sh
index b8ff724f5..a34c01bcc 100644
--- a/config/rootfiles/core/158/update.sh
+++ b/config/rootfiles/core/158/update.sh
@@ -47,6 +47,20 @@ rm -vrf \
=20
 # Stop services
=20
+# Remove dropped packages
+for package in asterisk libsrtp motion libmicrohttpd sane fbset miniupnpd \
+		sendEmail libupnp lcd4linux dpfhack; do
+        if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
+		stop_service "${package}"
+		for i in $(</opt/pakfire/db/rootfiles/${package}); do
+			rm -rfv "/${i}"
+		done
+        fi
+        rm -f "/opt/pakfire/db/installed/meta-${package}"
+        rm -f "/opt/pakfire/db/meta/meta-${package}"
+        rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
 # Extract files
 extract_files
=20
@@ -60,10 +74,13 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
=20
 # Start services
-/etc/init.d/apache restart
-/etc/init.d/vnstatd restart
+/etc/init.d/vnstat restart
 /etc/init.d/rngd restart
=20
+# Restart apache
+/etc/init.d/apache stop
+/etc/init.d/apache start
+
 # This update needs a reboot...
 #touch /var/run/need_reboot
=20
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 63ac77fce..0c9b88777 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -232,8 +232,6 @@ WARNING: untranslated string: advproxy errmsg time restri=
ction =3D Invalid time re
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask =3D WP=
AD: Invalid IP or subnet for excluded IP subnet
 WARNING: untranslated string: advproxy error design =3D Error messages design
 WARNING: untranslated string: advproxy error language =3D Error messages lan=
guage
-WARNING: untranslated string: advproxy fake referer =3D Fake referer submitt=
ed to external sites
-WARNING: untranslated string: advproxy fake useragent =3D Fake useragent sub=
mitted to external sites
 WARNING: untranslated string: advproxy friday =3D Fri
 WARNING: untranslated string: advproxy from =3D From
 WARNING: untranslated string: advproxy group access control =3D Group based =
access control
@@ -261,7 +259,6 @@ WARNING: untranslated string: advproxy number of L1 dirs =
=3D Number of level-1 sub
 WARNING: untranslated string: advproxy off =3D Proxy off
 WARNING: untranslated string: advproxy offline mode =3D Enable offline mode
 WARNING: untranslated string: advproxy on =3D Proxy on
-WARNING: untranslated string: advproxy privacy =3D Privacy
 WARNING: untranslated string: advproxy proxy port =3D Proxy port
 WARNING: untranslated string: advproxy proxy port transparent =3D Transparen=
t port
 WARNING: untranslated string: advproxy ram cache size =3D Memory cache size =
(MB)
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 95dd8fd3c..42f8160b7 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -890,9 +890,8 @@ WARNING: translation string unused: zoneconf val stp prio=
rity range error
 WARNING: translation string unused: zoneconf val stp zone mode 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 vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: available =3D available
-WARNING: untranslated string: download apple profile =3D Download Apple Conf=
iguration Profile
 WARNING: untranslated string: fwhost cust locationgrp =3D unknown string
 WARNING: untranslated string: fwhost err hostip =3D unknown string
 WARNING: untranslated string: guardian block a host =3D unknown string
@@ -924,9 +923,6 @@ WARNING: untranslated string: guardian logtarget_file =3D=
 unknown string
 WARNING: untranslated string: guardian logtarget_syslog =3D unknown string
 WARNING: untranslated string: guardian no entries =3D unknown string
 WARNING: untranslated string: guardian service =3D unknown string
-WARNING: untranslated string: ipsec dns server address is invalid =3D Invali=
d DNS server IP address(es)
-WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoi=
nt =3D Invalid IP address or FQDN for Host-to-Net Endpoint
-WARNING: untranslated string: ipsec roadwarrior endpoint =3D Host-to-Net End=
point
 WARNING: untranslated string: pakfire ago =3D ago.
 WARNING: untranslated string: route config changed =3D unknown string
 WARNING: untranslated string: routing config added =3D unknown string
diff --git a/doc/language_missings b/doc/language_missings
index 9cfa3d1c9..fc74274bd 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -926,17 +926,11 @@
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 < ansi t1.483
-< available
 < bewan adsl pci st
 < bewan adsl usb
-< download apple profile
 < g.dtm
 < g.lite
-< ipsec dns server address is invalid
-< ipsec invalid ip address or fqdn for rw endpoint
-< ipsec roadwarrior endpoint
 < upload fcdsl.o
-< zoneconf val vlan tag range error
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 077f5ab6c..7a2833ce6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -221,14 +221,23 @@ sub pkiconfigcheck
 	# Warning if DH parameter is 1024 bit
 	if (-f "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}") {
 		my @dhparameter =3D &General::system_output("/usr/bin/openssl", "dhparam",=
 "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}");
+		my $dhbit;
=20
+		# Loop through the output and search for the DH bit lenght.
 		foreach my $line (@dhparameter) {
-			my @dhbit =3D ($line =3D~ /(\d+)/);
-			if ($1 < 2048) {
-				$cryptoerror =3D "$Lang::tr{'ovpn error dh'}";
-				goto CRYPTO_ERROR;
+			if ($line =3D~ (/(\d+)/)) {
+				# Assign match to dhbit value.
+				$dhbit =3D $1;
+
+				last;
 			}
 		}
+
+		# Check if the used key lenght is at least 2048 bit.
+		if ($dhbit < 2048) {
+			$cryptoerror =3D "$Lang::tr{'ovpn error dh'}";
+			goto CRYPTO_ERROR;
+		}
 	}
=20
 	# Warning if md5 is in usage
@@ -1226,7 +1235,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgipa=
rams{'TYPE'} eq '' && $cg
   if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
 	  &General::system("touch", "${General::swroot}/ovpn/enable_blue");
   } else {
-	  unlink(${General::swroot}/ovpn/enable_blue);
+	  unlink("${General::swroot}/ovpn/enable_blue");
   }
=20
   if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) {
@@ -1488,7 +1497,7 @@ END
 	}
     }
=20
-    @casubject =3D &General::system_output("/usr/bin/openssl", "x509", "-tex=
t", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
+    my @casubject =3D &General::system_output("/usr/bin/openssl", "x509", "-=
text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
     my $casubject;
=20
     foreach my $line (@casubject) {
@@ -2517,7 +2526,7 @@ else
=20
 	if ($confighash{$cgiparams{'KEY'}}) {
 		# Revoke certificate if certificate was deleted and rewrite the CRL
-		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/=
ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General:=
:swroot}/ovpn/openssl/ovpn.cnf)";
+		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/=
ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General:=
:swroot}/ovpn/openssl/ovpn.cnf");
 		&General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::=
swroot}/ovpn/crls/cacrl.pem", "-config", "${General::swroot}/ovpn/openssl/ovp=
n.cnf");
=20
 ###
@@ -5755,7 +5764,7 @@ END
=20
     # Adding DH parameter to chart
     if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
-		my @dhsubject =3D &System_output("/usr/bin/openssl", "dhparam", "-text", "=
-in", "${General::swroot}/ovpn/ca/dh1024.pem");
+		my @dhsubject =3D &General::system_output("/usr/bin/openssl", "dhparam", "=
-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
 		my $dhsubject;
=20
 		foreach my $line (@dhsubject) {
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 519a062bc..beb7fabc7 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -180,8 +180,8 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 goto ERROR; }
=20
 	# Read-in ddns config file, to check if at least one provider is enabled.
-	open(FILE, "${General::swroot}/ddns/config)";
-	my @ddns_config =3D <FILE>
+	open(FILE, "${General::swroot}/ddns/config");
+	my @ddns_config =3D <FILE>;
 	close(FILE);
=20
         if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @dd=
ns_config) ) {
@@ -529,7 +529,7 @@ END
=20
 # Read-in atm devices from proc.
 open(PROC, "/proc/net/atm/devices");
-my @patm_devices =3D <PROC>;
+my @atm_devices =3D <PROC>;
 close(PROC);
=20
 my $atmdev =3D grep(/0/, @atm_devices);
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 79a2943d4..8f13cf51f 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1260,7 +1260,7 @@ END
 	open(FILE, "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12"=
);
 	my @p12 =3D <FILE>;
 	close(FILE);
-	print "@file";
+	print "@p12";
=20
 	exit (0);
=20
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 1b6d30111..984b974f1 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -161,8 +161,8 @@
 'add xtaccess' =3D> 'Ajouter un acc=C3=A8s externe',
 'add-route' =3D> 'Ajouter route suppl=C3=A9mentaire',
 'added from dhcp lease list' =3D> 'Ajouter =C3=A0 partir de la liste de baux=
 DHCP',
-'addon' =3D> 'Module compl=C3=A9mentaire',
-'addons' =3D> 'Modules compl=C3=A9mentaires',
+'addon' =3D> 'Module additionnel',
+'addons' =3D> 'Modules additionnels',
 'admin user password has been changed' =3D> 'Le mot de passe admin a =C3=A9t=
=C3=A9 chang=C3=A9.',
 'admin users' =3D> 'Utilisateur avec droits super-utilisateur',
 'administrator password' =3D> 'Mot de passe administrateur',
@@ -454,6 +454,7 @@
 'authentication' =3D> 'Authentification :',
 'automatic' =3D> 'Automatique',
 'autonomous system' =3D> 'Syst=C3=A8me autonome',
+'available' =3D> 'disponible',
 'available updates' =3D> 'Mises =C3=A0 jour disponibles ',
 'average' =3D> 'Moyenne',
 'avoid dod' =3D> 'Ne pas utiliser cette option avec connexion =C3=A0 la dema=
nde ! Principalement utilis=C3=A9e si votre IPFire se trouve derri=C3=A8re un=
 routeur. Votre IP ROUGE doit =C3=AAtre au coeur de l\'un des trois num=C3=A9=
ros de r=C3=A9seau r=C3=A9serv=C3=A9s, par exemple 10 / 8, 172.16/12, 192.168=
/16',
@@ -488,7 +489,7 @@
 'backupaddon' =3D> 'Sauvegarde additionnelle',
 'backupprofile' =3D> 'Dans le cas ou la reconnexion =C3=A9chouerait, changer=
 de profil ',
 'backups' =3D> 'Sauvegardes',
-'backupwarning' =3D> 'Importez d\'abord votre sauvegarde principale, puis la=
 ou les sauvegardes de la ou des configurations des addons.<br />Seuls les fi=
chiers de configuration d\'addons sauvegard=C3=A9s seront restaur=C3=A9s, pas=
 les addons install=C3=A9s!.<br />Assurez-vous =C3=A9galement que les sauvega=
rdes conservent leurs noms de fichiers originaux.',
+'backupwarning' =3D> 'Veuillez d\'abord restaurer votre sauvegarde principal=
e, puis les configurations de module(s) additionnel(s).<br />Seules les confi=
gurations de module(s) seront restaur=C3=A9es, pas les modules pr=C3=A9c=C3=
=A9demment install=C3=A9s !<br />Assurez-vous =C3=A9galement que les fichiers=
 de sauvegarde conservent leurs noms d\'origine.',
 'bad characters in' =3D> 'Mauvais caract=C3=A8res dans ',
 'bad characters in script field' =3D> 'Mauvais caract=C3=A8res dans le champ=
 de script',
 'bad characters in the telephone number field' =3D> 'Mauvais caract=C3=A8res=
 dans le champ du num=C3=A9ro de t=C3=A9l=C3=A9phone',
@@ -915,6 +916,7 @@
 'downlink speed' =3D> 'D=C3=A9bit descendant - download (kbit/sec) ',
 'downlink std class' =3D> 'Classe standard de t=C3=A9l=C3=A9chargement ',
 'download' =3D> 'T=C3=A9l=C3=A9chargement ',
+'download apple profile' =3D> 'T=C3=A9l=C3=A9charger le profil de configurat=
ion Apple',
 'download ca certificate' =3D> 'T=C3=A9l=C3=A9charger le certificat CA',
 'download certificate' =3D> 'T=C3=A9l=C3=A9charger le certificat',
 'download dh parameter' =3D> 'T=C3=A9l=C3=A9charger param=C3=A8tres Diffie-H=
ellman',
@@ -1546,13 +1548,16 @@
 'ipinfo' =3D> 'Info IP',
 'ipsec' =3D> 'IPsec',
 'ipsec connection' =3D> 'Connexion IPsec',
+'ipsec dns server address is invalid' =3D> 'Adresse(s) IP de serveur DNS inv=
alide(s)',
 'ipsec interface mode gre' =3D> 'GRE',
 'ipsec interface mode none' =3D> '- Aucun (d=C3=A9faut) -',
 'ipsec interface mode vti' =3D> 'VTI',
+'ipsec invalid ip address or fqdn for rw endpoint' =3D> 'Adresse IP ou nom d=
e domaine complet non valide pour le point de terminaison client nomade',
 'ipsec mode transport' =3D> 'Transport',
 'ipsec mode tunnel' =3D> 'Tunnel',
 'ipsec network' =3D> 'R=C3=A9seau IPsec',
 'ipsec no connections' =3D> 'Aucune connexion IPsec active',
+'ipsec roadwarrior endpoint' =3D> 'Point de terminaison client nomade',
 'ipsec routing table entries' =3D> 'Entr=C3=A9es de la table de routage IPse=
c',
 'ipsec settings' =3D> 'Param=C3=A8tres IPsec',
 'iptable rules' =3D> 'R=C3=A8gles table IP',
@@ -1953,7 +1958,7 @@
 'ovpn error md5' =3D> 'Votre certificat h=C3=B4te utilise MD5 pour la signat=
ure qui n\'est plus accept=C3=A9e. <br>Veuillez mettre =C3=A0 jour la derni=
=C3=A8re version d\'IPFire et g=C3=A9n=C3=A9rez un nouveau certificat racine =
et h=C3=B4te..</br><br>Tous les clients OpenVPN doivent ensuite =C3=AAtre ren=
ouvel=C3=A9s!</br>',
 'ovpn generating the root and host certificates' =3D> 'La g=C3=A9n=C3=A9rati=
on du certificat racine et h=C3=B4te peut prendre du temps.',
 'ovpn ha' =3D> 'Algorithme de hashage',
-'ovpn log' =3D> 'Log OVPN',
+'ovpn log' =3D> 'Journal OVPN',
 'ovpn mgmt in root range' =3D> 'Un num=C3=A9ro de port de 1024 ou plus est r=
equis.',
 'ovpn mtu-disc' =3D> 'D=C3=A9couverte du chemin MTU',
 'ovpn mtu-disc and mtu not 1500' =3D> 'Path MTU Discovery n=C3=A9cessite un =
MTU de 1500.',
@@ -2565,7 +2570,7 @@
 'updxlrtr current downloads' =3D> 'Les fichiers suivants sont en cours de t=
=C3=A9l=C3=A9chargement dans le cache local :',
 'updxlrtr current files' =3D> 'Les fichiers suivants sont dans le cache loca=
l',
 'updxlrtr daily' =3D> 'Quotidienne',
-'updxlrtr data from cache' =3D> 'Donn=C3=A9es fournies (octets)',
+'updxlrtr data from cache' =3D> 'Taille fournie (octets)',
 'updxlrtr disk usage' =3D> 'Utilisation du disque',
 'updxlrtr efficiency index' =3D> 'Indice d\'efficacit=C3=A9 du cache ',
 'updxlrtr empty repository' =3D> 'Le cache local est vide',
@@ -2606,8 +2611,8 @@
 'updxlrtr statistics by source' =3D> 'Statistiques par source',
 'updxlrtr summary' =3D> 'R=C3=A9sum=C3=A9',
 'updxlrtr total cache size' =3D> 'Taille totale du cache (octets) ',
-'updxlrtr total data from cache' =3D> 'Total de donn=C3=A9es fournies par le=
 cache (octets) ',
-'updxlrtr total files' =3D> 'Total de fichiers dans le cache ',
+'updxlrtr total data from cache' =3D> 'Taille totale fournie par le cache (o=
ctets) ',
+'updxlrtr total files' =3D> 'Nombre total de fichiers dans le cache ',
 'updxlrtr unknown' =3D> 'Inconnu',
 'updxlrtr update accelerator' =3D> 'Configuration',
 'updxlrtr update information' =3D> 'Une nouvelle version est disponible au t=
=C3=A9l=C3=A9chargement. Visitez <a href=3D"http://update-accelerator.advprox=
y.net" target=3D"_blank">http://update-accelerator.advproxy.net</a> pour plus=
 d\'information.',
@@ -3041,7 +3046,8 @@
 'zoneconf val stp priority range error' =3D> 'La priorit=C3=A9 du pont STP d=
oit =C3=AAtre comprise entre 1 et 65535',
 'zoneconf val stp zone mode error' =3D> 'STP ne peut =C3=AAtre activ=C3=A9 q=
ue si la zone est en mode pont',
 'zoneconf val vlan amount assignment error' =3D> 'Une zone ne peut pas avoir=
 plus d\'un VLAN attribu=C3=A9.',
-'zoneconf val vlan tag assignment error' =3D> 'Vous ne pouvez pas utiliser l=
e m=C3=AAme label VLAN plus d\'une fois par carte r=C3=A9seau.',
+'zoneconf val vlan tag assignment error' =3D> 'Vous ne pouvez pas utiliser l=
a m=C3=AAme balise VLAN plus d\'une fois par carte r=C3=A9seau.',
+'zoneconf val vlan tag range error' =3D> 'La balise VLAN doit =C3=AAtre comp=
rise entre 1 et 4094.',
 'zoneconf val zoneslave amount error' =3D> 'Une zone qui n\'est pas en mode =
pont ne peut pas avoir plus d\'une carte r=C3=A9seau assign=C3=A9e',
 );
=20
diff --git a/lfs/ncat b/lfs/ncat
index 9480cd95a..b8c8768dc 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 7.91
+VER        =3D 7.80
=20
 THISAPP    =3D ncat-$(VER)
 DL_FILE    =3D nmap-$(VER).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/nmap-$(VER)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D ncat
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
 DEPS       =3D
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 239cef725863ab454590a1bb8793b72b
+$(DL_FILE)_MD5 =3D d37b75b06d1d40f27b76d60db420a1f5
=20
 install : $(TARGET)
=20
diff --git a/lfs/openssh b/lfs/openssh
index ced1a7db9..3117e996c 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make install
=20
 	# install custom OpenSSH server configuration
-	install -v -m 600 $(DIR_SRC)/config/ssh/sshd_config \
+	install -v -m 644 $(DIR_SRC)/config/ssh/sshd_config \
 		/etc/ssh/sshd_config
=20
 	# install custom OpenSSH client configuration


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

--===============2800807650637038128==--