Core 172 Testing Fails

Getting Started with IPFire Updates Trouble
21

Hi all,
@bonnietwin according to the OpenVPN problem can you please try the following for /var/ipfire/langs/en.pl → 

$ diff -u /var/ipfire/langs/en.pl_core172_buggy /var/ipfire/langs/en.pl
--- /var/ipfire/langs/en.pl_core172_buggy	2022-12-04 20:06:24.628640598 +0100
+++ /var/ipfire/langs/en.pl	2022-12-04 20:11:56.363993014 +0100
@@ -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',

for english webinterface only!!!

For german webinterface → 

--- /var/ipfire/langs/de.pl_core172_buggy	2022-12-04 20:34:44.901874457 +0100
+++ /var/ipfire/langs/de.pl	2022-12-04 20:39:54.810759610 +0100
@@ -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',

and for /srv/web/ipfire/cgi-bin/ovpnmain.cgi → 

$ diff -u /srv/web/ipfire/cgi-bin/ovpnmain.cgi_core172_buggy /srv/web/ipfire/cgi-bin/ovpnmain.cgi
--- /srv/web/ipfire/cgi-bin/ovpnmain.cgi_core172_buggy	2022-12-04 19:58:07.719077771 +0100
+++ /srv/web/ipfire/cgi-bin/ovpnmain.cgi	2022-12-04 20:32:13.904384551 +0100
@@ -977,7 +977,7 @@
   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 @@
 
 	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'}' />

you need to execute a
update-lang-cache
after the changes.

Best,

Erik

3 Likes
22

Hi @ummeegge

Excellent work. Just fed those changes into my vm IPFire and the OpenVPN page is working fine again.

Will you submit that as a patch or do you want me to do that on your behalf?

2 Likes
23

Thanks for testing and delivering the feedback Adolf :+1:, have wrote already @pmueller and have ask for testing and checking this topic but am not sure how much work is around the corner for him so it might be great if you can go for this since i do not have a build environment around.

Best,

Erik

24

Hi Erik, I thought I remembered that you no longer had a build environment.

No problems, I will submit a patch and mark it as suggested by yourself. Thanks for the help.

1 Like
25

You´re welcome and thanks again.

26

Patch with your fix has been submitted.

https://patchwork.ipfire.org/project/ipfire/list/?series=3223

3 Likes