netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN Client Export Update

Browse Source 
- Update Windows 2.6.x installer. Issue #16542
- Remove Windows 2.5.x installer.
- Fix Viscosity bundle export with password-protected EC cert keys.
  Issue #16329
This commit is contained in:
jim-p
2025-12-01 13:10:30 -05:00
parent b725ec6ee7
commit a2d11e7667
6 changed files with 15 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/openvpn-client-export/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PORTNAME= openvpn-client-export
PORTVERSION= 2.6.7
PORTVERSION= 2.6.17
CATEGORIES= security
MASTER_SITES= https://files.netgate.com/packages/openvpn-client-export/
security/openvpn-client-export/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1699895387
SHA256 (openvpn-client-export-2.6.7.tgz) = d9954c2194485564521343aee609541d19500d9520e2314658e7740973192f0d
SIZE (openvpn-client-export-2.6.7.tgz) = 24208495
TIMESTAMP = 1764610523
SHA256 (openvpn-client-export-2.6.17.tgz) = 013878fa5a6ad66e457e62b78f93411acc89a71d2dcad81304e3dac416494a15
SIZE (openvpn-client-export-2.6.17.tgz) = 19169296
security/openvpn-client-export/pkg-plist
+2 -4
View File
@@ -1,10 +1,8 @@
share/openvpn/client-export/template/7zsd_All.sfx
share/openvpn/client-export/template/config-import
share/openvpn/client-export/template/config-standard
share/openvpn/client-export/template/OpenVPN-2.5.9-I601-amd64.msi
share/openvpn/client-export/template/OpenVPN-2.5.9-I601-x86.msi
share/openvpn/client-export/template/OpenVPN-2.6.7-I001-amd64.msi
share/openvpn/client-export/template/OpenVPN-2.6.7-I001-x86.msi
share/openvpn/client-export/template/OpenVPN-2.6.17-I001-amd64.msi
share/openvpn/client-export/template/OpenVPN-2.6.17-I001-x86.msi
share/openvpn/client-export/template/openvpn-install-2.4.12-I601-Win10.exe
share/openvpn/client-export/template/openvpn-install-2.4.12-I601-Win7.exe
share/openvpn/client-export/template/openvpn-postinstall.exe
security/pfSense-pkg-openvpn-client-export/Makefile
+2 -2
View File
@@ -1,5 +1,5 @@
PORTNAME= pfSense-pkg-openvpn-client-export
PORTVERSION= 1.9.7
PORTVERSION= 1.9.8
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
@@ -12,7 +12,7 @@ WWW= https://docs.netgate.com/pfsense/en/latest/packages/openvpn-client-export.
LICENSE= APACHE20
RUN_DEPENDS= openvpn>=2.6.0:security/openvpn \
openvpn-client-export>=2.6.7:security/openvpn-client-export \
openvpn-client-export>=2.6.17:security/openvpn-client-export \
zip>0:archivers/zip \
7-zip>0:archivers/7-zip
security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.inc
+7 -15
View File
@@ -28,13 +28,9 @@ require_once("util.inc");
require_once("pfsense-utils.inc");
global $current_openvpn_version, $current_openvpn_version_rev;
$current_openvpn_version = "2.6.7";
$current_openvpn_version = "2.6.17";
$current_openvpn_version_rev = "001";
global $previous_openvpn_version, $previous_openvpn_version_rev;
$previous_openvpn_version = "2.5.9";
$previous_openvpn_version_rev = "601";
global $legacy_openvpn_version, $legacy_openvpn_version_rev;
$legacy_openvpn_version = "2.4.12";
$legacy_openvpn_version_rev = "601";
@@ -590,7 +586,6 @@ EOF;
function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $blockoutsidedns, $legacy, $bindmode, $usetoken, $outpass, $p12encryption, $proxy, $advancedoptions, $openvpn_version = "x64-current", $usepkcs11, $pkcs11providers, $pkcs11id, $silent) {
global $g, $input_errors;
global $current_openvpn_version, $current_openvpn_version_rev;
global $previous_openvpn_version, $previous_openvpn_version_rev;
global $legacy_openvpn_version, $legacy_openvpn_version_rev;
switch ($openvpn_version) {
@@ -602,12 +597,6 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $veri
$legacy = true;
$client_install_exe = "openvpn-install-{$legacy_openvpn_version}-I{$legacy_openvpn_version_rev}-Win10.exe";
break;
case "x86-previous":
$client_install_exe = "OpenVPN-{$previous_openvpn_version}-I{$previous_openvpn_version_rev}-x86.msi";
break;
case "x64-previous":
$client_install_exe = "OpenVPN-{$previous_openvpn_version}-I{$previous_openvpn_version_rev}-amd64.msi";
break;
case "x86-current":
$client_install_exe = "OpenVPN-{$current_openvpn_version}-I{$current_openvpn_version_rev}-x86.msi";
break;
@@ -649,7 +638,7 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $veri
/* OpenVPN Win7/Win10 installer stub is 32-bit, but could need to read a 64-bit registry.
* Using the 64-bit-aware openvpn-postinstall works fine even on 32-bit Windows 10.
*/
if (in_array($openvpn_version, array('Win7', 'Win10', 'x64-previous', 'x64-current'))) {
if (in_array($openvpn_version, array('Win7', 'Win10', 'x64-current'))) {
rename("{$tempdir}/openvpn-postinstall64.exe", "{$tempdir}/openvpn-postinstall.exe");
}
@@ -823,13 +812,16 @@ EOF;
// write user .key
if (!empty($outpass)) {
$prvkey = base64_decode($cert['prv']);
$key_details = openssl_pkey_get_details(openssl_pkey_get_private($prvkey));
$keytype = ($key_details['type'] == OPENSSL_KEYTYPE_RSA) ? 'rsa' : 'ec';
$keyfile = "{$tempdir}/key.key";
$clearkeyfile = "{$tempdir}/key-clear.key";
file_put_contents($clearkeyfile, base64_decode($cert['prv']));
file_put_contents($clearkeyfile, $prvkey);
$eoutpass = escapeshellarg($outpass);
$ekeyfile = escapeshellarg($keyfile);
$eclearkeyfile = escapeshellarg($clearkeyfile);
exec("/usr/bin/openssl rsa -in {$eclearkeyfile} -out {$ekeyfile} -des3 -passout pass:{$eoutpass}");
exec("/usr/bin/openssl {$keytype} -in {$eclearkeyfile} -out {$ekeyfile} -des3 -passout pass:{$eoutpass}");
unlink($clearkeyfile);
} else {
$keyfile = "{$tempdir}/key.key";
security/pfSense-pkg-openvpn-client-export/files/usr/local/www/vpn_openvpn_export.php
-23
View File
@@ -29,7 +29,6 @@ require_once("certs.inc");
require_once("classes/Form.class.php");
global $current_openvpn_version, $current_openvpn_version_rev;
global $previous_openvpn_version, $previous_openvpn_version_rev;
global $legacy_openvpn_version, $legacy_openvpn_version_rev;
global $dyndns_split_domain_types, $p12_encryption_levels;
@@ -377,12 +376,6 @@ if (!empty($act)) {
$legacy = true;
$exp_name .= "{$legacy_openvpn_version}-I{$legacy_openvpn_version_rev}-Win10.exe";
break;
case "x86-previous":
$exp_name .= "{$previous_openvpn_version}-I{$previous_openvpn_version_rev}-x86.exe";
break;
case "x64-previous":
$exp_name .= "{$previous_openvpn_version}-I{$previous_openvpn_version_rev}-amd64.exe";
break;
case "x86-current":
$exp_name .= "{$current_openvpn_version}-I{$current_openvpn_version_rev}-x86.exe";
break;
@@ -1026,11 +1019,6 @@ function server_changed() {
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-current\"," + i + ", -1)' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 64-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-current\"," + i + ", -1)' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "<br\/>- Previous Windows Installers (<?=$previous_openvpn_version . '-Ix' . $previous_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-previous\"," + i + ", -1)' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 64-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-previous\"," + i + ", -1)' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "<br\/>- Legacy Windows Installers (<?=$legacy_openvpn_version . '-Ix' . $legacy_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-Win10\"," + i + ", -1)' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 10/2016/2019<\/a>";
@@ -1074,12 +1062,6 @@ function server_changed() {
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-current\", -1," + j + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<br\/>- Previous Windows Installer (<?=$previous_openvpn_version . '-Ix' . $previous_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-previous\", -1," + j + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 64-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-previous\", -1," + j + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<br\/>- Legacy Windows Installers (<?=$legacy_openvpn_version . '-Ix' . $legacy_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-Win10\", -1," + j + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 10/2016/2019<\/a>";
@@ -1130,11 +1112,6 @@ function server_changed() {
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-current\"," + i + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 64-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-current\"," + i + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "<br\/>- Previous Windows Installer (<?=$previous_openvpn_version . '-Ix' . $previous_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-previous\"," + i + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 64-bit<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-previous\"," + i + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 32-bit<\/a>";
cell2.innerHTML += "<br\/>- Legacy Windows Installers (<?=$legacy_openvpn_version . '-Ix' . $legacy_openvpn_version_rev?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-Win10\"," + i + ")' class=\"btn btn-sm btn-primary\"><i class=\"fa-solid fa-download\"></i> 10/2016/2019<\/a>";