head	1.11;
access;
symbols
	RELEASE_5_3_0:1.10
	RELEASE_4_10_0:1.10
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.9
	RELEASE_5_1_0:1.8
	RELEASE_4_8_0:1.8
	RELEASE_5_0_0:1.7
	RELEASE_4_7_0:1.6
	RELEASE_4_6_2:1.4
	RELEASE_4_6_1:1.4
	RELEASE_4_6_0:1.4;
locks; strict;
comment	@# @;


1.11
date	2004.11.25.11.54.01;	author sem;	state dead;
branches;
next	1.10;

1.10
date	2004.03.24.22.14.57;	author pav;	state Exp;
branches;
next	1.9;

1.9
date	2003.07.01.06.51.41;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2003.02.18.04.45.26;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	2002.10.31.00.51.04;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	2002.08.25.05.30.34;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	2002.05.31.09.06.15;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	2002.05.11.03.26.45;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	2002.01.04.07.25.35;	author ache;	state dead;
branches;
next	1.2;

1.2
date	2001.10.20.20.50.21;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	2001.10.03.18.46.24;	author ache;	state Exp;
branches;
next	;


desc
@@


1.11
log
@- Update to 4.32.1
- Pass maintainership to submitter

PR:		ports/72511
Submitted by:	Demin Alexander <support(at)spectrum.ru>
@
text
@--- etc/drweb_smf.conf.orig	Fri Feb 27 23:21:37 2004
+++ etc/drweb_smf.conf	Sat Mar  6 23:10:40 2004
@@@@ -18,14 +18,14 @@@@
 #   Address = local:/usr/local/drweb/run/drwebd.skt
 #   Address = pid:/usr/local/drweb/run/drwebd.pid
 #   Address = pid:/var/drweb/run/drwebd.pid, inet:3000@@backup_server.example.com
-Address = inet:3000@@localhost
+Address = local:%PREFIX%/drweb/run/drwebd.sock
 
 # Enable/disable caching of the resolved daemon host 
 # (useful only if daemon uses TCP/IP communications)
 Cache = yes
 
 # Timeout for the whole scanning session (seconds)
-Timeout = 120
+Timeout = 160
 
 ########################
 # Scan options section #
@@@@ -91,10 +91,10 @@@@
 DenyByDefault = no
 
 # List with rules for users or domains to block scanning 
-DenyList = /etc/drweb/users.conf
+DenyList = %PREFIX%/etc/drweb/users.conf
 
 # Directory used to store temporary files
-Spool = /var/drweb/spool 
+Spool = /tmp
 
 # Permissions for created spool files
 SpoolFilesMode = 0600
@@@@ -245,7 +245,7 @@@@
 #        pass - pass such messages 
 #        reject - reject such messages with permanent error 
 #        tempfail - reject such message with temporary error 
-ProcessingErrors = reject 
+ProcessingErrors = tempfail
 
 # These reply strings will be used as SMTP reply if message has been rejected.
 # You can specify only text part of reply: 550 5.7.0 Text part of reply.
@@@@ -269,16 +269,16 @@@@
 FilterMail = DrWEB-DAEMON
 
 # List of unnotificable viruses
-UnnotificableVirusesList = /etc/drweb/viruses.conf
+UnnotificableVirusesList = %PREFIX%/etc/drweb/viruses.conf
 
 # List of unnotificable addresses
-UnnotificableAddressesList = /etc/drweb/addresses.conf
+UnnotificableAddressesList = %PREFIX%/etc/drweb/addresses.conf
 
 # Quarantine directory. 
 # The infected files could be moved in that dir 
 # if you leave this field empty or commented out then 
 # infected messages will not be stored
-Quarantine = /var/drweb/infected
+Quarantine = %PREFIX%/drweb/infected
 
 # Permissions for quarantined files
 QuarantineFilesMode = 0660
@@@@ -317,15 +317,15 @@@@
 RcptsNotify = yes
 
 # Files with notification templates
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/virus-sender.msg
-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/virus-admin.msg
-RcptsTemplate = /etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-sender.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-admin.msg
+RcptsTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg
 
 [SkipNotifications]
 SenderNotify = yes
 AdminNotify = no
 RcptsNotify = no
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/skip-sender.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/skip-sender.msg
 AdminTemplate = 
 RcptsTemplate = 
 
@@@@ -333,16 +333,16 @@@@
 SenderNotify = yes
 AdminNotify = yes
 RcptsNotify = no
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/archive-sender.msg
-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/archive-admin.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-sender.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-admin.msg
 RcptsTemplate = 
 
 [ErrorNotifications]
 SenderNotify = yes
 AdminNotify = yes
 RcptsNotify = no
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/error-sender.msg
-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/error-admin.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-sender.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-admin.msg
 RcptsTemplate = 
 
 [RuleFilterNotifications]
@@@@ -350,7 +350,7 @@@@
 AdminNotify = yes
 RcptsNotify = no
 SenderTemplate = 
-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/rule-admin.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/rule-admin.msg
 RcptsTemplate = 
 
 ###################
@@@@ -391,7 +391,7 @@@@
 # Definition of Sendmail Milter Address according to sendmail.cf 
 # Note: FAMILY pid is not valid
 # MilterAddress = local:/usr/local/drweb/run/drweb-smf.skt
-MilterAddress = inet:3001@@localhost
+MilterAddress = local:%PREFIX%/drweb/run/drweb-smf.sock
 
 # Timeout for drweb-smf to sendmail connection
 # (Must be greater than any Timeout. parameter in sendmail.cf)
@


1.10
log
@- Update to 4.31
- Reset unresponsive maintainer

PR:		ports/63838
Submitted by:	Dima Panov <redfox@@Fluffy.Khv.RU>
Approved by:	maintainer timeout (2 weeks)
@
text
@@


1.9
log
@Upgrade to 4.29.12-D
@
text
@d1 3
a3 3
--- etc/drweb_smf.conf.orig	Wed Jun  4 16:46:57 2003
+++ etc/drweb_smf.conf	Tue Jul  1 10:12:55 2003
@@@@ -17,14 +17,14 @@@@
d10 1
a10 1
 # Enable/disable caching resolved daemon host 
d14 1
a14 1
 # Timeout for whole scanning session (in seconds)
d20 2
a21 2
@@@@ -72,10 +72,10 @@@@
 DenyOnOne = yes
d27 1
a27 1
 # Directory used for story temporary files
d33 2
a34 2
@@@@ -195,28 +195,28 @@@@
 #        redirect - redirect to RedirectMail and reject message 
d37 1
a37 1
-ProcessingErrors = quarantine 
d40 4
a43 11
 # Admin mail address (may be unix-local address)
-AdminMail = av-master@@example.com
+AdminMail = postmaster
 
 # Mail address for redirect action (may be unix-local address)
-RedirectMail = quarantine@@example.com
+RedirectMail = postmaster
 
 # Filter address, that be used in From: (should be qualified)
-FilterMail = DrWEB-DAEMON@@example.com
+FilterMail = DrWeb-DAEMON@@%HOSTNAME%
d55 2
a56 2
 # if you stay this field empty or commented then 
 # infected messages would not been storied
d62 1
a62 1
@@@@ -254,15 +254,15 @@@@
d82 1
a82 1
@@@@ -270,16 +270,16 @@@@
d103 1
a103 1
@@@@ -287,7 +287,7 @@@@
d112 1
a112 1
@@@@ -316,7 +316,7 @@@@
d120 1
a120 1
 # (Must be greater that any Timeout. parameter in sendmail.cf)
@


1.8
log
@Upgrade to 4.29.10
@
text
@d1 2
a2 2
--- etc/drweb_smf.conf.orig	Fri Feb 14 17:06:02 2003
+++ etc/drweb_smf.conf	Tue Feb 18 06:36:20 2003
d33 6
a38 2
@@@@ -179,22 +179,22 @@@@
 ProcessingErrors = reject
d44 5
a48 1
 # Filter address, that be used in From:
d69 1
a69 1
@@@@ -223,9 +223,9 @@@@
d73 1
d76 1
a76 1
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/virus-sender.msg
a78 1
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-sender.msg
d82 1
a82 1
@@@@ -233,23 +233,23 @@@@
d84 2
a87 2
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/skip-sender.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/skip-sender.msg
d89 1
a89 1
 [ArchiveRestrictionNotifications]
d93 1
d95 1
a97 2
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/archive-sender.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-sender.msg
d103 1
d105 1
d108 9
a116 2
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/error-sender.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-sender.msg
d119 1
a119 2
 # Logging section #
@@@@ -277,7 +277,7 @@@@
@


1.7
log
@Upgrade to 4.29
@
text
@d1 3
a3 4
--- etc/drweb_smf.conf.orig	Mon Oct 28 15:05:35 2002
+++ etc/drweb_smf.conf	Thu Oct 31 03:40:19 2002
@@@@ -14,14 +14,14 @@@@
 #   Address = inet:3000@@localhost
d6 1
d20 1
a20 1
@@@@ -61,10 +61,10 @@@@
d33 1
a33 1
@@@@ -147,16 +147,16 @@@@
d37 1
a37 1
-AdminMail = av-admin@@example.com
d41 1
a41 1
-FilterMail = DrWeb-DAEMON@@example.com
d44 8
d61 1
a61 1
@@@@ -185,32 +185,32 @@@@
d66 1
a67 1
-RcptsTemplate = /etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg
d69 1
a70 1
+RcptsTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg
a72 1
 AdminNotify = no
d74 1
d77 1
a79 1
 RcptsTemplate = 
d81 2
a82 1
 [MailbombNotifications]
a83 1
 SenderNotify = yes
d85 2
a86 4
-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg
-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg
d88 2
d92 1
a93 1
 SenderNotify = yes
d96 2
a98 1
+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-admin.msg
a99 1
 RcptsTemplate = 
d102 2
a103 1
@@@@ -239,7 +239,7 @@@@
@


1.6
log
@Upgrade to 4.28.10
@
text
@d1 2
a2 2
--- etc/drweb_smf.conf.orig	Fri Jul 26 17:03:59 2002
+++ etc/drweb_smf.conf	Sun Aug 25 06:48:32 2002
d33 2
a34 15
@@@@ -136,7 +136,7 @@@@
 #        reject - reject messages
 #        quarantine - move message to quarantine and discard it
 #        tempfail - says that we temporary unavailable
-ScanningErrors = reject
+ScanningErrors = tempfail
 
 # ProcessingErrors - errors in proxy-client: no memory`,' misconfigured`,' timeout
 #                    on communication with daemon and etc. 
@@@@ -144,19 +144,19 @@@@
 #        pass - accept messages
 #        reject - reject messages
 #        tempfail - says that we temporary unavailable
-ProcessingErrors = reject
+ProcessingErrors = tempfail
d40 1
a40 1
 # Filter address`,' that be used in From:
@


1.5
log
@Upgrade to 4.28.3
@
text
@d1 3
a3 3
--- etc/sendmail/etc/drweb/drweb_smf.conf.orig	Mon May  6 23:48:14 2002
+++ etc/sendmail/etc/drweb/drweb_smf.conf	Fri May 10 18:12:59 2002
@@@@ -15,14 +15,14 @@@@
d5 2
a6 2
 #   Address = local:/var/drweb/run/drwebd.socket
 #   Address = pid:/var/drweb/run/drwebd.pid
d14 2
a15 2
 # Timeout for communication operations (in seconds)
-Timeout = 60
a17 9
 #########################
 # Communication section #
@@@@ -32,7 +32,7 @@@@
 # Note: FAMILY pid is not valid
 # Address = inet:3001@@localhost
 # Address = local:/usr/local/drweb/run/drweb-smf.skt
-Address = inet:3001@@localhost
+Address = local:%PREFIX%/drweb/run/drweb-smf.sock
 
d20 1
a20 14
@@@@ -58,10 +58,10 @@@@
 SpamFilter = off
 
 # Directory used for story temporary files
-Spool = /var/drweb/spool
+Spool = /tmp
 
 # User account used by filter
-# FilterAccount = 
+FilterAccount = drweb
 
 # Deny scanning if at least one of recipient or sender address
 # present in DenyList with "deny" option (yes/no), if "no" all
@@@@ -69,7 +69,7 @@@@
d27 16
a42 22
 ###################
 # Actions section #
@@@@ -95,7 +95,8 @@@@
 #        pass (default) - pass such messages
 #        discard - discard such messages
 #        reject - reject this message
-SpamFilterAlert = pass
+SpamFilterAlert = discard
+
 # EmptyFrom  - mean that SMTP session initiated with empty envelope From:
 #              widely used spammers and Mailer-Daemons
 # Actions:
@@@@ -111,7 +112,7 @@@@
 #        pass - accept messages with such objects
 #        quarantine - move message to quarantine and reject it
 #        reject (default) - reject messages
-SkipObject = reject
+SkipObject = pass
 
 # MailbombObject - mean that daemon found object in archive with compression 
 #                  ratio exceeded MaxCompressionRation or size of object greater
@@@@ -138,19 +139,19 @@@@
d44 1
a44 1
 #        reject (default) - reject messages
d50 2
a51 1
 AdminMail = postmaster
d53 2
a54 2
 # Filter address, that be used in From:
-FilterMail = DrWeb-DAEMON@@your.domain.com
a62 1
  
d64 3
a66 2
 #########################
@@@@ -177,31 +178,31 @@@@
d70 6
a75 6
-AdminTemplate = /etc/drweb/templates/en/sendmail/virus-admin.msg
-SenderTemplate = /etc/drweb/templates/en/sendmail/virus-sender.msg
-RcptsTemplate = /etc/drweb/templates/en/sendmail/virus-rcpts.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/virus-admin.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/virus-sender.msg
+RcptsTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/virus-rcpts.msg
d82 2
a83 2
-SenderTemplate = /etc/drweb/templates/en/sendmail/skipobj-sender.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/skipobj-sender.msg
d90 4
a93 4
-AdminTemplate = /etc/drweb/templates/en/sendmail/mailbomb-admin.msg
-SenderTemplate = /etc/drweb/templates/en/sendmail/mailbomb-sender.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/mailbomb-admin.msg
+SenderTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/mailbomb-sender.msg
d98 1
a98 1
 SenderNotify = no
d100 4
a103 3
-AdminTemplate = /etc/drweb/templates/en/sendmail/error-admin.msg
+AdminTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/error-admin.msg
 SenderTemplate = 
d106 10
@


1.4
log
@Upgrade to 4.28
@
text
@d16 1
a16 1
+Timeout = 90
@


1.3
log
@Upgrade to 4.27
@
text
@d1 131
a131 10
--- ../sendmail/template.initscript.bak	Thu Oct  4 12:29:12 2001
+++ ../sendmail/template.initscript	Sun Oct 21 00:15:59 2001
@@@@ -105,6 +105,7 @@@@
 	RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
 	    [ $FILTER_UNIX = "yes" ] && rm -f $FILTER_SOCKET
+	[ $DAEMON_UNIX = "yes" ] && chmod 660 $DAEMON_SOCKET
         $PROC_DAEMON $FILTER_CMD
 	    RETVAL=$?
     fi
@


1.2
log
@Upgrade to 4.26b
@
text
@@


1.1
log
@Fix socket permissions and startup race condition
@
text
@d1 4
a4 13
--- ../sendmail/template.initscript.orig	Wed Sep 26 01:02:29 2001
+++ ../sendmail/template.initscript	Wed Oct  3 22:36:07 2001
@@@@ -13,7 +13,7 @@@@
 # Use these if cannot found functions
 dw_daemon() {
     ulimit -c 0
-    $* &
+    $*
     return $?
 }
 
@@@@ -105,9 +105,7 @@@@
     RETVAL=$?
d6 1
a6 4
         [ $FILTER_UNIX = "yes" ] && rm -f $FILTER_SOCKET
-        if [ "x$DAEMON_PID" != "x" ] ; then
-            sleep 1
-        fi
d9 1
a9 1
         RETVAL=$?
@

