From bdb20484dc5560467bbf77b3ef57d82008aaae83 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 12 Jan 2016 10:03:39 -0500 Subject: This seems to have broken more than it helped on 2.2.x. Revert "Update OpenVPN client export installer to 2.3.10, use a newer sfx module." This reverts commit e88d4c28e34c330dfa34c48c4c348317959d6d81. --- config/openvpn-client-export/openvpn-client-export.inc | 4 ++-- config/openvpn-client-export/openvpn-client-export.xml | 2 +- pkg_config.10.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 108b05cd..c6a6f6e6 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -40,7 +40,7 @@ require_once("util.inc"); require_once("pfsense-utils.inc"); global $current_openvpn_version, $current_openvpn_version_rev; -$current_openvpn_version = "2.3.10"; +$current_openvpn_version = "2.3.8"; $current_openvpn_version_rev = "01"; function openvpn_client_export_install() { @@ -625,7 +625,7 @@ RunProgram="openvpn-postinstall.exe" // create the final installer $outfile = "{$tempdir}-install.exe"; chdir($g['tmp_path']); - exec("/bin/cat {$tempdir}/7zsd_All.sfx {$tempdir}/7zipConfig {$tempdir}/archive.7z > {$outfile}"); + exec("/bin/cat {$tempdir}/7zS.sfx {$tempdir}/7zipConfig {$tempdir}/archive.7z > {$outfile}"); // cleanup exec("/bin/rm -r {$tempdir}"); diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index 0b6fa33b..adae671e 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -44,7 +44,7 @@ ]]> OpenVPN Client Export - 1.3.6 + 1.3.0 OpenVPN Client Export /usr/local/pkg/openvpn-client-export.inc diff --git a/pkg_config.10.xml b/pkg_config.10.xml index b6f72b75..95f9d04a 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1235,7 +1235,7 @@ /usr/ports/archivers/zip security share/openvpn/client-export/template/config-import:security/openvpn-client-export bin/zip:archivers/zip bin/7z:archivers/p7zip - 1.3.6 + 1.3.0 RELEASE 2.2 https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml -- cgit v1.2.3