Merge branch 'master' of https://github.com/pfsense/pfsense-packages into pfBlockerNG_Beta_0.99

2 files changed, 7 insertions, 4 deletions

diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 44604a90..f635bbd0 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -39,12 +39,13 @@ require_once("util.inc");
 require_once("pfsense-utils.inc");
 
 global $current_openvpn_version, $current_openvpn_version_rev;
-$current_openvpn_version     = "2.3.5";
+$current_openvpn_version     = "2.3.6";
 $current_openvpn_version_rev = "01";
 
 function openvpn_client_export_install() {
+	global $current_openvpn_version;
 	conf_mount_rw();
-	$tarpath = "/usr/local/pkg/openvpn-client-export.tgz";
+	$tarpath = "/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz";
 	$phpfile = "vpn_openvpn_export.php";
 	$ovpndir = "/usr/local/share/openvpn";
 	$workdir = "{$ovpndir}/client-export";
@@ -57,6 +58,7 @@ function openvpn_client_export_install() {
 }
 
 function openvpn_client_export_deinstall() {
+	global $current_openvpn_version;
 	conf_mount_rw();
 	$phpfile = "vpn_openvpn_export.php";
 	$phpfile2 = "vpn_openvpn_export_shared.php";
@@ -65,6 +67,7 @@ function openvpn_client_export_deinstall() {
 
 	unlink_if_exists("/usr/local/www/{$phpfile}");
 	unlink_if_exists("/usr/local/www/{$phpfile2}");
+	unlink_if_exists("/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz");
 	exec("/bin/rm -r {$workdir}");
 	conf_mount_ro();
 }
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml
index f96336b3..15986428 100755
--- a/config/openvpn-client-export/openvpn-client-export.xml
+++ b/config/openvpn-client-export/openvpn-client-export.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
 	<name>OpenVPN Client Export</name>
-	<version>1.2.14</version>
+	<version>1.2.15</version>
 	<title>OpenVPN Client Export</title>
 	<include_file>/usr/local/pkg/openvpn-client-export.inc</include_file>
 	<backup_file></backup_file>
@@ -27,7 +27,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://files.pfsense.org/packages/openvpn-client-export/openvpn-client-export.tgz</item>
+		<item>https://files.pfsense.org/packages/openvpn-client-export/openvpn-client-export-2.3.6.tgz</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>