13 files changed, 276 insertions, 384 deletions
diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index 02b382ed1fd8..fe50ae2865ed 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	drweb_sendmail
-PORTVERSION=    4.28.4
+PORTVERSION=    4.28.10
 CATEGORIES=	security mail
 MASTER_SITES=   http://drweb.spb.ru/download/unix/
 DISTNAME=       drweb-clients-${PORTVERSION}-sources
@@ -15,7 +15,7 @@ MAINTAINER=	anton@chelcom.ru
 
 RUN_DEPENDS=    ${LOCALBASE}/etc/rc.d/drweb-0.sh:${PORTSDIR}/security/drwebd
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}/opt/drweb/clients/sources/drwebdc
+WRKSRC=         ${WRKDIR}/drweb-filters-${PORTVERSION}-sources
 
 INST_PREFIX=	${PREFIX}/${PORTNAME}
 DOC_DIR=	${PREFIX}/share/doc/drweb-sendmail
@@ -38,9 +38,9 @@ RANDOM_NUMBER=!!!___EDIT_THIS___!!!
 RANDOM_NUMBER!=dd if=/dev/random count=1 2> /dev/null | /sbin/md5
 .endif
 
-LANGS=en ru
+LANGS=en-ru en-es
 CONFS=drweb_smf users
-TMPLS=error-admin mailbomb-admin mailbomb-sender skipobj-sender \
+TMPLS=error-admin error-sender mailbomb-admin mailbomb-sender skip-sender \
       virus-admin virus-rcpts virus-sender
 
 post-patch:
@@ -49,7 +49,7 @@ post-patch:
 	cd ${WRKSRC} && \
 	${SED} "s#%PREFIX%#${PREFIX}#g" < dw_options.c > ndwo.c && \
 	    mv ndwo.c dw_options.c
-	cd ${WRKSRC}/etc/sendmail/etc/drweb && \
+	cd ${WRKSRC}/etc && \
 	${SED} "s#%PREFIX%#${PREFIX}#g;\
 		s#%HOSTNAME%#${WITH_DRWEBSMF_HOSTNAME}#g;\
 		s#!!!___EDIT_THIS___!!!#${RANDOM_NUMBER}#" \
@@ -59,11 +59,13 @@ post-patch:
 post-configure:
 	cd ${WRKSRC} && { \
 		${ECHO_CMD} y; \
+		${ECHO_CMD} n; \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
+		${ECHO_CMD} n; \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} ${CFLAGS} ; \
@@ -76,16 +78,16 @@ do-install:
 	${MKDIR} ${PREFIX}/etc/drweb/templates/${LANG}/sendmail
 .endfor
 .for CONF in ${CONFS}
-	${INSTALL_DATA} -m 600 ${WRKSRC}/etc/sendmail/etc/drweb/${CONF}.conf \
+	${INSTALL_DATA} -m 600 ${WRKSRC}/etc/${CONF}.conf \
 	    ${PREFIX}/etc/drweb/${CONF}.conf-dist
 	if [ ! -f ${PREFIX}/etc/drweb/${CONF}.conf ]; then \
-	    ${INSTALL_DATA} -m 600 ${WRKSRC}/etc/sendmail/etc/drweb/${CONF}.conf \
+	    ${INSTALL_DATA} -m 600 ${WRKSRC}/etc/${CONF}.conf \
 		${PREFIX}/etc/drweb/${CONF}.conf; \
 	fi
 .endfor
 .for LANG in ${LANGS}
 .for TMPL in ${TMPLS}
-	cd ${WRKSRC}/etc/sendmail/etc/drweb/templates/${LANG}/sendmail && \
+	cd ${WRKSRC}/etc/templates/${LANG}/sendmail && \
 	    ${INSTALL_DATA} ${TMPL}.msg \
 		${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg-dist
 	if [ ! -f ${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg ]; then \
@@ -99,6 +101,7 @@ do-install:
 	cd ${WRKSRC}/doc/sendmail && { \
 		${ECHO_CMD} ; \
 		${ECHO_CMD} "${PREFIX}/drweb"; \
+		${ECHO_CMD} "${PREFIX}/drweb/drweb32.ini"; \
 		${ECHO_CMD} "${PREFIX}/sbin"; \
 		${ECHO_CMD} "${PREFIX}/etc/drweb/drweb_smf.conf"; \
 		${ECHO_CMD} ; \
@@ -107,8 +110,9 @@ do-install:
 		${ECHO_CMD} ; \
 		${ECHO_CMD} ; \
 	} | ./configure
-	cd ${WRKSRC}/doc/sendmail; \
-		${INSTALL_DATA} readme* *.txt sendmail.??.addon ${DOC_DIR}
+	cd ${WRKSRC}/doc/sendmail && \
+		${INSTALL_DATA} readme* *.txt sendmail.??.addon \
+		${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/drweb-sendmail.sh \
 	    ${PREFIX}/etc/rc.d/drweb-sendmail.sh-dist
 	if [ ! -f ${PREFIX}/etc/rc.d/drweb-sendmail.sh ]; then \
diff --git a/security/drweb-sendmail/distinfo b/security/drweb-sendmail/distinfo
index 8b33ae268e07..6aca57b1bfd5 100644
--- a/security/drweb-sendmail/distinfo
+++ b/security/drweb-sendmail/distinfo
@@ -1 +1 @@
-MD5 (drweb-clients-4.28.4-sources.tar.gz) = 2aa974e7e018fbf2add38a073b231280
+MD5 (drweb-clients-4.28.10-sources.tar.gz) = 84363e94cd62b15f4332307f4a4bb67f
diff --git a/security/drweb-sendmail/files/patch-aa b/security/drweb-sendmail/files/patch-aa
index 51dfa198b8ca..ad505a4baefc 100644
--- a/security/drweb-sendmail/files/patch-aa
+++ b/security/drweb-sendmail/files/patch-aa
@@ -1,73 +1,17 @@
---- configure.orig	Thu May 16 16:59:30 2002
-+++ configure	Wed Jun 12 11:40:12 2002
-@@ -104,7 +104,7 @@
-     if [ "$INPUT" != "y" -a "x$INPUT" != "x" ] ; then
-         MILTER_VER="FFR"
-     fi    
--    if [ $MILTER_VER = "STD" ] ; then
-+    if [ $MILTER_VER = "xSTD" ] ; then
-         SM_LIB="libsm"
-         SM_LIB_CMD="-lsm"
-     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 "So you should have next tree:"
+--- configure.orig	Thu Jul 25 17:31:39 2002
++++ configure	Sat Aug 24 20:10:04 2002
+@@ -148,14 +148,6 @@
+          -o\
+          $NO_ADD = "yes" ] ; then
+         echo
+-        echo "So you should to have next files:"
+-        echo "$SM_HDR"
 -        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
+-        echo "$SM_LIB" 
 -        echo 
 -        echo "Do it and try again"
 -        exit 1
--    fi
+     fi
  else
      DRWEB_SM=""
- fi 
-@@ -261,7 +215,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
deleted file mode 100644
index 93368ec5f42d..000000000000
--- a/security/drweb-sendmail/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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))
- 
- # 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)
- 
- SRCS	= \
diff --git a/security/drweb-sendmail/files/patch-ac b/security/drweb-sendmail/files/patch-ac
index 07d09d9d6797..6773b4d6a226 100644
--- a/security/drweb-sendmail/files/patch-ac
+++ b/security/drweb-sendmail/files/patch-ac
@@ -1,5 +1,5 @@
---- doc/sendmail/configure.orig	Mon May  6 19:23:27 2002
-+++ doc/sendmail/configure	Fri May 10 18:21:04 2002
+--- doc/sendmail/configure.orig	Wed May 15 20:41:27 2002
++++ doc/sendmail/configure	Sun Aug 25 06:42:08 2002
 @@ -110,7 +110,7 @@
  # Read transport
  
@@ -9,6 +9,24 @@
      echo
      echo -n "Daemon pidfile not defined in ini-file ..."
      POS=`$GREP -i SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
+@@ -178,7 +178,7 @@
+ # Read transport
+ 
+ TMP=`$GREP -i Address $FILTER_CFG | $GREP -v "#"`
+-DADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, match( $0, /^Address=/ ), match( substr( $0, 2 ), /Address=/ ) ); print str; }'`
++DADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, match( $0, /^MilterAddress=/ ), match( substr( $0, 2 ), /MilterAddress=/ ) ); print str; }'`
+ FADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, 1+match( substr( $0, 2 ), /Address=/ ) ); print str; }'`
+ DMODE=`echo $DADR | $AWK '{ str = substr( $0, 1+index( $0, "=" ), index( $0, ":" ) - index( $0, "=" ) - 1 ); print str; }'`
+ FMODE=`echo $FADR | $AWK '{ str = substr( $0, 1+index( $0, "=" ), index( $0, ":" ) - index( $0, "=" ) - 1 ); print str; }'`
+@@ -243,7 +243,7 @@
+ 
+ SOCKET_TIMEOUT=`$GREP -i SocketTimeout $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+ FILE_TIMEOUT=`$GREP -i FileTimeout $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+-FILTER_TIMEOUT=`$GREP -i Timeout $FILTER_CFG | $GREP -v "#" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
++FILTER_TIMEOUT=`$GREP -i ^Timeout $FILTER_CFG | $GREP -v "#" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+ if [ "x$SOCKET_TIMEOUT" != "x" -a "x$FILE_TIMEOUT" != "x" ] ; then
+     RFILTER_TIMEOUT=`expr 2 \* $SOCKET_TIMEOUT + 2 \* $FILE_TIMEOUT`
+ elif [ "x$SOCKET_TIMEOUT" != "x" ] ; then
 @@ -265,8 +265,13 @@
              echo "Edit one of configuration files and try again."
              exit 1
diff --git a/security/drweb-sendmail/files/patch-ad b/security/drweb-sendmail/files/patch-ad
deleted file mode 100644
index af18a95239ec..000000000000
--- a/security/drweb-sendmail/files/patch-ad
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
index a5088f4ed429..ac7905c948fe 100644
--- a/security/drweb-sendmail/files/patch-ae
+++ b/security/drweb-sendmail/files/patch-ae
@@ -1,40 +1,11 @@
---- 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 @@
+--- dw_options.c.bak	Thu Aug 22 18:35:50 2002
++++ dw_options.c	Sat Aug 24 19:19:13 2002
+@@ -92,7 +92,7 @@
  
  #if defined(__UNIX_DW)
  #if !defined(EMX_DW)
-+#ifdef __FreeBSD__
+-#define OS_SPEC_CONFNAME            "/usr/local/drweb/"CONF_FNAME
 +#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
index a248fc620821..089c6309f01d 100644
--- a/security/drweb-sendmail/files/patch-af
+++ b/security/drweb-sendmail/files/patch-af
@@ -1,9 +1,9 @@
---- 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 @@
+--- etc/drweb_smf.conf.orig	Fri Jul 26 17:03:59 2002
++++ etc/drweb_smf.conf	Sun Aug 25 06:48:32 2002
+@@ -14,14 +14,14 @@
  #   Address = inet:3000@localhost
- #   Address = local:/var/drweb/run/drwebd.socket
- #   Address = pid:/var/drweb/run/drwebd.pid
+ #   Address = local:/usr/local/drweb/run/drwebd.skt
+ #   Address = pid:/usr/local/drweb/run/drwebd.pid
 -Address = inet:3000@localhost
 +Address = local:%PREFIX%/drweb/run/drwebd.sock
  
@@ -11,74 +11,47 @@
  # (useful only if daemon uses TCP/IP communications)
  Cache = yes
  
- # Timeout for communication operations (in seconds)
--Timeout = 60
+ # Timeout for whole scanning session (in seconds)
+-Timeout = 120
 +Timeout = 160
  
- #########################
- # 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 @@
+@@ -61,10 +61,10 @@
  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 @@
+ # Directory used for story temporary files
+-Spool = /var/drweb/spool 
++Spool = /tmp
+ 
+ # Permissions for created spool files
+ SpoolFilesMode = 0600
+@@ -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 (default) - reject messages
+ #        reject - reject messages
  #        tempfail - says that we temporary unavailable
 -ProcessingErrors = reject
 +ProcessingErrors = tempfail
  
  # Admin mail address (may be unix-local address)
- AdminMail = postmaster
+-AdminMail = av-admin@example.com
++AdminMail = postmaster
  
- # Filter address, that be used in From:
--FilterMail = DrWeb-DAEMON@your.domain.com
+ # Filter address`,' that be used in From:
+-FilterMail = DrWeb-DAEMON@example.com
 +FilterMail = DrWeb-DAEMON@%HOSTNAME%
  
  # Quarantine directory. 
@@ -87,45 +60,56 @@
  # infected messages would not been storied
 -Quarantine = /var/drweb/infected
 +Quarantine = %PREFIX%/drweb/infected
-  
  
- #########################
-@@ -177,31 +178,31 @@
+ # Permissions for quarantined files
+ QuarantineFilesMode = 0660
+@@ -185,32 +185,32 @@
  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
+-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/virus-admin.msg
+-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/virus-sender.msg
+-RcptsTemplate = /etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg
++AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-admin.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-sender.msg
++RcptsTemplate = %PREFIX%/etc/drweb/templates/en-ru/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
+-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/skip-sender.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/skip-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
+-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
  RcptsTemplate = 
  
  [ErrorNotifications]
  AdminNotify = yes
- SenderNotify = no
+ SenderNotify = yes
  RcptsNotify = no
--AdminTemplate = /etc/drweb/templates/en/sendmail/error-admin.msg
-+AdminTemplate = %PREFIX%/etc/drweb/templates/en/sendmail/error-admin.msg
- SenderTemplate = 
+-AdminTemplate = /etc/drweb/templates/en-ru/sendmail/error-admin.msg
+-SenderTemplate = /etc/drweb/templates/en-ru/sendmail/error-sender.msg
++AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-admin.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-sender.msg
  RcptsTemplate = 
  
+ ###################
+@@ -239,7 +239,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 that any Timeout. parameter in sendmail.cf)
diff --git a/security/drweb-sendmail/files/patch-ag b/security/drweb-sendmail/files/patch-ag
deleted file mode 100644
index 75368739a4cb..000000000000
--- a/security/drweb-sendmail/files/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
index b93f15e3dcc0..d3d389a42b5e 100644
--- a/security/drweb-sendmail/files/patch-ah
+++ b/security/drweb-sendmail/files/patch-ah
@@ -1,63 +1,128 @@
---- 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
- 
- ��������� �����������,
+--- ./etc/templates/en-ru/sendmail/error-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/error-admin.msg	Sun Aug 25 09:08:04 2002
+@@ -36,4 +36,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/error-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/error-sender.msg	Sun Aug 25 09:08:05 2002
+@@ -57,4 +57,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/mailbomb-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/mailbomb-admin.msg	Sun Aug 25 09:08:05 2002
+@@ -37,4 +37,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/mailbomb-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/mailbomb-sender.msg	Sun Aug 25 09:08:05 2002
+@@ -59,4 +59,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/skip-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/skip-sender.msg	Sun Aug 25 09:08:05 2002
+@@ -57,4 +57,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/virus-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/virus-admin.msg	Sun Aug 25 09:08:05 2002
+@@ -41,4 +41,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/virus-rcpts.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/virus-rcpts.msg	Sun Aug 25 09:08:05 2002
+@@ -58,4 +58,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-ru/sendmail/virus-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-ru/sendmail/virus-sender.msg	Sun Aug 25 09:08:05 2002
+@@ -60,4 +60,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/error-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/error-admin.msg	Sun Aug 25 09:16:19 2002
+@@ -38,4 +38,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/error-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/error-sender.msg	Sun Aug 25 09:16:19 2002
+@@ -56,4 +56,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/mailbomb-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/mailbomb-admin.msg	Sun Aug 25 09:16:19 2002
+@@ -39,4 +39,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/mailbomb-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/mailbomb-sender.msg	Sun Aug 25 09:16:19 2002
+@@ -59,4 +59,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/skip-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/skip-sender.msg	Sun Aug 25 09:16:19 2002
+@@ -56,4 +56,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/virus-admin.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/virus-admin.msg	Sun Aug 25 09:16:19 2002
+@@ -43,4 +43,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/virus-rcpts.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/virus-rcpts.msg	Sun Aug 25 09:16:19 2002
+@@ -58,4 +58,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
+--- ./etc/templates/en-es/sendmail/virus-sender.msg.bak	Fri Jul 26 17:03:59 2002
++++ ./etc/templates/en-es/sendmail/virus-sender.msg	Sun Aug 25 09:16:19 2002
+@@ -59,4 +59,4 @@
+ Content-Type: text/rfc822-headers
+ 
+ $FULLHEADERS$
+---001-DrWeb-MailFilter-Notification
++--001-DrWeb-MailFilter-Notification--
diff --git a/security/drweb-sendmail/files/patch-ai b/security/drweb-sendmail/files/patch-ai
deleted file mode 100644
index d109442e0bc8..000000000000
--- a/security/drweb-sendmail/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- dw_mail.c.orig	Mon May  6 14:17:40 2002
-+++ dw_mail.c	Tue May 21 19:43:49 2002
-@@ -810,7 +810,7 @@
-     dw_bs_empty( options );
-     if( pscan->need_report )
-     {
--        dw_bs_add( options, DRWEBD_RETURN_REPORT | DRWEBD_RETURN_CODES );
-+	dw_bs_add( options, DRWEBD_RETURN_VIRUSES );
-     }
-     if( pscan->heuristic )
-     {
diff --git a/security/drweb-sendmail/files/patch-aj b/security/drweb-sendmail/files/patch-aj
deleted file mode 100644
index 12fcf5d67fc4..000000000000
--- a/security/drweb-sendmail/files/patch-aj
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dwc_lib.c.bak	Thu May 16 17:02:43 2002
-+++ src/dwc_lib.c	Sat May 18 17:14:28 2002
-@@ -63,6 +63,7 @@
-     { DERR_TOO_COMPRESSED,     "too high compression ratio" },
-     { DERR_BAD_CALL,           "invalid call" },
-     { DERR_SPAM,               "filter rule alert" },
-+    { DERR_EVAL_KEY,           "evaluation version used" },
-     END_OF_TABLE
- };
- static const int  DaemonMsgTableSize = (sizeof(DaemonMsgTable) / sizeof(DWC_msg_entry_t)) - 1;
diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist
index 6cd760f22d55..c7eb228c7d8b 100644
--- a/security/drweb-sendmail/pkg-plist
+++ b/security/drweb-sendmail/pkg-plist
@@ -2,47 +2,53 @@
 @unexec if [ -f %D/etc/drweb/drweb_smf.conf ] && cmp -s %D/etc/drweb/drweb_smf.conf %D/etc/drweb/drweb_smf.conf-dist; then rm -f %D/etc/drweb/drweb_smf.conf; fi
 etc/drweb/drweb_smf.conf-dist
 @exec [ -f %B/drweb_smf.conf ] || cp %B/%f %B/drweb_smf.conf
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/error-admin.msg %D/etc/drweb/templates/en/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/error-admin.msg; fi
-etc/drweb/templates/en/sendmail/error-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/error-admin.msg %D/etc/drweb/templates/en-ru/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/error-admin.msg; fi
+etc/drweb/templates/en-ru/sendmail/error-admin.msg-dist
 @exec [ -f %B/error-admin.msg ] || cp %B/%f %B/error-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/mailbomb-admin.msg %D/etc/drweb/templates/en/sendmail/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/mailbomb-admin.msg; fi
-etc/drweb/templates/en/sendmail/mailbomb-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg; fi
+etc/drweb/templates/en-ru/sendmail/error-sender.msg-dist
+@exec [ -f %B/error-sender.msg ] || cp %B/%f %B/error-sender.msg
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg %D/etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg; fi
+etc/drweb/templates/en-ru/sendmail/mailbomb-admin.msg-dist
 @exec [ -f %B/mailbomb-admin.msg ] || cp %B/%f %B/mailbomb-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/mailbomb-sender.msg %D/etc/drweb/templates/en/sendmail/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/mailbomb-sender.msg; fi
-etc/drweb/templates/en/sendmail/mailbomb-sender.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg %D/etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg; fi
+etc/drweb/templates/en-ru/sendmail/mailbomb-sender.msg-dist
 @exec [ -f %B/mailbomb-sender.msg ] || cp %B/%f %B/mailbomb-sender.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/skipobj-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/skipobj-sender.msg %D/etc/drweb/templates/en/sendmail/skipobj-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/skipobj-sender.msg; fi
-etc/drweb/templates/en/sendmail/skipobj-sender.msg-dist
-@exec [ -f %B/skipobj-sender.msg ] || cp %B/%f %B/skipobj-sender.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-admin.msg %D/etc/drweb/templates/en/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-admin.msg; fi
-etc/drweb/templates/en/sendmail/virus-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg; fi
+etc/drweb/templates/en-ru/sendmail/skip-sender.msg-dist
+@exec [ -f %B/skip-sender.msg ] || cp %B/%f %B/skip-sender.msg
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg; fi
+etc/drweb/templates/en-ru/sendmail/virus-admin.msg-dist
 @exec [ -f %B/virus-admin.msg ] || cp %B/%f %B/virus-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg; fi
-etc/drweb/templates/en/sendmail/virus-rcpts.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg; fi
+etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg-dist
 @exec [ -f %B/virus-rcpts.msg ] || cp %B/%f %B/virus-rcpts.msg
-@unexec if [ -f %D/etc/drweb/templates/en/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-sender.msg %D/etc/drweb/templates/en/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-sender.msg; fi
-etc/drweb/templates/en/sendmail/virus-sender.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg; fi
+etc/drweb/templates/en-ru/sendmail/virus-sender.msg-dist
 @exec [ -f %B/virus-sender.msg ] || cp %B/%f %B/virus-sender.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/error-admin.msg %D/etc/drweb/templates/ru/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/error-admin.msg; fi
-etc/drweb/templates/ru/sendmail/error-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/error-admin.msg %D/etc/drweb/templates/en-es/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/error-admin.msg; fi
+etc/drweb/templates/en-es/sendmail/error-admin.msg-dist
 @exec [ -f %B/error-admin.msg ] || cp %B/%f %B/error-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg %D/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/mailbomb-admin.msg; fi
-etc/drweb/templates/ru/sendmail/mailbomb-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/error-sender.msg %D/etc/drweb/templates/en-es/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/error-sender.msg; fi
+etc/drweb/templates/en-es/sendmail/error-sender.msg-dist
+@exec [ -f %B/error-sender.msg ] || cp %B/%f %B/error-sender.msg
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/mailbomb-admin.msg %D/etc/drweb/templates/en-es/sendmail/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/mailbomb-admin.msg; fi
+etc/drweb/templates/en-es/sendmail/mailbomb-admin.msg-dist
 @exec [ -f %B/mailbomb-admin.msg ] || cp %B/%f %B/mailbomb-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg %D/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/mailbomb-sender.msg; fi
-etc/drweb/templates/ru/sendmail/mailbomb-sender.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/mailbomb-sender.msg %D/etc/drweb/templates/en-es/sendmail/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/mailbomb-sender.msg; fi
+etc/drweb/templates/en-es/sendmail/mailbomb-sender.msg-dist
 @exec [ -f %B/mailbomb-sender.msg ] || cp %B/%f %B/mailbomb-sender.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/skipobj-sender.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/skipobj-sender.msg %D/etc/drweb/templates/ru/sendmail/skipobj-sender.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/skipobj-sender.msg; fi
-etc/drweb/templates/ru/sendmail/skipobj-sender.msg-dist
-@exec [ -f %B/skipobj-sender.msg ] || cp %B/%f %B/skipobj-sender.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/virus-admin.msg %D/etc/drweb/templates/ru/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/virus-admin.msg; fi
-etc/drweb/templates/ru/sendmail/virus-admin.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/skip-sender.msg %D/etc/drweb/templates/en-es/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/skip-sender.msg; fi
+etc/drweb/templates/en-es/sendmail/skip-sender.msg-dist
+@exec [ -f %B/skip-sender.msg ] || cp %B/%f %B/skip-sender.msg
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/virus-admin.msg %D/etc/drweb/templates/en-es/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/virus-admin.msg; fi
+etc/drweb/templates/en-es/sendmail/virus-admin.msg-dist
 @exec [ -f %B/virus-admin.msg ] || cp %B/%f %B/virus-admin.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/virus-rcpts.msg %D/etc/drweb/templates/ru/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/virus-rcpts.msg; fi
-etc/drweb/templates/ru/sendmail/virus-rcpts.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en-es/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/virus-rcpts.msg; fi
+etc/drweb/templates/en-es/sendmail/virus-rcpts.msg-dist
 @exec [ -f %B/virus-rcpts.msg ] || cp %B/%f %B/virus-rcpts.msg
-@unexec if [ -f %D/etc/drweb/templates/ru/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/ru/sendmail/virus-sender.msg %D/etc/drweb/templates/ru/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/ru/sendmail/virus-sender.msg; fi
-etc/drweb/templates/ru/sendmail/virus-sender.msg-dist
+@unexec if [ -f %D/etc/drweb/templates/en-es/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/sendmail/virus-sender.msg %D/etc/drweb/templates/en-es/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/sendmail/virus-sender.msg; fi
+etc/drweb/templates/en-es/sendmail/virus-sender.msg-dist
 @exec [ -f %B/virus-sender.msg ] || cp %B/%f %B/virus-sender.msg
 @unexec if [ -f %D/etc/drweb/users.conf ] && cmp -s %D/etc/drweb/users.conf %D/etc/drweb/users.conf-dist; then rm -f %D/etc/drweb/users.conf; fi
 etc/drweb/users.conf-dist
@@ -62,10 +68,10 @@ share/doc/drweb-sendmail/sendmail.cf.addon
 share/doc/drweb-sendmail/sendmail.mc.addon
 share/doc/drweb-sendmail/users_list.rus.txt
 share/doc/drweb-sendmail/users_list.txt
-@dirrm etc/drweb/templates/ru/sendmail
-@dirrm etc/drweb/templates/ru
-@dirrm etc/drweb/templates/en/sendmail
-@dirrm etc/drweb/templates/en
+@dirrm etc/drweb/templates/en-es/sendmail
+@dirrm etc/drweb/templates/en-es
+@dirrm etc/drweb/templates/en-ru/sendmail
+@dirrm etc/drweb/templates/en-ru
 @dirrm etc/drweb/templates
 @dirrm etc/drweb
 @dirrm share/doc/drweb-sendmail