From 8ba5aca61c6e2293831a0e7175e0c6b227f8f97e Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sat, 11 Jun 2016 14:15:40 +0200 Subject: [PATCH 1/2] created a fix for 914 (openvpn-client-export.inc) --- src/etc/inc/openvpn-client-export.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/openvpn-client-export.inc b/src/etc/inc/openvpn-client-export.inc index ef00a9e29..fb7292e53 100644 --- a/src/etc/inc/openvpn-client-export.inc +++ b/src/etc/inc/openvpn-client-export.inc @@ -368,7 +368,7 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys } } $command = "cd " . escapeshellarg("{$tempdir}/..") - . " && /usr/local/bin/zip -r " + . " && /usr/local/bin/7z -tzip -y -r a " . escapeshellarg("/tmp/{$prefix}-config.zip") . " " . escapeshellarg($prefix); exec($command); @@ -678,7 +678,7 @@ EOF; } // Zip Viscosity file - exec("cd {$tempdir}/.. && /usr/local/bin/zip -r {$zipfile} Viscosity.visc"); + exec("cd {$tempdir}/.. && /usr/local/bin/7z -tzip -y -r a {$zipfile} Viscosity.visc"); // Remove temporary directory exec("rm -rf {$tempdir}"); @@ -805,7 +805,7 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco $shkeyfile = "{$tempdir}/{$shkeyfile}"; file_put_contents("{$shkeyfile}", base64_decode($settings['shared_key'])); - exec("cd {$tempdir}/.. && /usr/local/bin/zip -r /tmp/{$prefix}-config.zip {$prefix}"); + exec("cd {$tempdir}/.. && /usr/local/bin/7z -tzip -y -r a /tmp/{$prefix}-config.zip {$prefix}"); // Remove temporary directory exec("rm -rf {$tempdir}"); From bd20f9351b1d489cf3a6cc10221a1af2def0c59c Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sat, 11 Jun 2016 15:12:10 +0200 Subject: [PATCH 2/2] remove zip as dependency --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 105b9fa48..709dc7a95 100644 --- a/Makefile +++ b/Makefile @@ -134,8 +134,7 @@ CORE_DEPENDS?= apinger \ suricata \ syslogd \ unbound \ - wol \ - zip + wol WRKDIR?=${.CURDIR}/work WRKSRC= ${WRKDIR}/src