From 8b5af2e44a3cb27424d58c6123edc3934cb8f5c8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 10 Aug 2017 08:29:58 +0200 Subject: [PATCH] security/clamav: add model version which now forces migration This adds the defaults to the config, which adds the database mirror, which finally writes freshclam.conf in usable state. Yay! \o/ --- security/clamav/Makefile | 2 +- security/clamav/pkg-descr | 10 +++++----- security/clamav/src/etc/inc/plugins.inc.d/clamav.inc | 2 +- .../OPNsense/ClamAV/Api/ServiceController.php | 2 +- .../mvc/app/models/OPNsense/ClamAV/General.xml | 1 + .../src/opnsense/scripts/OPNsense/ClamAV/setup.sh | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 5a2a72358..912d997de 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= clamav PLUGIN_VERSION= 0.1 -PLUGIN_COMMENT= ClamAV anti virus scanner +PLUGIN_COMMENT= Antivirus engine for detecting malicious threats PLUGIN_DEPENDS= clamav PLUGIN_MAINTAINER= m.muenz@gmail.com PLUGIN_DEVEL= yes diff --git a/security/clamav/pkg-descr b/security/clamav/pkg-descr index df3dd26b9..4fe5a529d 100644 --- a/security/clamav/pkg-descr +++ b/security/clamav/pkg-descr @@ -1,8 +1,8 @@ -ClamAV® is an open source (GPL) anti-virus engine used in a -variety of situations including email scanning, web scanning, -and end point security. It provides a number of utilities -including a flexible and scalable multi-threaded daemon, -a command line scanner and an advanced tool for automatic +ClamAV(r) is an open source (GPL) anti-virus engine used in a +variety of situations including email scanning, web scanning, +and end point security. It provides a number of utilities +including a flexible and scalable multi-threaded daemon, +a command line scanner and an advanced tool for automatic database updates. WWW: https://www.clamav.net/ diff --git a/security/clamav/src/etc/inc/plugins.inc.d/clamav.inc b/security/clamav/src/etc/inc/plugins.inc.d/clamav.inc index 996076410..15c7357f6 100644 --- a/security/clamav/src/etc/inc/plugins.inc.d/clamav.inc +++ b/security/clamav/src/etc/inc/plugins.inc.d/clamav.inc @@ -57,6 +57,6 @@ function clamav_services() 'pidfile' => '/var/run/clamav/freshclam.pid' ); } - + return $services; } diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php index bb94290d1..26b3b6f7a 100644 --- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php +++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php @@ -54,7 +54,7 @@ class ServiceController extends ApiControllerBase } else { return array("response" => array()); } - } + } /** * start clamav service (in background) * @return array diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml index 261f956f4..4c329a83f 100644 --- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml +++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml @@ -1,6 +1,7 @@ //OPNsense/clamav/general ClamAV configuration + 1.0.0 0 diff --git a/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/setup.sh b/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/setup.sh index d7987741a..e8c24bb19 100644 --- a/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/setup.sh +++ b/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/setup.sh @@ -10,4 +10,4 @@ chmod 750 /var/db/clamav mkdir -p /var/log/clamav chown -R clamav:clamav /var/log/clamav -chmod 750 /var/log/clamav \ No newline at end of file +chmod 750 /var/log/clamav