IPFire-SCM July 2021

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 33cfcae627a50d24683e3b365d4d65f54184d030
by Michael Tremer 01 Jul '21

01 Jul '21

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 33cfcae627a50d24683e3b365d4d65f54184d030 (commit) via 5996c2815798e7bb8c069caad40ffb084ecf1cf7 (commit) from 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262 (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 33cfcae627a50d24683e3b365d4d65f54184d030 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 1 17:16:36 2021 +0000 aws-cli: Depend on python3-six Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5996c2815798e7bb8c069caad40ffb084ecf1cf7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 1 17:16:09 2021 +0000 Revert "python-six: Removal of python2 & 3 addon versions of six" This reverts commit 3a61ae73fa179adb24f9feeb8ee486c1900609bf. This module is required by awscli. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/python3-six | 6 ++++++ lfs/aws-cli | 4 ++-- lfs/{python3-pyasn1 => python3-six} | 8 ++++---- make.sh | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 config/rootfiles/packages/python3-six copy lfs/{python3-pyasn1 => python3-six} (96%) Difference in files: diff --git a/config/rootfiles/packages/python3-six b/config/rootfiles/packages/python3-six new file mode 100644 index 000000000..0801d36da --- /dev/null +++ b/config/rootfiles/packages/python3-six @@ -0,0 +1,6 @@ +#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info +#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/top_level.txt +usr/lib/python3.8/site-packages/six.py diff --git a/lfs/aws-cli b/lfs/aws-cli index 599469ee3..a098f9ad8 100644 --- a/lfs/aws-cli +++ b/lfs/aws-cli @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = aws-cli -PAK_VER = 3 +PAK_VER = 4 -DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml +DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-six python3-yaml ############################################################################### # Top-level Rules diff --git a/lfs/python3-six b/lfs/python3-six new file mode 100644 index 000000000..9d467f273 --- /dev/null +++ b/lfs/python3-six @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.14.0 + +THISAPP = six-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-six +PAK_VER = 3 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 21674588a57e649d1a6d977ec3122140 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index fc03ebcd5..83bd9faeb 100755 --- a/make.sh +++ b/make.sh @@ -1534,6 +1534,7 @@ buildipfire() { lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-setuptools-scm + lfsmake2 python3-six lfsmake2 python3-dateutil lfsmake2 python3-jmespath lfsmake2 python3-colorama hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262
by Michael Tremer 01 Jul '21

01 Jul '21

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 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. 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 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 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 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f38464e9fd218adaafa0995f09998dfb62576b18 Author: Stéphane Pautrel <steph78630(a)gmail.com> Date: Mon Jun 28 16:12:21 2021 +0000 Update French translation 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" This reverts commit a9fb87809eccdc7ea7736659ceec929a028761d4. This prevents the SSH configuration being parsed by the web user interface. 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" This reverts commit ee3b6ba0c7d3cc88667922f96db2ac0bd5630625. ncat segfaults straight away (#12647) 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. 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. 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. 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. 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. 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 => core/158}/filelists/armv5tel/boost | 0 .../{oldcore/151 => core/158}/filelists/i586/boost | 0 .../{oldcore/100 => core/158}/filelists/lua | 0 .../151 => 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 => core/158}/filelists/armv5tel/boost (100%) copy config/rootfiles/{oldcore/151 => core/158}/filelists/i586/boost (100%) copy config/rootfiles/{oldcore/100 => core/158}/filelists/lua (100%) copy config/rootfiles/{oldcore/151 => core/158}/filelists/x86_64/boost (100%) Difference in files: diff --git a/config/rootfiles/core/158/filelists/armv5tel/boost b/config/rootfiles/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/rootfiles/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/rootfiles/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 \ # Stop services +# 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 @@ -60,10 +74,13 @@ ldconfig /usr/local/bin/filesystem-cleanup # Start services -/etc/init.d/apache restart -/etc/init.d/vnstatd restart +/etc/init.d/vnstat restart /etc/init.d/rngd restart +# Restart apache +/etc/init.d/apache stop +/etc/init.d/apache start + # This update needs a reboot... #touch /var/run/need_reboot 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 restriction = Invalid time re WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy error design = Error messages design WARNING: untranslated string: advproxy error language = Error messages language -WARNING: untranslated string: advproxy fake referer = Fake referer submitted to external sites -WARNING: untranslated string: advproxy fake useragent = Fake useragent submitted to external sites WARNING: untranslated string: advproxy friday = Fri WARNING: untranslated string: advproxy from = From WARNING: untranslated string: advproxy group access control = Group based access control @@ -261,7 +259,6 @@ WARNING: untranslated string: advproxy number of L1 dirs = Number of level-1 sub WARNING: untranslated string: advproxy off = Proxy off WARNING: untranslated string: advproxy offline mode = Enable offline mode WARNING: untranslated string: advproxy on = Proxy on -WARNING: untranslated string: advproxy privacy = Privacy WARNING: untranslated string: advproxy proxy port = Proxy port WARNING: untranslated string: advproxy proxy port transparent = Transparent port WARNING: untranslated string: advproxy ram cache size = 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 priority 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 = available -WARNING: untranslated string: download apple profile = Download Apple Configuration Profile 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 @@ -924,9 +923,6 @@ 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: ipsec dns server address is invalid = Invalid DNS server IP address(es) -WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint -WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = 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 = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}"); + my $dhbit; + # Loop through the output and search for the DH bit lenght. foreach my $line (@dhparameter) { - my @dhbit = ($line =~ /(\d+)/); - if ($1 < 2048) { - $cryptoerror = "$Lang::tr{'ovpn error dh'}"; - goto CRYPTO_ERROR; + if ($line =~ (/(\d+)/)) { + # Assign match to dhbit value. + $dhbit = $1; + + last; } } + + # Check if the used key lenght is at least 2048 bit. + if ($dhbit < 2048) { + $cryptoerror = "$Lang::tr{'ovpn error dh'}"; + goto CRYPTO_ERROR; + } } # Warning if md5 is in usage @@ -1226,7 +1235,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'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"); } if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) { @@ -1488,7 +1497,7 @@ END } } - @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); + my @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem"); my $casubject; foreach my $line (@casubject) { @@ -2517,7 +2526,7 @@ else 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/ovpn.cnf"); ### @@ -5755,7 +5764,7 @@ END # Adding DH parameter to chart if (-f "${General::swroot}/ovpn/ca/dh1024.pem") { - my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); + my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); my $dhsubject; 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; } # Read-in ddns config file, to check if at least one provider is enabled. - open(FILE, "${General::swroot}/ddns/config)"; - my @ddns_config = <FILE> + open(FILE, "${General::swroot}/ddns/config"); + my @ddns_config = <FILE>; close(FILE); if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @ddns_config) ) { @@ -529,7 +529,7 @@ END # Read-in atm devices from proc. open(PROC, "/proc/net/atm/devices"); -my @patm_devices = <PROC>; +my @atm_devices = <PROC>; close(PROC); my $atmdev = 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 = <FILE>; close(FILE); - print "@file"; + print "@p12"; exit (0); 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' => 'Ajouter un accès externe', 'add-route' => 'Ajouter route supplémentaire', 'added from dhcp lease list' => 'Ajouter à partir de la liste de baux DHCP', -'addon' => 'Module complémentaire', -'addons' => 'Modules complémentaires', +'addon' => 'Module additionnel', +'addons' => 'Modules additionnels', 'admin user password has been changed' => 'Le mot de passe admin a été changé.', 'admin users' => 'Utilisateur avec droits super-utilisateur', 'administrator password' => 'Mot de passe administrateur', @@ -454,6 +454,7 @@ 'authentication' => 'Authentification :', 'automatic' => 'Automatique', 'autonomous system' => 'Système autonome', +'available' => 'disponible', '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', @@ -488,7 +489,7 @@ 'backupaddon' => 'Sauvegarde additionnelle', 'backupprofile' => 'Dans le cas ou la reconnexion échouerait, changer de profil ', 'backups' => 'Sauvegardes', -'backupwarning' => 'Importez d\'abord votre sauvegarde principale, puis la ou les sauvegardes de la ou des configurations des addons. Seuls les fichiers de configuration d\'addons sauvegardés seront restaurés, pas les addons installés!. Assurez-vous également que les sauvegardes conservent leurs noms de fichiers originaux.', +'backupwarning' => 'Veuillez d\'abord restaurer votre sauvegarde principale, puis les configurations de module(s) additionnel(s). Seules les configurations de module(s) seront restaurées, pas les modules précédemment installés ! Assurez-vous également que les fichiers de sauvegarde conservent leurs noms d\'origine.', 'bad characters in' => 'Mauvais caractères dans ', 'bad characters in script field' => 'Mauvais caractères dans le champ de script', 'bad characters in the telephone number field' => 'Mauvais caractères dans le champ du numéro de téléphone', @@ -915,6 +916,7 @@ 'downlink speed' => 'Débit descendant - download (kbit/sec) ', 'downlink std class' => 'Classe standard de téléchargement ', 'download' => 'Téléchargement ', +'download apple profile' => 'Télécharger le profil de configuration Apple', 'download ca certificate' => 'Télécharger le certificat CA', 'download certificate' => 'Télécharger le certificat', 'download dh parameter' => 'Télécharger paramètres Diffie-Hellman', @@ -1546,13 +1548,16 @@ 'ipinfo' => 'Info IP', 'ipsec' => 'IPsec', 'ipsec connection' => 'Connexion IPsec', +'ipsec dns server address is invalid' => 'Adresse(s) IP de serveur DNS invalide(s)', 'ipsec interface mode gre' => 'GRE', 'ipsec interface mode none' => '- Aucun (défaut) -', 'ipsec interface mode vti' => 'VTI', +'ipsec invalid ip address or fqdn for rw endpoint' => 'Adresse IP ou nom de domaine complet non valide pour le point de terminaison client nomade', 'ipsec mode transport' => 'Transport', 'ipsec mode tunnel' => 'Tunnel', 'ipsec network' => 'Réseau IPsec', 'ipsec no connections' => 'Aucune connexion IPsec active', +'ipsec roadwarrior endpoint' => 'Point de terminaison client nomade', 'ipsec routing table entries' => 'Entrées de la table de routage IPsec', 'ipsec settings' => 'Paramètres IPsec', 'iptable rules' => 'Règles table IP', @@ -1953,7 +1958,7 @@ 'ovpn error md5' => 'Votre certificat hôte utilise MD5 pour la signature qui n\'est plus acceptée. Veuillez mettre à jour la dernière version d\'IPFire et générez un nouveau certificat racine et hôte.. Tous les clients OpenVPN doivent ensuite être renouvelés!', 'ovpn generating the root and host certificates' => 'La génération du certificat racine et hôte peut prendre du temps.', 'ovpn ha' => 'Algorithme de hashage', -'ovpn log' => 'Log OVPN', +'ovpn log' => 'Journal OVPN', 'ovpn mgmt in root range' => 'Un numéro de port de 1024 ou plus est requis.', 'ovpn mtu-disc' => 'Découverte du chemin MTU', 'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery nécessite un MTU de 1500.', @@ -2565,7 +2570,7 @@ 'updxlrtr current downloads' => 'Les fichiers suivants sont en cours de téléchargement dans le cache local :', 'updxlrtr current files' => 'Les fichiers suivants sont dans le cache local', 'updxlrtr daily' => 'Quotidienne', -'updxlrtr data from cache' => 'Données fournies (octets)', +'updxlrtr data from cache' => 'Taille fournie (octets)', 'updxlrtr disk usage' => 'Utilisation du disque', 'updxlrtr efficiency index' => 'Indice d\'efficacité du cache ', 'updxlrtr empty repository' => 'Le cache local est vide', @@ -2606,8 +2611,8 @@ 'updxlrtr statistics by source' => 'Statistiques par source', 'updxlrtr summary' => 'Résumé', 'updxlrtr total cache size' => 'Taille totale du cache (octets) ', -'updxlrtr total data from cache' => 'Total de données fournies par le cache (octets) ', -'updxlrtr total files' => 'Total de fichiers dans le cache ', +'updxlrtr total data from cache' => 'Taille totale fournie par le cache (octets) ', +'updxlrtr total files' => 'Nombre total de fichiers dans le cache ', 'updxlrtr unknown' => 'Inconnu', 'updxlrtr update accelerator' => 'Configuration', 'updxlrtr update information' => 'Une nouvelle version est disponible au téléchargement. Visitez <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> pour plus d\'information.', @@ -3041,7 +3046,8 @@ 'zoneconf val stp priority range error' => 'La priorité du pont STP doit être comprise entre 1 et 65535', 'zoneconf val stp zone mode error' => 'STP ne peut être activé que si la zone est en mode pont', 'zoneconf val vlan amount assignment error' => 'Une zone ne peut pas avoir plus d\'un VLAN attribué.', -'zoneconf val vlan tag assignment error' => 'Vous ne pouvez pas utiliser le même label VLAN plus d\'une fois par carte réseau.', +'zoneconf val vlan tag assignment error' => 'Vous ne pouvez pas utiliser la même balise VLAN plus d\'une fois par carte réseau.', +'zoneconf val vlan tag range error' => 'La balise VLAN doit être comprise entre 1 et 4094.', 'zoneconf val zoneslave amount error' => 'Une zone qui n\'est pas en mode pont ne peut pas avoir plus d\'une carte réseau assignée', ); diff --git a/lfs/ncat b/lfs/ncat index 9480cd95a..b8c8768dc 100644 --- a/lfs/ncat +++ b/lfs/ncat @@ -24,7 +24,7 @@ include Config -VER = 7.91 +VER = 7.80 THISAPP = ncat-$(VER) DL_FILE = nmap-$(VER).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/nmap-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ncat -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 239cef725863ab454590a1bb8793b72b +$(DL_FILE)_MD5 = d37b75b06d1d40f27b76d60db420a1f5 install : $(TARGET) 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 # 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 # install custom OpenSSH client configuration hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 29e59d8c3ecbea5b1f4ebc2bd76384d40e903262
by Michael Tremer 01 Jul '21

01 Jul '21

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2021