0936ece73f
Feedback from sthen@ including adding a conflict marker as a kludge to ensure that if a user wants to use AV support that the correct version is installed (0.94 or newer) since it is an optional dependency. Great job by the Clam crew for making this such a mess. The current version of MailScanner is broken if using 0.94 since the commandline opts were changed. ok todd@ sthen@
42 lines
1.7 KiB
Plaintext
42 lines
1.7 KiB
Plaintext
$OpenBSD: patch-lib_clamav-wrapper,v 1.2 2008/11/07 02:33:58 brad Exp $
|
|
--- lib/clamav-wrapper.orig Fri Sep 5 04:55:29 2008
|
|
+++ lib/clamav-wrapper Thu Nov 6 20:24:55 2008
|
|
@@ -51,7 +51,7 @@
|
|
|
|
# You may want to check this script for bash-isms
|
|
|
|
-TempDir="/tmp/clamav.$$"
|
|
+TempDir="`mktemp -d /var/spool/MailScanner/clamav.XXXXXXXXXXXXXXX`"
|
|
ClamUser="clamav"
|
|
ClamGroup="clamav"
|
|
|
|
@@ -98,23 +98,23 @@ ExtraScanOptions=""
|
|
# LESS COMMON unpackers, which probably aren't installed by default
|
|
# (hence disabled)
|
|
# Uncomment ONE of the following lines if you have unrar installed
|
|
-#ExtraScanOptions="$ExtraScanOptions --unrar"
|
|
+ExtraScanOptions="$ExtraScanOptions --unrar"
|
|
#ExtraScanOptions="$ExtraScanOptions --unrar=/path/to/unrar"
|
|
|
|
# Uncomment ONE of the following lines if you have unarj installed
|
|
-#ExtraScanOptions="$ExtraScanOptions --unarj"
|
|
+ExtraScanOptions="$ExtraScanOptions --unarj"
|
|
#ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj"
|
|
|
|
# Uncomment ONE of the following lines if you have unace installed
|
|
-#ExtraScanOptions="$ExtraScanOptions --unace"
|
|
+ExtraScanOptions="$ExtraScanOptions --unace"
|
|
#ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace"
|
|
|
|
# Uncomment ONE of the following lines if you have lha installed
|
|
-#ExtraScanOptions="$ExtraScanOptions --lha"
|
|
+ExtraScanOptions="$ExtraScanOptions --lha"
|
|
#ExtraScanOptions="$ExtraScanOptions --lha=/path/to/lha"
|
|
|
|
# Uncomment ONE of the following lines if you have zoo installed
|
|
-#ExtraScanOptions="$ExtraScanOptions --zoo"
|
|
+ExtraScanOptions="$ExtraScanOptions --zoo"
|
|
#ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo"
|
|
|
|
# Now increase the allowed expansion size of zip files
|