aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/havp/havp.inc13
-rw-r--r--config/havp/havp.xml4
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 15 insertions, 8 deletions
diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 38412f31..9e931a95 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -87,9 +87,13 @@ define('HVDEF_PID_FILE', '/var/run/havp.pid');
$pf_version=substr(trim(file_get_contents("/etc/version")), 0, 3);
if ($pf_version == "2.1" || $pf_version == "2.2") {
- define("HVDEF_WORK_DIR", "/usr/pbi/havp-" . php_uname("m") . "/local/etc");
+ define("HVDEF_WORK_DIR", "/usr/pbi/havp-" . php_uname("m") . "/local/etc");
+ define('HVDEF_TEMPLATES', "/usr/pbi/havp-" . php_uname("m") . "/local/share/examples/havp/templates");
+ define('HVDEF_TEMPLATES_EX', HVDEF_TEMPLATES . '_ex');
} else {
- define("HVDEF_WORK_DIR", "/usr/local/etc/havp");
+ define("HVDEF_WORK_DIR", "/usr/local/etc/havp");
+ define('HVDEF_TEMPLATES', '/usr/local/share/examples/havp/templates');
+ define('HVDEF_TEMPLATES_EX', HVDEF_TEMPLATES . '_ex');
}
define('HVDEF_LOG_DIR', '/var/log/havp');
@@ -97,8 +101,6 @@ define('HVDEF_TEMP_DIR', '/var/tmp');
define('HVDEF_HAVPTEMP_DIR', HVDEF_TEMP_DIR . '/havp');
define('HVDEF_RAMTEMP_DIR', HVDEF_TEMP_DIR . '/havpRAM');
define('HVDEF_SCANTEMPFILE', '/havp-XXXXXX');
-define('HVDEF_TEMPLATES', '/usr/local/share/examples/havp/templates');
-define('HVDEF_TEMPLATES_EX', HVDEF_TEMPLATES . '_ex');
define('HVDEF_FILTER_RULES', '/tmp/rules.havp');
define('HVDEF_HAVP_CONFIG', HVDEF_WORK_DIR . '/havp.config');
define('HVDEF_HAVP_XMLCONF', HVDEF_WORK_DIR . '/havp_conf.xml');
@@ -238,6 +240,9 @@ function havp_deinstall() {
// unlink_if_exists(HVDEF_AVUPD_SCRIPT);
// unlink_if_exists(HVDEF_CLAM_PID);
// unlink_if_exists(HVDEF_CLAM_SOCKET);
+ if (is_dir("/usr/local/share/examples/havp/")) {
+ mwexec("/bin/rm -rf /usr/local/share/examples/havp/");
+ }
umountRAMDisk();
}
/*
diff --git a/config/havp/havp.xml b/config/havp/havp.xml
index c99bf8c4..a1484a59 100644
--- a/config/havp/havp.xml
+++ b/config/havp/havp.xml
@@ -212,9 +212,11 @@
<option><value>es</value><name>Spanish</name></option>
<option><value>fr</value><name>French</name></option>
<option><value>it</value><name>Italian</name></option>
- <option><value>nf</value><name>Norf'k</name></option>
+ <option><value>nl</value><name>Dutch</name></option>
+ <option><value>pf</value><name>Norf'k</name></option>
<option><value>pl</value><name>Polish</name></option>
<option><value>ru</value><name>Russian</name></option>
+ <option><value>sv</value><name>Swedish</name></option>
</options>
</field>
<field>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index b007398b..d107a9b8 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1201,7 +1201,7 @@
<ports_after>security/clamav</ports_after>
</build_pbi>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
- <version>1.08</version>
+ <version>1.09</version>
<status>BETA</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index a265cd1d..fde529cb 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1397,7 +1397,7 @@
<depends_on_package_pbi>havp-0.91_1-i386.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/www/havp</build_port_path>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
- <version>0.91_1 pkg v1.05</version>
+ <version>0.91_1 pkg v1.09</version>
<status>BETA</status>
<required_version>1.2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 89100c32..1d6d070a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1384,7 +1384,7 @@
<depends_on_package_pbi>havp-0.91_1-amd64.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/www/havp</build_port_path>
<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
- <version>0.91_1 pkg v1.05</version>
+ <version>0.91_1 pkg v1.09</version>
<status>BETA</status>
<required_version>1.2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>