Update to smtp-vilter 1.2.1. This version has pf integration.

mail/smtp-vilter/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2005/11/01 16:26:49 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.7 2005/12/09 09:41:25 mbalmer Exp $
 
 COMMENT=	"sendmail milter to scan messages for viruses and spam"
 
-DISTNAME=	smtp-vilter-1.1.9
+DISTNAME=	smtp-vilter-1.2.1
-PKGNAME=	${DISTNAME}p1
 
 CATEGORIES=    	mail
 

mail/smtp-vilter/distinfo

@@ -1,4 +1,4 @@
-MD5 (smtp-vilter-1.1.9.tgz) = 3c2d500e71fe167b975034dd4bd154b7
+MD5 (smtp-vilter-1.2.1.tgz) = ee18a15dbbb0f5c34049b7bd0dfe1c27
-RMD160 (smtp-vilter-1.1.9.tgz) = 19be738204e6cda59975f0ed39e48d117a29ba80
+RMD160 (smtp-vilter-1.2.1.tgz) = 97bc97f8b6a4a7604135540e07e3b3158e1e2811
-SHA1 (smtp-vilter-1.1.9.tgz) = e008c132ffe926113143a98c1333889b7fa4d077
+SHA1 (smtp-vilter-1.2.1.tgz) = 0a6d7a1c6ac5e90d53f6ee6e231a37127c50ca69
-SIZE (smtp-vilter-1.1.9.tgz) = 58248
+SIZE (smtp-vilter-1.2.1.tgz) = 67397

mail/smtp-vilter/patches/patch-etc_smtp-vilter_attachment_conf

@@ -1,26 +0,0 @@
-$OpenBSD: patch-etc_smtp-vilter_attachment_conf,v 1.1 2005/09/07 21:32:16 mbalmer Exp $
---- etc/smtp-vilter/attachment.conf.orig	Wed Sep  7 23:28:40 2005
-+++ etc/smtp-vilter/attachment.conf	Wed Sep  7 23:29:55 2005
-@@ -11,16 +11,16 @@ case-sensitive=false
- 
- # Define regular expressions for unwanted attachment names
- 
--unwanted-filename=.*\.exe
--unwanted-filename=.*\.bat
--unwanted-filename=.*\.pif
-+unwanted-filename=".*\.exe"
-+unwanted-filename=".*\.bat"
-+unwanted-filename=".*\.pif"
- 
- # Define regulars expressions for unwanted content-types
- 
--unwanted-content-type=application/octet-stream
--unwanted-content-type=image/.*
-+unwanted-content-type="application/octet-stream"
-+unwanted-content-type="image/.*"
- 
- # Define a path name with a file containing a notification message in plain
- # text that is inserted into a multipart message if an attachement is omitted
- 
--attachment-notification=/etc/smtp-vilter/attachment-notification
-+attachment-notification="/etc/smtp-vilter/attachment-notification"

mail/smtp-vilter/pkg/DESCR

@@ -1,27 +1,28 @@
-smtp-vilter is a high performance content filter for sendmail
+smtp-vilter is a high performance content filter for sendmail to detect e-mail
-to detect e-mail viruses and spam.  smtp-vilter decides whether
+viruses and spam.  smtp-vilter decides whether to pass, discard or simply mark
-to pass, discard or simply mark an e-mail message based on the
+an e-mail message based on the results of a content scan and user defined
-results of a content scan and user defined strategies.
+strategies.  It can interact with the pf packet filter when it detects spam,
+viruses or unwanted content by adding the IP address of the sending host to a
+PF table.
 
-smtp-vilter does not do the scanning by itself, it relies on
+smtp-vilter does not do the scanning by itself, it relies on third-party
-third-party products like ClamAV, Symantec Antivirus or
+products like ClamAV, SpamAssassin, or any ICAP capable scanner for this
-SpamAssassin for this purpose. smtp-vilter uses the milter API
+purpose. smtp-vilter uses the milter API to communicate with sendmail and one
-to communicate with sendmail and one or more backends to
+or more backends to communicate with the actual virus or spam scanning engines.
-communicate with the actual virus or spam scanning engines.
+The backends can be chained to perform a series of checks on one message in one
-The backends can be chained to perform a series of checks on
+run.
-one message in one run.
 
-The software is highly configurable and provides mechanisms
+The software is highly configurable and provides mechanisms for secure
-for secure operation.
+operation.
 
-The backends included in the distribution provide support for
+The backends included in the distribution provide support for the Clam
-the Clam AntiVirus Daemon (clamd), the Symantec Anti Virus
+AntiVirus Daemon (clamd), the Spamassassins Daemon (spamd), ICAP capable
-Scan Engine (savse), and Spamassassins Daemon (spamd).  The
+backends (icap), and the standalone attachment backend to filter out unwanted
-backends are realised as shared libraries that are loaded
+attachments.  The backends are realised as shared libraries that are loaded
-dynamically when smtp-vilter starts.  All backends have their
+dynamically when smtp-vilter starts.  All backends have their own configuration
-own configuration file.
+file.
 
-    smtp-vilter is documented in the following manpages:
+smtp-vilter is documented in the following manpages:
 	
 	smtp-vilter(8)			Running the smtp-vilter
 	smtp-vilter.conf(5)		The smtp-vilter config file

mail/smtp-vilter/pkg/PFRAG.shared

@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2005/05/26 20:45:41 mbalmer Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/09 09:41:25 mbalmer Exp $
-@lib lib/libvilter-attachment.so.5.0
+@lib lib/libvilter-attachment.so.5.1
-@lib lib/libvilter-clamd.so.5.0
+@lib lib/libvilter-clamd.so.5.1
-@lib lib/libvilter-icap.so.5.0
+@lib lib/libvilter-icap.so.5.1
-@lib lib/libvilter-savse.so.5.0
+@lib lib/libvilter-spamd.so.5.1
-@lib lib/libvilter-spamd.so.5.0

mail/smtp-vilter/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/05/26 20:45:41 mbalmer Exp $
+@comment $OpenBSD: PLIST,v 1.4 2005/12/09 09:41:25 mbalmer Exp $
 @newgroup _vilter:538
 @newuser _vilter:538:538:daemon:smtp-vilter:/nonexistent:/sbin/nologin
 %%SHARED%%
@@ -8,8 +8,6 @@
 @comment lib/libvilter-clamd_pic.a
 @comment lib/libvilter-icap.a
 @comment lib/libvilter-icap_pic.a
-@comment lib/libvilter-savse.a
-@comment lib/libvilter-savse_pic.a
 @comment lib/libvilter-spamd.a
 @comment lib/libvilter-spamd_pic.a
 @man man/cat5/smtp-vilter.conf.0
@@ -27,9 +25,6 @@ share/examples/smtp-vilter/clamd.conf
 share/examples/smtp-vilter/icap.conf
 share/examples/smtp-vilter/recipient-notification
 @sample ${SYSCONFDIR}/smtp-vilter/recipient-notification
-share/examples/smtp-vilter/regexp.conf
-share/examples/smtp-vilter/savse.conf
-@sample ${SYSCONFDIR}/smtp-vilter/savse.conf
 share/examples/smtp-vilter/smtp-vilter.conf
 @sample ${SYSCONFDIR}/smtp-vilter/smtp-vilter.conf
 share/examples/smtp-vilter/spamd.conf