On 2019-12-10 23:47:05 [+0100], To sub...@bugs.debian.org wrote:
> This updates clamav to its latest version provided by upstream. The
> import part is the fix for CVE-2019-15961.
I slightly updated the package to
- add the new `clamonacc' binary to the clamav-daemon package.
- remove the `ScanOnAccess' option from the postinst/debconf script.
The option is deprecated and the functionality moved into the clamonacc
binary.
Sebastian
diff --git a/debian/changelog b/debian/changelog
index f41cde8..f83f907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ clamav (0.102.1+dfsg-0+deb9u1) stretch; urgency=medium
- Let freshclam show progress during download (Closes: #690789).
* Update symbol file.
* Add libfreshclam to the libclamav9 package.
+ * Add the clamonacc binary to the clamav-daemon package.
+ * Drop ScanOnAccess option. The clamonacc provides this functionality.
- -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Sun, 08 Dec 2019 22:05:51 +0100
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Mon, 23 Dec 2019 21:07:34 +0100
clamav (0.101.4+dfsg-0+deb9u1) stretch; urgency=medium
diff --git a/debian/clamav-daemon.config.in b/debian/clamav-daemon.config.in
index 60bef89..131336c 100644
--- a/debian/clamav-daemon.config.in
+++ b/debian/clamav-daemon.config.in
@@ -72,7 +72,6 @@ set_debconf_value daemon LogSyslog
set_debconf_value daemon LogFile
set_debconf_value daemon LogTime
set_debconf_value daemon LogRotate
-set_debconf_value daemon ScanOnAccess
set_debconf_value daemon OnAccessMaxFileSize
set_debconf_value daemon AllowAllMatchScan
set_debconf_value daemon ForceToDisk
@@ -327,13 +326,10 @@ while [ "$STATE" != "End" ]; do
StateGeneric low clamav-daemon/LogTime LogRotate LogFile
;;
"LogRotate")
- StateGeneric low clamav-daemon/LogRotate ScanOnAccess LogFile
- ;;
- "ScanOnAccess")
- StateGeneric low clamav-daemon/ScanOnAccess OnAccessMaxFileSize LogFile
+ StateGeneric low clamav-daemon/LogRotate LogFile
;;
"OnAccessMaxFileSize")
- StateGeneric low clamav-daemon/OnAccessMaxFileSize AllowAllMatchScan ScanOnAccess
+ StateGeneric low clamav-daemon/OnAccessMaxFileSize AllowAllMatchScan
;;
"AllowAllMatchScan")
StateGeneric low clamav-daemon/AllowAllMatchScan ForceToDisk OnAccessMaxFileSize
diff --git a/debian/clamav-daemon.install b/debian/clamav-daemon.install
index 1ae9a50..ef63c2a 100644
--- a/debian/clamav-daemon.install
+++ b/debian/clamav-daemon.install
@@ -2,5 +2,6 @@ debian/script usr/share/bug/clamav-daemon/
debian/tmp/lib/systemd/system/clamav-daemon.service
debian/tmp/usr/bin/clamconf
debian/tmp/usr/bin/clamdtop
+debian/tmp/usr/bin/clamonacc
debian/tmp/usr/sbin/clamd
debian/usr.sbin.clamd etc/apparmor.d/
diff --git a/debian/clamav-daemon.postinst.in b/debian/clamav-daemon.postinst.in
index 77f7c2c..a51cf21 100644
--- a/debian/clamav-daemon.postinst.in
+++ b/debian/clamav-daemon.postinst.in
@@ -116,12 +116,8 @@ case "$1" in
db_get clamav-daemon/BytecodeTimeout || true
BytecodeTimeout="$RET"
fi
- db_get clamav-daemon/ScanOnAccess || true
- ScanOnAccess="$RET"
- if [ "$ScanOnAccess" = "true" ]; then
- db_get clamav-daemon/OnAccessMaxFileSize || true
- OnAccessMaxFileSize="$RET"
- fi
+ db_get clamav-daemon/OnAccessMaxFileSize || true
+ OnAccessMaxFileSize="$RET"
db_get clamav-daemon/AllowAllMatchScan || true
AllowAllMatchScan="$RET"
db_get clamav-daemon/ForceToDisk || true
@@ -148,8 +144,6 @@ case "$1" in
# Use the defaults instead of the bogus values created by that versions.
db_metaget clamav-daemon/LogRotate default || true
LogRotate="$RET"
- db_metaget clamav-daemon/ScanOnAccess default || true
- ScanOnAccess="$RET"
OnAccessMaxFileSize=""
OnAccessIncludePath=""
OnAccessExcludePath=""
@@ -327,7 +321,6 @@ SendBufTimeout $SendBufTimeout
MaxQueue $MaxQueue
ExtendedDetectionInfo $ExtendedDetectionInfo
OLE2BlockMacros $OLE2BlockMacros
-ScanOnAccess $ScanOnAccess
AllowAllMatchScan $AllowAllMatchScan
ForceToDisk $ForceToDisk
DisableCertCheck $DisableCertCheck
diff --git a/debian/clamav-daemon.templates b/debian/clamav-daemon.templates
index 8b71902..0b8ea43 100644
--- a/debian/clamav-daemon.templates
+++ b/debian/clamav-daemon.templates
@@ -143,11 +143,6 @@ Type: boolean
Default: true
_Description: Do you want to enable log rotation?
-Template: clamav-daemon/ScanOnAccess
-Type: boolean
-Default: false
-_Description: Do you want to enable on-access scanning?
-
Template: clamav-daemon/OnAccessMaxFileSize
Type: string
Default: 5M
