16 files changed, 201 insertions, 2 deletions

diff --git a/security/samba-vscan/Makefile b/security/samba-vscan/Makefile
index edc892660908..b836adab6385 100644
--- a/security/samba-vscan/Makefile
+++ b/security/samba-vscan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	samba-vscan
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://heanet.dl.sourceforge.net/sourceforge/openantivirus/ \
 		http://easynews.dl.sourceforge.net/sourceforge/openantivirus/ \
diff --git a/security/samba-vscan/files/patch-vscan-clamav.conf b/security/samba-vscan/files/patch-vscan-clamav.conf
new file mode 100644
index 000000000000..9c48d6c9592c
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-clamav.conf
@@ -0,0 +1,11 @@
+--- clamav/vscan-clamav.conf.old	Fri Aug 13 14:15:08 2004
++++ clamav/vscan-clamav.conf	Fri Aug 13 14:16:05 2004
+@@ -59,7 +59,7 @@
+ 
+ ; socket name of clamd (default: /var/run/clamd). Setting will be ignored if
+ ; libclamav is used
+-clamd socket name = /var/run/clamd
++clamd socket name = /var/run/clamav/clamd
+ 
+ ; limits, if vscan-clamav was build for using the clamav library (libclamav)
+ ; instead of clamd
diff --git a/security/samba-vscan/files/patch-vscan-clamav.h b/security/samba-vscan/files/patch-vscan-clamav.h
new file mode 100644
index 000000000000..7471077373c3
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-clamav.h
@@ -0,0 +1,20 @@
+--- clamav/vscan-clamav.h.old	Fri Aug 13 13:42:37 2004
++++ clamav/vscan-clamav.h	Fri Aug 13 13:43:24 2004
+@@ -7,7 +7,7 @@
+ 
+ /* Clam AntiVirus (clamd) stuff: 
+    socket name of Clam daemon */
+-#define VSCAN_CLAMD_SOCKET_NAME      "/var/run/clamd"
++#define VSCAN_CLAMD_SOCKET_NAME      "/var/run/clamav/clamd"
+ 
+ /* Clam AntiVirus (libclamav) stuff:
+    maximum number of files in archive */
+@@ -20,7 +20,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-clamav.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-clamav.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-fprotd.h b/security/samba-vscan/files/patch-vscan-fprotd.h
new file mode 100644
index 000000000000..6af04e06eae6
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-fprotd.h
@@ -0,0 +1,11 @@
+--- fprot/vscan-fprotd.h.old	Fri Aug 13 13:52:39 2004
++++ fprot/vscan-fprotd.h	Fri Aug 13 13:53:14 2004
+@@ -7,7 +7,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-fprotd.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-fprotd.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-fsav.h b/security/samba-vscan/files/patch-vscan-fsav.h
new file mode 100644
index 000000000000..f5bb6adcfa02
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-fsav.h
@@ -0,0 +1,28 @@
+--- f-secure/vscan-fsav.h.old	Fri Aug 13 13:49:40 2004
++++ f-secure/vscan-fsav.h	Fri Aug 13 13:51:15 2004
+@@ -37,7 +37,7 @@
+ 
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4 or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-fsav.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-fsav.conf"
+ #define VSCAN_MODULE_STR "vscan-fsav"
+ 
+ 
+@@ -114,13 +114,13 @@
+ #define VSCAN_FSAV_CONNECT_ID 0
+ 
+ /* fsav configuration file */
+-#define VSCAN_FSAV_CONFIG_FILE "/etc/fsav.conf"
++#define VSCAN_FSAV_CONFIG_FILE "/usr/local/etc/fsav.conf"
+ 
+ /* location of fsavd binary */
+-#define VSCAN_FSAV_BINARY "/opt/f-secure/fsav/bin/fsavd"
++#define VSCAN_FSAV_BINARY "/usr/local/bin/fsavd"
+ 
+ /* path to FSAV databases */
+-#define VSCAN_FSAV_DB_DIR "/var/opt/f-secure/fsav/databases"
++#define VSCAN_FSAV_DB_DIR "/var/db/fsav/databases"
+ 
+ /* fsav socket name */
+ #define VSCAN_FSAV_SOCKET "/tmp/.fsav-0"
diff --git a/security/samba-vscan/files/patch-vscan-icap.h b/security/samba-vscan/files/patch-vscan-icap.h
new file mode 100644
index 000000000000..b1e0cc10bae2
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-icap.h
@@ -0,0 +1,11 @@
+--- icap/vscan-icap.h.old	Fri Aug 13 13:54:25 2004
++++ icap/vscan-icap.h	Fri Aug 13 13:54:52 2004
+@@ -8,7 +8,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-icap.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-icap.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-kavp.h b/security/samba-vscan/files/patch-vscan-kavp.h
new file mode 100644
index 000000000000..87b9ef62c1de
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-kavp.h
@@ -0,0 +1,11 @@
+--- kaspersky/vscan-kavp.h.old	Fri Aug 13 13:57:48 2004
++++ kaspersky/vscan-kavp.h	Fri Aug 13 13:58:16 2004
+@@ -8,7 +8,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-kavp.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-kavp.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-mcdaemon.h b/security/samba-vscan/files/patch-vscan-mcdaemon.h
new file mode 100644
index 000000000000..d5380058933e
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-mcdaemon.h
@@ -0,0 +1,11 @@
+--- nai/vscan-mcdaemon.h.old	Fri Aug 13 14:01:46 2004
++++ nai/vscan-mcdaemon.h	Fri Aug 13 14:02:26 2004
+@@ -6,7 +6,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-mcdaemon.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-mcdaemon.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-mksd.h b/security/samba-vscan/files/patch-vscan-mksd.h
new file mode 100644
index 000000000000..ad9d804c61fb
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-mksd.h
@@ -0,0 +1,11 @@
+--- mks/vscan-mksd.h.old	Fri Aug 13 13:59:26 2004
++++ mks/vscan-mksd.h	Fri Aug 13 13:59:52 2004
+@@ -6,7 +6,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-mks32.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-mks32.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-oav.h b/security/samba-vscan/files/patch-vscan-oav.h
new file mode 100644
index 000000000000..75f8f7959ac4
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-oav.h
@@ -0,0 +1,11 @@
+--- openantivirus/vscan-oav.h.old	Fri Aug 13 14:04:07 2004
++++ openantivirus/vscan-oav.h	Fri Aug 13 14:04:23 2004
+@@ -6,7 +6,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-oav.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-oav.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-sophos.conf b/security/samba-vscan/files/patch-vscan-sophos.conf
new file mode 100644
index 000000000000..84711f3b4116
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-sophos.conf
@@ -0,0 +1,8 @@
+--- sophos/vscan-sophos.conf.old	Fri Aug 13 14:09:44 2004
++++ sophos/vscan-sophos.conf	Fri Aug 13 14:09:58 2004
+@@ -57,4 +57,4 @@
+ exclude file types =
+ 
+ ; socket name of Sophie (default: /var/run/sophie)
+-sophie socket name = /var/run/sophie
++sophie socket name = /var/run/sophie/sophie.sock
diff --git a/security/samba-vscan/files/patch-vscan-sophos.h b/security/samba-vscan/files/patch-vscan-sophos.h
new file mode 100644
index 000000000000..6ef6a7dacf12
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-sophos.h
@@ -0,0 +1,17 @@
+--- sophos/vscan-sophos.h.old	Fri Aug 13 14:05:51 2004
++++ sophos/vscan-sophos.h	Fri Aug 13 14:07:07 2004
+@@ -8,12 +8,12 @@
+ 
+ /* Sophie stuff: 
+    socket name of Sophie daemon */
+-#define SOPHIE_SOCKET_NAME      "/var/run/sophie"
++#define SOPHIE_SOCKET_NAME      "/var/run/sophie/sophie.sock"
+ 
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-sophos.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-sophos.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-symantec.h b/security/samba-vscan/files/patch-vscan-symantec.h
new file mode 100644
index 000000000000..014896262eb8
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-symantec.h
@@ -0,0 +1,11 @@
+--- symantec/vscan-symantec.h.old	Fri Aug 13 14:10:58 2004
++++ symantec/vscan-symantec.h	Fri Aug 13 14:11:22 2004
+@@ -8,7 +8,7 @@
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-symantec.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-symantec.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/files/patch-vscan-trend.conf b/security/samba-vscan/files/patch-vscan-trend.conf
new file mode 100644
index 000000000000..501b8e86a1a9
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-trend.conf
@@ -0,0 +1,8 @@
+--- trend/vscan-trend.conf.old	Fri Aug 13 14:24:01 2004
++++ trend/vscan-trend.conf	Fri Aug 13 14:26:41 2004
+@@ -59,4 +59,4 @@
+ exclude file types =
+ 
+ ; socket name of Trophie (default: /var/run/trophie)
+-trophie socket name = /var/run/trophie
++trophie socket name = /var/run/trophie/trophie.sock
diff --git a/security/samba-vscan/files/patch-vscan-trend.h b/security/samba-vscan/files/patch-vscan-trend.h
new file mode 100644
index 000000000000..48bb964b44ba
--- /dev/null
+++ b/security/samba-vscan/files/patch-vscan-trend.h
@@ -0,0 +1,17 @@
+--- trend/vscan-trend.h.old	Fri Aug 13 14:12:27 2004
++++ trend/vscan-trend.h	Fri Aug 13 14:13:09 2004
+@@ -8,12 +8,12 @@
+ 
+ /* Trophie stuff: 
+    socket name of Trophie daemon */
+-#define TROPHIE_SOCKET_NAME      "/var/run/trophie"
++#define TROPHIE_SOCKET_NAME      "/var/run/trophie/trophie.sock"
+ 
+ /* default location of samba-style configuration file (needs Samba >= 2.2.4
+  or Samba 3.0 */
+ 
+-#define PARAMCONF "/etc/samba/vscan-trend.conf"
++#define PARAMCONF "/usr/local/etc/samba-vscan/vscan-trend.conf"
+ 
+ 
+ /* False = log only infected file, True = log every file access */
diff --git a/security/samba-vscan/pkg-message b/security/samba-vscan/pkg-message
index 332006ccfaed..96d98ffab9fe 100644
--- a/security/samba-vscan/pkg-message
+++ b/security/samba-vscan/pkg-message
@@ -5,8 +5,8 @@ The vfs object's is in %%PREFIX%%/lib/samba.
 
 The configuration files is in %%PREFIX%%/etc/samba-vscan.
 
-Edit %%PREFIX%%/etc/smb.conf and add the following entry 
-(that's only an example):
+Edit %%PREFIX%%/etc/smb.conf and add the following entry if you are using 
+samba 2.X (that's only an example):
 
   [vscan]
        comment = virus-protected /tmp directory
@@ -17,6 +17,18 @@ Edit %%PREFIX%%/etc/smb.conf and add the following entry
        browseable = yes
        guest ok = yes
 
+If you are using samba 3.X:
+
+Edit /etc/smb.conf and add the following entry (that's only an example):
+  [vscan]
+      comment = virus-protected /tmp directory
+      path = /tmp
+      vfs object = vscan-oav
+      vscan-oav: config-file = %%PREFIX%%/etc/samba-vscan/vscan-oav.conf
+      writeable = yes
+      browseable = yes
+      guest ok = yes
+
 Basically you have to add a vfs object line to your shares
 which should be virus-protected by this module. If you'd like to use the
 run-time configuration file, simply add the