From 68db1085ae492444f2fb3caf9de0454091c52a89 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Dec 2015 09:58:02 +0100 Subject: [PATCH 1/4] Remove obsolete pre-2.3 stuff --- .../usr/local/pkg/openvpn-client-export.inc | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.inc b/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.inc index 201f49f0654f..f9c9cf7aa920 100644 --- a/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.inc +++ b/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.inc @@ -43,24 +43,6 @@ global $current_openvpn_version, $current_openvpn_version_rev; $current_openvpn_version = "2.3.8"; $current_openvpn_version_rev = "01"; -function openvpn_client_export_install() { - global $current_openvpn_version; - - $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if ($pfs_version == "2.1" || $pfs_version == "2.2") { - conf_mount_rw(); - $tarpath = "/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz"; - $ovpndir = "/usr/local/share/openvpn"; - $workdir = "{$ovpndir}/client-export"; - - if (!is_dir($workdir)) { - mkdir($workdir, 0777, true); - } - exec("/usr/bin/tar zxf {$tarpath} -C {$ovpndir}"); - conf_mount_ro(); - } -} - function openvpn_client_export_deinstall() { exec("/bin/rm -r /usr/local/share/openvpn/client-export"); } @@ -176,7 +158,6 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) { function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys = false, $proxy, $expformat = "baseconf", $outpass = "", $skiptls = false, $doslines = false, $openvpnmanager, $advancedoptions = "") { global $config, $input_errors, $g; - $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3); $nl = ($doslines) ? "\r\n" : "\n"; $conf = ""; @@ -343,11 +324,7 @@ EOF; // add optional settings if (!empty($settings['compression'])) { - if ($pfs_version > 2.1) { - $conf .= "comp-lzo {$settings['compression']}{$nl}"; - } else { - $conf .= "comp-lzo{$nl}"; - } + $conf .= "comp-lzo {$settings['compression']}{$nl}"; } if ($settings['passtos']) { @@ -527,9 +504,6 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $veri $ovpndir = "/usr/local/share/openvpn"; $workdir = "{$ovpndir}/client-export"; - if (!file_exists($workdir . "/template/{$client_install_exe}")) { - openvpn_client_export_install(); - } $validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid); if ($validconfig) { @@ -638,10 +612,6 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead $uname_p = trim(exec("uname -p")); $ovpndir = "/usr/local/share/openvpn/"; - if (!file_exists($workdir . "/template/openvpn-install.exe")) { - openvpn_client_export_install(); - } - $uniq = uniqid(); $tempdir = $g['tmp_path'] . "/openvpn-export-" . $uniq; $zipfile = $g['tmp_path'] . "/{$uniq}-Viscosity.visc.zip"; From d3f57545bb08fa09b8a56ca827fa04beff776570 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Dec 2015 10:02:01 +0100 Subject: [PATCH 2/4] Remove obsoleted function reference, bump version --- .../files/usr/local/pkg/openvpn-client-export.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.xml b/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.xml index d7453c463fdd..3f263573e8c5 100644 --- a/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.xml +++ b/security/pfSense-pkg-openvpn-client-export/files/usr/local/pkg/openvpn-client-export.xml @@ -44,7 +44,7 @@ ]]> OpenVPN Client Export - 1.3.4 + 1.3.5 OpenVPN Client Export /usr/local/pkg/openvpn-client-export.inc @@ -80,9 +80,6 @@ /etc/inc/priv/ https://packages.pfsense.org/packages/config/openvpn-client-export/openvpnexport.inc - - openvpn_client_export_install(); - openvpn_client_export_deinstall(); From 5dfeb8ee8a7f2bd5e2fd98c3c3fd253bcb9a236c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Dec 2015 10:05:01 +0100 Subject: [PATCH 3/4] Bump package version, nuke unneeded stuff --- .../share/pfSense-pkg-openvpn-client-export/info.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml b/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml index 8c4cc3d53216..4f2fdca29e0b 100644 --- a/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml +++ b/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml @@ -5,15 +5,9 @@ openvpn-client-export Security - zip-3.0_1-##ARCH##.pbi p7zip-9.20.1_2-##ARCH##.pbi - /usr/ports/archivers/p7zip - /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.4 + 1.3.5 RELEASE - 2.2 - https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml + 2.3 openvpn-client-export.xml From 417f8b64090bbe0d6fedd9dfe5edef5bc79dbdda Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Dec 2015 10:09:43 +0100 Subject: [PATCH 4/4] Bump package version --- security/pfSense-pkg-openvpn-client-export/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/pfSense-pkg-openvpn-client-export/Makefile b/security/pfSense-pkg-openvpn-client-export/Makefile index 009cc5d0f1dd..73bd15fefc12 100644 --- a/security/pfSense-pkg-openvpn-client-export/Makefile +++ b/security/pfSense-pkg-openvpn-client-export/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-openvpn-client-export -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.5 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty