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

11 Dec 2022

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  4acb701b84f2f6a950e0d03d8e2234018bacb9df (commit)
       via  7ec3664c320707b51407fce854e19b6254eb4836 (commit)
       via  d7618ccba8ba312916593e6ebbadee1d90575c0f (commit)
       via  92a9ce54bc63ebea153fc46365a1aa299856fbbe (commit)
       via  9e7d4102b84c17e7f743e0c8ce6aae92ae0d53d8 (commit)
       via  19a417c2a10df279b2aa0e0644838bf892410a07 (commit)
      from  e9062718d1247375422920a7d69ca8fd00b8b949 (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 4acb701b84f2f6a950e0d03d8e2234018bacb9df
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Dec 11 11:57:34 2022 +0000
Tor: Update to 0.4.7.12
Full changelog:
Changes in version 0.4.7.12 - 2022-12-06
      This version contains a major change that is a new key for moria1. Also, new
      metrics are exported on the MetricsPort for the congestion control
      subsystem.
o Directory authority changes (moria1):
        - Rotate the relay identity key and v3 identity key for moria1. They
          have been online for more than a decade and refreshing keys
          periodically is good practice. Advertise new ports too, to avoid
          confusion. Closes ticket 40722.
o Minor feature (Congestion control metrics):
        - Add additional metricsport relay metrics for congestion control.
          Closes ticket 40724.
o Minor features (fallbackdir):
        - Regenerate fallback directories generated on December 06, 2022.
o Minor features (geoip data):
        - Update the geoip files to match the IPFire Location Database, as
          retrieved on 2022/12/06.
o Minor bugfixes (cpuworker, relay):
        - Fix an off by one overload calculation on the number of CPUs being
          used by our thread pool. Fixes bug 40719; bugfix on 0.3.5.1-alpha.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 7ec3664c320707b51407fce854e19b6254eb4836
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 6 10:01:44 2022 +0000
openvpn-authenticator: Break read loop when daemon goes away
Fixes: #12963
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Tested-by: Adolf Belka adolf.belka@ipfire.org
commit d7618ccba8ba312916593e6ebbadee1d90575c0f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 6 10:01:43 2022 +0000
openvpn-authenticator: Drop some dead code
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Tested-by: Adolf Belka adolf.belka@ipfire.org
commit 92a9ce54bc63ebea153fc46365a1aa299856fbbe
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 6 10:01:42 2022 +0000
openvpn-authenticator: Avoid infinite loop when losing socket connection
This patch will gracefully terminate the daemon when it loses its
    connection to the OpenVPN daemon.
Fixes: #12963
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Tested-by: Adolf Belka adolf.belka@ipfire.org
commit 9e7d4102b84c17e7f743e0c8ce6aae92ae0d53d8
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Dec 5 09:40:15 2022 +0100
Language files update:
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 19a417c2a10df279b2aa0e0644838bf892410a07
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Dec 5 09:40:14 2022 +0100
ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing
- On CU172 Testing Build: master/eb9e29f9 when selecting the OpenVPN menu it showed the
       Diffie-Hellman info and pressing back took you to the same DH page.
    - Tested patch suggestion from Erik on vm testbed and confirmed that it worked.
Suggested-by: Erik Kapfer erik.kapfer@ipfire.org
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/ovpn/openvpn-authenticator | 33 ++++++++++++++++-----------------
 doc/language_issues.de            |  2 --
 doc/language_issues.en            |  6 +++---
 doc/language_issues.fr            |  4 ++--
 doc/language_issues.it            |  4 ++--
 doc/language_issues.nl            |  4 ++--
 doc/language_issues.pl            |  4 ++--
 doc/language_issues.ru            |  4 ++--
 doc/language_issues.tr            |  4 ++--
 doc/language_missings             | 12 ++++++++++++
 html/cgi-bin/ovpnmain.cgi         |  4 ++--
 langs/de/cgi-bin/de.pl            |  2 ++
 langs/en/cgi-bin/en.pl            |  2 ++
 lfs/tor                           |  6 +++---
 14 files changed, 52 insertions(+), 39 deletions(-)
Difference in files:

diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenticator
index 65844012b..4341993e6 100644
--- a/config/ovpn/openvpn-authenticator
+++ b/config/ovpn/openvpn-authenticator
@@ -68,6 +68,12 @@ class OpenVPNAuthenticator(object):
while True:
    		char = self.sock.recv(1)
+
+			# Break if we could not read from the socket
+			if not char:
+				raise EOFError("Could not read from socket")
+
+			# Append to buffer
    		buf.append(char)
# Reached end of line
@@ -97,18 +103,6 @@ class OpenVPNAuthenticator(object):
    	# Send the command
    	self._write_line(command)
-		return # XXX Code below doesn't work
-
-		# Read response
-		response = self._read_line()
-
-		# Handle response
-		if not response.startswith("SUCCESS:"):
-			log.error("Command '%s' returned an error:" % command)
-			log.error("  %s" % response)
-
-			return response
-
    def run(self):
    	# Connect to socket
    	self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -116,11 +110,16 @@ class OpenVPNAuthenticator(object):
log.info("OpenVPN Authenticator started")
-		while True:
-			line = self._read_line()
+		try:
+			while True:
+				line = self._read_line()
-			if line.startswith(">CLIENT"):
-				self._client_event(line)
+				if line.startswith(">CLIENT"):
+					self._client_event(line)
+
+		# Terminate the daemon when it loses its connection to the OpenVPN daemon
+		except (ConnectionResetError, EOFError) as e:
+			log.error("Connection to OpenVPN has been lost: %s" % e)
log.info("OpenVPN Authenticator terminated")
@@ -269,7 +268,7 @@ class OpenVPNAuthenticator(object):
    @staticmethod
    def _b64decode(s):
    	return base64.b64decode(s.encode()).decode()
-		
+
    @staticmethod
    def _escape(s):
    	return s.replace(" ", "\ ")
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5cbcb1111..c3db84863 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -885,7 +885,6 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
 WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
 WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
@@ -939,7 +938,6 @@ WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
-WARNING: untranslated string: show dh = unknown string
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: subscription code = Subscription code
diff --git a/doc/language_issues.en b/doc/language_issues.en
index c559c62a7..0bf7bf977 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -570,7 +570,7 @@ WARNING: untranslated string: detail level = Detail level
 WARNING: untranslated string: details = Details
 WARNING: untranslated string: device = Device
 WARNING: untranslated string: devices on blue = Devices on BLUE
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp advopt add = Add a DHCP option
 WARNING: untranslated string: dhcp advopt added = DHCP option added
@@ -1638,7 +1638,7 @@ WARNING: untranslated string: show ajax speedmeter in footer = Show Ajax speedme
 WARNING: untranslated string: show ca certificate = Show CA certificate
 WARNING: untranslated string: show certificate = Show file
 WARNING: untranslated string: show crl = Show certificate revocation list
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show host certificate = Show host certificate
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show root certificate = Show root certificate
@@ -2118,7 +2118,7 @@ WARNING: untranslated string: volup10 = Increase volume by 10
 WARNING: untranslated string: volup5 = Increase volume by 5
 WARNING: untranslated string: vpi number = VPI number:
 WARNING: untranslated string: vpn = VPN
-WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
+WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of email, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>email:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something
 WARNING: untranslated string: vpn auth-dn = Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field
 WARNING: untranslated string: vpn broken = Broken
 WARNING: untranslated string: vpn connecting = CONNECTING
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1ad14cd34..1a6a877d7 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -912,7 +912,7 @@ WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
 WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
 WARNING: untranslated string: core notice 3 = available.
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: email recipient invalid = Invalid email recipient
 WARNING: untranslated string: error message = unknown string
@@ -954,4 +954,4 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
diff --git a/doc/language_issues.it b/doc/language_issues.it
index c7638dbd6..e0c87ea2c 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -941,7 +941,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1222,7 +1222,7 @@ WARNING: untranslated string: search = Search
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 4ef506798..da08fb913 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -944,7 +944,7 @@ WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
 WARNING: untranslated string: dhcp dns key name = Key Name
@@ -1243,7 +1243,7 @@ WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ffea51ab3..5de989453 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -916,7 +916,7 @@ WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: details = Details
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1430,7 +1430,7 @@ WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4257c0291..81a492358 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -912,7 +912,7 @@ WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: details = Details
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
@@ -1425,7 +1425,7 @@ WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index da7241f22..d1bd0f4e9 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -927,7 +927,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh = unknown string
+WARNING: untranslated string: dh = Diffie-Hellman-Parameter
 WARNING: untranslated string: dh parameter = unknown string
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
 WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
@@ -1128,7 +1128,7 @@ WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = unknown string
+WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
diff --git a/doc/language_missings b/doc/language_missings
index e5fad0a6a..47b314981 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -110,12 +110,14 @@
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
+< dh
 < email recipient invalid
 < g.dtm
 < g.lite
 < guaranteed bandwidth
 < retbleed
 < service boot setting unavailable
+< show dh
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -231,6 +233,7 @@
 < dangerous
 < default IP address
 < desired
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -499,6 +502,7 @@
 < secret
 < sent
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < smb daemon
 < smt disabled
@@ -731,6 +735,7 @@
 < default
 < default IP address
 < desired
+< dh
 < dhcp dns enable update
 < dhcp dns key name
 < dhcp dns update
@@ -1022,6 +1027,7 @@
 < search
 < secret
 < sent
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -1322,6 +1328,7 @@
 < deprecated fs warn
 < desired
 < details
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -1889,6 +1896,7 @@
 < sent
 < server restart
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -2294,6 +2302,7 @@
 < deprecated fs warn
 < desired
 < details
+< dh
 < dhcp deny known clients:
 < dhcp dns enable update
 < dhcp dns key name
@@ -2864,6 +2873,7 @@
 < sent
 < server restart
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < show tls-auth key
 < smb daemon
@@ -3137,6 +3147,7 @@
 < dangerous
 < default IP address
 < desired
+< dh
 < dhcp deny known clients:
 < dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
@@ -3314,6 +3325,7 @@
 < secret
 < sent
 < service boot setting unavailable
+< show dh
 < show otp qrcode
 < smb daemon
 < smt disabled
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index dc429d90c..ecfd4fdaf 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -977,7 +977,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n";
   print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
   print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
-  print SERVERCONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n";
+  print SERVERCONF "dh $dhparameter\n";
   print SERVERCONF "# Cipher\n";
   print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n";
@@ -5700,7 +5700,7 @@ END
print <<END;
    	<tr>
-			<td class='base' $col3>$Lang::tr{'dh parameter'}</td>
+			<td class='base' $col3>$Lang::tr{'dh'}</td>
    		<td class='base' $col3>$dhsubject</td>
    		<form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
    		<input type='hidden' name='ACTION' value='$Lang::tr{'show dh'}' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a52d41531..457a7108c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -760,6 +760,7 @@
 'details' => 'Mehr',
 'device' => 'Gerät',
 'devices on blue' => 'Geräte auf BLAU',
+'dh' => 'Diffie-Hellman-Parameter',
 'dhcp advopt add' => 'DHCP Option hinzufügen',
 'dhcp advopt added' => 'DHCP Option hinzugefügt',
 'dhcp advopt blank value' => 'Wert für DHCP Option darf nicht leer sein',
@@ -2256,6 +2257,7 @@
 'show ca certificate' => 'CA Zertifikat anzeigen',
 'show certificate' => 'Datei anzeigen',
 'show crl' => 'Certificate Revocation List anzeigen',
+'show dh' => 'Diffie-Hellman-Parameter anzeigen',
 'show host certificate' => 'Host-Zertifikat anzeigen',
 'show last x lines' => 'die letzten x Zeilen anzeigen',
 'show otp qrcode' => 'Zeige OTP QRCode',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bcba77aa4..72cef9a11 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -795,6 +795,7 @@
 'details' => 'Details',
 'device' => 'Device',
 'devices on blue' => 'Devices on BLUE',
+'dh' => 'Diffie-Hellman-Parameter',
 'dhcp advopt add' => 'Add a DHCP option',
 'dhcp advopt added' => 'DHCP option added',
 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.',
@@ -2313,6 +2314,7 @@
 'show ca certificate' => 'Show CA certificate',
 'show certificate' => 'Show file',
 'show crl' => 'Show certificate revocation list',
+'show dh' => 'Show Diffie-Hellman parameters',
 'show host certificate' => 'Show host certificate',
 'show last x lines' => 'Show last x lines',
 'show lines' => 'Show lines',
diff --git a/lfs/tor b/lfs/tor
index f31261244..0bbfd3541 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Anonymizing overlay network for TCP (The onion router)
-VER        = 0.4.7.11
+VER        = 0.4.7.12
THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 73
+PAK_VER    = 74
DEPS       = libseccomp
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e
+$(DL_FILE)_BLAKE2 = 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree

    