summaryrefslogtreecommitdiff
path: root/security/drweb-sendmail/files
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2002-05-11 03:26:45 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2002-05-11 03:26:45 +0000
commit2ed1107dfcd044f2a3fb9b563391322eda4d2653 (patch)
tree36419ab53f27d929dec27623a3e030d27203414b /security/drweb-sendmail/files
parentadd support for Adobe Systems Tech Note #5079 & #5080 (diff)
Upgrade to 4.28
Notes
Notes: svn path=/head/; revision=58891
Diffstat (limited to 'security/drweb-sendmail/files')
-rw-r--r--security/drweb-sendmail/files/Makefile.libmilter21
-rw-r--r--security/drweb-sendmail/files/drweb-sendmail.sh20
-rw-r--r--security/drweb-sendmail/files/patch-aa108
-rw-r--r--security/drweb-sendmail/files/patch-ab26
-rw-r--r--security/drweb-sendmail/files/patch-ac26
-rw-r--r--security/drweb-sendmail/files/patch-ad59
-rw-r--r--security/drweb-sendmail/files/patch-ae40
-rw-r--r--security/drweb-sendmail/files/patch-af131
-rw-r--r--security/drweb-sendmail/files/patch-ag16
-rw-r--r--security/drweb-sendmail/files/patch-ah63
10 files changed, 413 insertions, 97 deletions
diff --git a/security/drweb-sendmail/files/Makefile.libmilter b/security/drweb-sendmail/files/Makefile.libmilter
deleted file mode 100644
index c992c904e431..000000000000
--- a/security/drweb-sendmail/files/Makefile.libmilter
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-#
-SENDMAIL_DIR=/usr/src/contrib/sendmail
-.PATH: ${SENDMAIL_DIR}/libmilter
-
-CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
-CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL -D_FFR_MILTER=1
-CFLAGS+=-D_THREAD_SAFE
-
-# User customizations to the sendmail build environment
-CFLAGS+=${SENDMAIL_CFLAGS}
-
-LIB= milter
-
-SRCS+= comm.c engine.c handler.c listener.c main.c signal.c sm_gethost.c smfi.c
-
-INTERNALLIB= true
-NOPIC= true
-INTERNALSTATICLIB= true
-
-.include <bsd.lib.mk>
diff --git a/security/drweb-sendmail/files/drweb-sendmail.sh b/security/drweb-sendmail/files/drweb-sendmail.sh
new file mode 100644
index 000000000000..79be9dbc5223
--- /dev/null
+++ b/security/drweb-sendmail/files/drweb-sendmail.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+case "$1" in
+start)
+ if [ -x %PREFIX%/sbin/drweb-smf ]; then
+ rm -f %PREFIX%/drweb/run/drweb-smf.sock;
+ %PREFIX%/sbin/drweb-smf --conf=%PREFIX%/etc/drweb/drweb_smf.conf && \
+ echo -n ' drweb-smf';
+ fi
+ ;;
+stop)
+ killall drweb-smf >/dev/null 2>& 1;
+ echo -n ' drweb-smf';
+ ;;
+*)
+ echo "Usage: `basename $0` {start|stop}" >&2
+ ;;
+esac
+
+exit 0
diff --git a/security/drweb-sendmail/files/patch-aa b/security/drweb-sendmail/files/patch-aa
index e2fe53f64570..29746db21562 100644
--- a/security/drweb-sendmail/files/patch-aa
+++ b/security/drweb-sendmail/files/patch-aa
@@ -1,57 +1,73 @@
---- configure.orig Tue Oct 16 19:28:21 2001
-+++ configure Wed Feb 20 23:50:34 2002
-@@ -135,7 +135,7 @@
+--- configure.orig Mon Mar 18 20:43:16 2002
++++ configure Fri May 10 11:49:42 2002
+@@ -104,7 +104,7 @@
+ if [ "$INPUT" != "y" -a "x$INPUT" != "x" ] ; then
MILTER_VER="FFR"
- fi
-
+ fi
- if [ $MILTER_VER = "STD" ] ; then
+ if [ $MILTER_VER = "xSTD" ] ; then
SM_LIB="libsm"
SM_LIB_CMD="-lsm"
- elif [ $OS = "Linux_DW" ] ; then
-@@ -173,40 +173,15 @@
- rm -f configure.cache
- echo $n "${SM_DIR}${c}" >> configure.cache
-
-- OBJ_DIR=`ls -1 "$SM_DIR" | grep "obj.*"`
-- if [ ! -d "$SM_DIR/$OBJ_DIR" ] ; then
+ elif [ $OS = "Linux" ] ; then
+@@ -114,52 +114,6 @@
+ SM_LIB=""
+ SM_LIB_CMD=""
+ fi
+- if [ ! -f include/libmilter/mfapi.h ] ; then
+- echo "no include/libmilter/mfapi.h"
+- fi
+- if [ ! -f include/libmilter/mfdef.h ] ; then
+- echo "no include/libmilter/mfdef.h"
+- fi
+- if [ "x$SM_LIB" != "x" -a ! -f "lib/$SM_LIB.a" ] ; then
+- NO_ADD="yes"
+- echo "no lib/$SM_LIB.a"
+- else
+- NO_ADD="no"
+- fi
+- if [ ! -f lib/libmilter.a ] ; then
+- echo "no lib/libmilter.a"
+- fi
+- if [ ! -f include/libmilter/mfapi.h\
+- -o\
+- ! -f include/libmilter/mfdef.h\
+- -o\
+- ! -f lib/libmilter.a\
+- -o $NO_ADD = "yes" ] ; then
+- echo
+- echo "Please copy (or make symlinks) for next files:"
+- echo "in ./include/libmilter directory mfapi.h and mfdef.h"
+- echo $n "in ./lib directory libmilter.a"
+- if [ $SM_LIB = "libsm" -a $OS = "Linux" ] ; then
+- echo " and libsm.a"
+- elif [ $SM_LIB = "libsmutil" ] ; then
+- echo " and libsmutil.a"
+- else
+- echo
+- fi
- echo
-- echo "Cannot found directory in that Sendmail puts results of compilation"
-- echo "Please re-build Sendmail or enter name (not a path) of this directory"
-- echo $n ">$c"
-- read INPUT
-- if [ "x$INPUT" = "x" ] ; then
-- echo "Try later."
-- exit 2
-- elif [ ! -d "$SM_DIR/$INPUT" ] ; then
-- echo "$SM_DIR/$INPUT not found"
-- exit 1
+- echo "So you should have next tree:"
+- echo "include/libmilter/mfapi.h"
+- echo " mfdef.h"
+- echo "lib/libmilter.a"
+- if [ $SM_LIB = "libsm" -a $OS = "Linux" ] ; then
+- echo " libsm.a"
+- elif [ $SM_LIB = "libsmutil" ] ; then
+- echo " libsmutil.a"
- fi
-- OBJ_DIR="$INPUT"
-- fi
--
-- if [ ! -f "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" ] ; then
-- echo "Cannot found Milter library (libmilter.a)"
-- echo "Please go to $SM_DIR/libmilter and build it"
+- echo
+- echo "Do it and try again"
- exit 1
- fi
-- if [ "x$SM_LIB" != "x" -a ! -f "$SM_DIR/$OBJ_DIR/$SM_LIB/$SM_LIB.a" ] ; then
-- echo "Cannot found additional library ($SM_LIB.a)"
-- echo "Please go to $SM_DIR and check it"
-- exit 1
-- fi
- rm -fr include/libmilter
- rm -f lib/libmilter.a
-- ln -s "$SM_DIR/include/libmilter" include/libmilter
-- ln -s "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" lib/libmilter.a
-+ if [ ! -f /usr/lib/libmilter.a ] ; then
-+ ln -s "$SM_DIR/include/libmilter" include/libmilter
-+ ln -s "../libmilter/libmilter.a" lib/libmilter.a
-+ fi
- if [ "x$SM_LIB" != "x" ] ; then
- rm -f "lib/$SM_LIB.a"
-- ln -s "$SM_DIR/$OBJ_DIR/$SM_LIB/$SM_LIB.a" "lib/$SM_LIB.a"
-+ ln -s "../libsmutil/$SM_LIB.a" "lib/$SM_LIB.a"
- fi
else
DRWEB_SM=""
+ fi
+@@ -256,7 +210,7 @@
+ if [ "x$BSD_MAKE" = "xyes" ] ; then
+ COMPILE_RULE_1=".c.o:"
+ COMPILE_RULE_2=" \$(CC) -c \$(ADD_CFLAGS) -D__SIGNAL_BASED_DW \${.ALLSRC}"
+- COMPILE_RULE_3=" \$(CC) -c \$(ADD_CFLAGS) -D__THREAD_BASED_DW \${.ALLSRC} -o \${.PREFIX}_r.o"
++ COMPILE_RULE_3=" \$(CC) -c \$(ADD_CFLAGS) -D_THREAD_SAFE -D__THREAD_BASED_DW \${.ALLSRC} -o \${.PREFIX}_r.o"
+ COMPILE_RULE_4=""
+ else
+ COMPILE_RULE_1="%.o: %.c"
diff --git a/security/drweb-sendmail/files/patch-ab b/security/drweb-sendmail/files/patch-ab
index e8a1187bc61f..93368ec5f42d 100644
--- a/security/drweb-sendmail/files/patch-ab
+++ b/security/drweb-sendmail/files/patch-ab
@@ -1,11 +1,19 @@
---- src/Makefile.bsd.orig Tue Oct 16 19:03:59 2001
-+++ src/Makefile.bsd Tue Feb 12 01:07:07 2002
-@@ -63,7 +63,7 @@
+--- src/Makefile.nix.orig Mon Mar 18 20:43:19 2002
++++ src/Makefile.nix Fri May 10 11:53:25 2002
+@@ -18,7 +18,6 @@
+ CC_AIX = cc_r
+ CC_Solaris_GNU = gcc
+ CC_Solaris_SUN = cc
+-CC = $(CC_$(OS)$(ENV))
- .c.o:
- $(CC) -c $(ADD_CFLAGS) -D__SIGNAL_BASED_DW $<
-- $(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW $< -o ${.PREFIX}_r.o
-+ $(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW -D_THREAD_SAFE $< -o ${.PREFIX}_r.o
+ # OS-specific compilation flags
+ ADDF_AIX = -qmaxmem=16384 -DNO_VSYSLOG -DNO_SNPRINTF -DNOT_GCC_DW -I../addons/aix/include
+@@ -31,7 +30,7 @@
+ # Common flags
+ OPTFLAGS = ___OPT_FLAGS___
+ DEFFLAGS = -D__UNIX_DW -D$(OS)_DW
+-INCFLAGS = -I./include -I./src
++INCFLAGS = -I./src
+ ADD_CFLAGS = $(OPTFLAGS) $(DEFFLAGS) $(INCFLAGS) $(ADDFLAGS)
- clean:
- rm -f *.bak *~ *.err *.o ../lib/libdwclient*.a ../include/*.h
+ SRCS = \
diff --git a/security/drweb-sendmail/files/patch-ac b/security/drweb-sendmail/files/patch-ac
index eda090c10ef6..07d09d9d6797 100644
--- a/security/drweb-sendmail/files/patch-ac
+++ b/security/drweb-sendmail/files/patch-ac
@@ -1,11 +1,25 @@
---- ../sendmail/configure.orig Tue Oct 16 19:28:24 2001
-+++ ../sendmail/configure Sun Oct 21 00:09:16 2001
-@@ -117,7 +117,7 @@
+--- doc/sendmail/configure.orig Mon May 6 19:23:27 2002
++++ doc/sendmail/configure Fri May 10 18:21:04 2002
+@@ -110,7 +110,7 @@
+ # Read transport
- CACHE_ADDR="n"
- POS=`$GREP PidFile $DAEMON_INI | $GREP -v ";"`
+ POS=`$GREP -i PidFile $DAEMON_INI | $GREP -v ";"`
-if [ "x$POS" = "x" ] ; then
+if [ "x" = "x" ] ; then
echo
echo -n "Daemon pidfile not defined in ini-file ..."
- POS=`$GREP SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
+ POS=`$GREP -i SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
+@@ -265,8 +265,13 @@
+ echo "Edit one of configuration files and try again."
+ exit 1
+ fi
++ else
++ echo "Press Enter"
++ read INPUT
+ fi
+ else
++ echo "Press Enter"
++ read INPUT
+ FILTER_TIMEOUT=0
+ fi
+
diff --git a/security/drweb-sendmail/files/patch-ad b/security/drweb-sendmail/files/patch-ad
index 7245474bda7e..af18a95239ec 100644
--- a/security/drweb-sendmail/files/patch-ad
+++ b/security/drweb-sendmail/files/patch-ad
@@ -1,15 +1,44 @@
---- Makefile.bsd.orig Mon Oct 15 15:04:09 2001
-+++ Makefile.bsd Tue Feb 12 01:30:40 2002
-@@ -45,8 +45,11 @@
- drweb_cgp.o: drweb_cgp.c $(LIBINCLUDES)
- $(CC) -c $(ADD_CFLAGS) $< -I./src -D__THREAD_BASED_DW
-
-+drwebdc.o: drwebdc.c $(LIBINCLUDES)
-+ $(CC) -c $(ADD_CFLAGS) $< -I./src
-+
- .c.o: $(LIBINCLUDES)
-- $(CC) -c $(ADD_CFLAGS) $<
-+ $(CC) -c $(ADD_CFLAGS) -D_THREAD_SAFE $<
-
- $(LIBINCLUDES):
- @( cd src; make headers )
+--- Makefile.nix.orig Mon May 6 14:58:38 2002
++++ Makefile.nix Fri May 10 12:00:39 2002
+@@ -25,7 +25,6 @@
+ CC_AIX = cc_r
+ CC_Solaris_GNU = gcc
+ CC_Solaris_SUN = cc
+-CC = $(CC_$(OS)$(ENV))
+
+ # OS-specific compilation flags
+ ADDF_AIX = -qmaxmem=16384 -DNO_VSYSLOG -DNO_SNPRINTF -I./addons/aix/include
+@@ -37,7 +36,7 @@
+ # Common flags
+ OPTFLAGS = ___OPT_FLAGS___
+ DEFFLAGS = -D__UNIX_DW -D$(OS)_DW
+-INCFLAGS = -I./include -I./src -I./addons/md5
++INCFLAGS = -I./src
+ ADD_CFLAGS = $(OPTFLAGS) $(DEFFLAGS) $(INCFLAGS) $(ADDFLAGS)
+
+ # Multihtreaded libraries
+@@ -70,14 +69,13 @@
+ # Filter build options
+
+ DCOPT = -D__SIGNAL_BASED_DW
+-SMOPT = -DDW_SENDMAIL -D__THREAD_BASED_DW
++SMOPT = -DDW_SENDMAIL -D__THREAD_BASED_DW -D_THREAD_SAFE
+ ZMOPT = -DDW_ZMAILER -D__SIGNAL_BASED_DW
+ QMOPT = -DDW_QMAIL -D__SIGNAL_BASED_DW
+ EXIMOPT= -DDW_PIPE -DDW_EXIM -D__SIGNAL_BASED_DW
+ PSTFOPT= -DDW_PIPE -DDW_POSTFIX -D__SIGNAL_BASED_DW
+
+ SMOBJS = \
+- dwsm_md5.o\
+ dwsm_opt.o\
+ dwsm_user.o\
+ dwsm_file.o\
+@@ -174,7 +172,7 @@
+
+ # Sendmail Filter Rules
+ drweb-smf : $(SMOBJS) $(DWLIB_R)
+- $(CC) $(SMOBJS) -o $@ $(LINKLIBMT) $(LIBMILTER)
++ $(CC) $(SMOBJS) -o $@ -lmd $(LINKLIBMT) $(LIBMILTER)
+
+ drweb_smf.o: drweb_smf.c
+ $(CC) -c $(ADD_CFLAGS) $(SMOPT) ___SOURCE___ -o $@ $(CCOUTPUT)
diff --git a/security/drweb-sendmail/files/patch-ae b/security/drweb-sendmail/files/patch-ae
new file mode 100644
index 000000000000..a5088f4ed429
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ae
@@ -0,0 +1,40 @@
+--- dw_options.c.bak Mon May 6 19:21:02 2002
++++ dw_options.c Fri May 10 12:13:40 2002
+@@ -68,7 +68,11 @@
+
+ #if defined(__UNIX_DW)
+ #if !defined(EMX_DW)
++#ifdef __FreeBSD__
++#define OS_SPEC_CONFNAME "%PREFIX%/etc/drweb/"CONF_FNAME
++#else
+ #define OS_SPEC_CONFNAME "/opt/drweb/"CONF_FNAME
++#endif
+ #else /* EMX */
+ #define OS_SPEC_CONFNAME "./"CONF_FNAME
+ #endif /* EMX */
+@@ -900,6 +904,7 @@
+ return name;
+ }
+ DWC_Free( name );
++#ifndef __FreeBSD__
+ name = DWC_Strdup( FHS_SPEC_CONFNAME );
+ if( access( name, R_OK ) == 0 )
+ {
+@@ -907,6 +912,7 @@
+ return name;
+ }
+ DWC_Free( name );
++#endif
+ printLib( DW_LL_ERROR, "incorrect usage, try run in console with %s or read documentation", HELP_PARAM_3 );
+ printf( "%s: configuration file not found\nTry run with %s for more information.\n", argv[0], HELP_PARAM_3 );
+ return NULL;
+@@ -934,7 +940,9 @@
+ printf("Conf file must be present in one of location:\n");
+ #endif /* not QMAIL && not ZMAILER */
+ printf(" "OS_SPEC_CONFNAME"\n");
++#ifndef __FreeBSD__
+ printf(" "FHS_SPEC_CONFNAME"\n");
++#endif
+ printf("\n"PROG_NOTE"\n");
+ exit(EX_USAGE);
+ }
diff --git a/security/drweb-sendmail/files/patch-af b/security/drweb-sendmail/files/patch-af
new file mode 100644
index 000000000000..6b81649341fb
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-af
@@ -0,0 +1,131 @@
+--- 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 @@
+ # Address = inet:3000@localhost
+ # Address = local:/var/drweb/run/drwebd.socket
+ # Address = pid:/var/drweb/run/drwebd.pid
+-Address = inet:3000@localhost
++Address = local:%PREFIX%/drweb/run/drwebd.sock
+
+ # Enable/disable caching resolved daemon host
+ # (useful only if daemon uses TCP/IP communications)
+ Cache = yes
+
+ # Timeout for communication operations (in seconds)
+-Timeout = 60
++Timeout = 90
+
+ #########################
+ # 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
+
+ ########################
+ # Scan options section #
+@@ -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 @@
+ DenyOnOne = yes
+
+ # List with rules for users or domains to block scanning
+-DenyList = /etc/drweb/users.conf
++DenyList = %PREFIX%/etc/drweb/users.conf
+
+ ###################
+ # 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 @@
+ # pass - accept messages
+ # reject (default) - reject messages
+ # tempfail - says that we temporary unavailable
+-ProcessingErrors = reject
++ProcessingErrors = tempfail
+
+ # Admin mail address (may be unix-local address)
+ AdminMail = postmaster
+
+ # Filter address, that be used in From:
+-FilterMail = DrWeb-DAEMON@your.domain.com
++FilterMail = DrWeb-DAEMON@%HOSTNAME%
+
+ # Quarantine directory.
+ # The infected files could be moved in that dir
+ # if you stay this field empty or commented then
+ # infected messages would not been storied
+-Quarantine = /var/drweb/infected
++Quarantine = %PREFIX%/drweb/infected
+
+
+ #########################
+@@ -177,31 +178,31 @@
+ RcptsNotify = yes
+
+ # Files with notification templates
+-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
+
+ [SkipNotifications]
+ AdminNotify = no
+ SenderNotify = yes
+ RcptsNotify = no
+ AdminTemplate =
+-SenderTemplate = /etc/drweb/templates/en/sendmail/skipobj-sender.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/skipobj-sender.msg
+ RcptsTemplate =
+
+ [MailbombNotifications]
+ AdminNotify = yes
+ SenderNotify = yes
+ RcptsNotify = no
+-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
+ RcptsTemplate =
+
+ [ErrorNotifications]
+ AdminNotify = yes
+ SenderNotify = no
+ RcptsNotify = no
+-AdminTemplate = /etc/drweb/templates/en/sendmail/error-admin.msg
++AdminTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/error-admin.msg
+ SenderTemplate =
+ RcptsTemplate =
+
diff --git a/security/drweb-sendmail/files/patch-ag b/security/drweb-sendmail/files/patch-ag
new file mode 100644
index 000000000000..75368739a4cb
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ag
@@ -0,0 +1,16 @@
+--- etc/sendmail/etc/drweb/users.conf.bak Fri Apr 12 18:13:50 2002
++++ etc/sendmail/etc/drweb/users.conf Fri May 10 13:47:35 2002
+@@ -45,8 +45,8 @@
+ #deny asv@drweb.ru
+ #deny sergey@asv.internal.drweb.ru
+
+-[version=2]
+-deny to exact asv@drweb.ru
+-deny any exact sergey@asv.internal.drweb.ru
+-allow any subst drweb.ru
+-deny any subst .ru
++#[version=2]
++#deny to exact asv@drweb.ru
++#deny any exact sergey@asv.internal.drweb.ru
++#allow any subst drweb.ru
++#deny any subst .ru
diff --git a/security/drweb-sendmail/files/patch-ah b/security/drweb-sendmail/files/patch-ah
new file mode 100644
index 000000000000..b93f15e3dcc0
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ah
@@ -0,0 +1,63 @@
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/error-admin.msg.bak Fri Apr 12 20:31:53 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/error-admin.msg Fri May 10 13:44:52 2002
+@@ -1,5 +1,5 @@
+ From: DrWeb-DAEMON
+-Subject: Сбой антивирусного фильтра
++Subject: =?koi8-r?B?88LPyiDBztTJ18nS1dPOz8fPIMbJ?= =?koi8-r?B?zNjU0sE=?=
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Администратор,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg.bak Fri Apr 12 20:32:10 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg Fri May 10 13:44:13 2002
+@@ -1,5 +1,5 @@
+ From: DrWeb-DAEMON
+-Subject: Найден подозрительный объект
++Subject: =?koi8-r?B?7sHKxMXOINDPxM/a0snUxczYztnK?= =?koi8-r?B?IM/C38XL1A==?=
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Администратор,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg.bak Fri Apr 12 20:41:18 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg Fri May 10 13:45:00 2002
+@@ -1,5 +1,5 @@
+ From: $FILTER_MAIL$
+-Subject: Недоставленное сообщение: $SUBJECT$
++Subject: =?koi8-r?B?7sXEz9PUwdfMxc7Oz8Ug08/Pwt3F?= =?koi8-r?B?zsnFOg==?= $SUBJECT$
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Отправитель,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/skipobj-sender.msg.bak Fri Apr 12 20:41:14 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/skipobj-sender.msg Fri May 10 13:45:00 2002
+@@ -1,5 +1,5 @@
+ From: $FITLER_MAIL$
+-Subject: Недоставленное сообщение: $SUBJECT$
++Subject: =?koi8-r?B?7sXEz9PUwdfMxc7Oz8Ug08/Pwt3F?= =?koi8-r?B?zsnFOg==?= $SUBJECT$
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Отправитель,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/virus-admin.msg.bak Fri Apr 12 20:33:29 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/virus-admin.msg Fri May 10 13:45:00 2002
+@@ -1,5 +1,5 @@
+ From: DrWeb-DAEMON
+-Subject: Найдем вирус !
++Subject: =?koi8-r?B?7sHKxMXOINfJ0tXTIQ==?=
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Администратор,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/virus-rcpts.msg.bak Fri Apr 12 20:41:08 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/virus-rcpts.msg Fri May 10 13:45:00 2002
+@@ -1,5 +1,5 @@
+ From: $FILTER_MAIL$
+-Subject: Недоставленное сообщение: $SUBJECT$
++Subject: =?koi8-r?B?7sXEz9PUwdfMxc7Oz8Ug08/Pwt3F?= =?koi8-r?B?zsnFOg==?= $SUBJECT$
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Получатель,
+--- etc/sendmail/etc/drweb/templates/ru/sendmail/virus-sender.msg.bak Fri Apr 12 20:41:05 2002
++++ etc/sendmail/etc/drweb/templates/ru/sendmail/virus-sender.msg Fri May 10 13:45:00 2002
+@@ -1,5 +1,5 @@
+ From: $FILTER_MAIL$
+-Subject: Недоставленное сообщение: $SUBJECT$
++Subject: =?koi8-r?B?7sXEz9PUwdfMxc7Oz8Ug08/Pwt3F?= =?koi8-r?B?zsnFOg==?= $SUBJECT$
+ Content-Type: text/plain; charset=koi8-r
+
+ Уважаемый Отправитель,