5 files changed, 86 insertions, 59 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index d14c98a9f5e8..baa0da1d43bd 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	drweb_sendmail
-PORTVERSION=    4.29.10a
-PORTREVISION=   1
+PORTVERSION=    4.29.12d
 CATEGORIES=	security mail
 MASTER_SITES=   ftp://ftp.drweb.ru/pub/unix/
-DISTNAME=       drweb-clients-4.29.10-A-sources
+DISTNAME=       drweb-clients-4.29.12-D-sources
 
 MAINTAINER=	anton@chelcom.ru
 COMMENT=	Sendmail message filter for virus processing through DrWeb daemon
 
+BUILD_DEPENDS=  ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
 RUN_DEPENDS=    ${LOCALBASE}/etc/rc.d/drweb-0.sh:${PORTSDIR}/security/drwebd
 
 WRKSRC=         ${WRKDIR}/${DISTNAME}
@@ -40,10 +40,10 @@ RANDOM_NUMBER=!!!___EDIT_THIS___!!!
 RANDOM_NUMBER!=dd if=/dev/random count=1 2> /dev/null | /sbin/md5
 .endif
 
-LANGS=en-ru #en-es
+LANGS=en-ru en-pl
 CONFS=drweb_smf users viruses addresses
 TMPLS=error-admin error-sender archive-admin archive-sender skip-sender \
-      virus-admin virus-rcpts virus-sender
+      virus-admin virus-rcpts virus-sender rule-admin
 
 post-patch:
 	${SED} "s#%PREFIX%#${PREFIX}#g" < ${FILESDIR}/drweb-sendmail.sh \
@@ -51,6 +51,9 @@ post-patch:
 	cd ${WRKSRC} && \
 	${SED} "s#%PREFIX%#${PREFIX}#g" < dw_options.c > ndwo.c && \
 	    mv ndwo.c dw_options.c
+	cd ${WRKSRC}/doc/sendmail && \
+	${SED} "s#%LOCALBASE%#${LOCALBASE}#g" < configure > nconf && \
+	    mv nconf configure && chmod a+rx configure
 	cd ${WRKSRC}/etc && \
 	${SED} "s#%PREFIX%#${PREFIX}#g;\
 		s#%HOSTNAME%#${WITH_DRWEBSMF_HOSTNAME}#g;\
@@ -69,6 +72,7 @@ post-configure:
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
+		${ECHO_CMD} n; \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} ${CFLAGS} ; \
 		${ECHO_CMD} y; \
@@ -90,7 +94,7 @@ do-install:
 .for LANG in ${LANGS}
 .for TMPL in ${TMPLS}
 	cd ${WRKSRC}/etc/templates/${LANG}/sendmail && \
-	    ${INSTALL_DATA} ${TMPL}.msg \
+	    tr -d '\r' < ${TMPL}.msg > \
 		${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg-dist
 	if [ ! -f ${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg ]; then \
 		cd ${PREFIX}/etc/drweb/templates/${LANG}/sendmail && \
diff --git a/security/drweb-sendmail/distinfo b/security/drweb-sendmail/distinfo
index 2b1f1df3693b..a03f1c5cab76 100644
--- a/security/drweb-sendmail/distinfo
+++ b/security/drweb-sendmail/distinfo
@@ -1 +1 @@
-MD5 (drweb-clients-4.29.10-A-sources.tar.gz) = c31e8383182e918e59d4ced8716cee4d
+MD5 (drweb-clients-4.29.12-D-sources.tar.gz) = c94960cda813f92f712614157c9b421b
diff --git a/security/drweb-sendmail/files/patch-ac b/security/drweb-sendmail/files/patch-ac
index 23c02c4608f0..692e7304b97c 100644
--- a/security/drweb-sendmail/files/patch-ac
+++ b/security/drweb-sendmail/files/patch-ac
@@ -1,25 +1,12 @@
---- doc/sendmail/configure.orig	Tue Feb 18 18:03:06 2003
-+++ doc/sendmail/configure	Sat Jun  7 13:29:29 2003
-@@ -34,18 +34,6 @@
- FILTER_CFG_NOSTD="-- ERROR ---"
- FILTER_TIMEOUT="-- ERROR ---"
- 
--# Test bash version
--
--if [ "x$BASH_VERSION" = "x" ] ; then
--    echo "You should use bash (version 2.04 at least) as shell to use this script"
--    exit
--fi
--echo "You current shell - bash $BASH_VERSION"
--if [ ${BASH_VERSINFO[0]} -lt 2 -o ${BASH_VERSINFO[1]} -lt 4 ] ; then
--    echo "You should use version 2.04 at least to use this script"
--    exit
--fi
--
- # Test echo properties
- 
- (echo "12345\c" ; echo " ") > echotmp
-@@ -124,14 +112,14 @@
+--- doc/sendmail/configure.orig	Wed Jun  4 16:46:57 2003
++++ doc/sendmail/configure	Tue Jul  1 09:41:05 2003
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!%LOCALBASE%/bin/bash
+ #
+ # $Id: configure,v 1.25 2003/04/10 15:47:33 cvser Exp $
+ #
+@@ -134,7 +134,7 @@
  # Read transport
  
  POS=`$GREP -i PidFile $DAEMON_INI | $GREP -v ";"`
@@ -27,18 +14,8 @@
 +if [ "x" = "x" ] ; then
      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]/ ) }'`
--    if [ $POS -eq 0 ] ; then
-+    POS=`$GREP -i "Socket[^a-z]" $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /\// ) }'`
-+    if [ $POS -ne 0 ] ; then
-         echo " but defined UNIX sockets"
-         DAEMON_MODE="local"
--        DAEMON_SOCKET=`$GREP -i SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
-+	DAEMON_SOCKET=`$GREP -i "Socket[^a-z]" $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]|[[:blank:]]+[0-7]+$/, "", str ); print str; }'`
-         DAEMON_IP=""
-         DAEMON_PORT=""
-         DAEMON_PID=""
-@@ -297,8 +285,13 @@
+     if [ $VER -eq 1 ] ; then
+@@ -377,8 +377,13 @@
              echo "Edit one of configuration files and try again."
              exit 1
          fi 
diff --git a/security/drweb-sendmail/files/patch-af b/security/drweb-sendmail/files/patch-af
index 969451d4df75..40f70a692d60 100644
--- a/security/drweb-sendmail/files/patch-af
+++ b/security/drweb-sendmail/files/patch-af
@@ -1,5 +1,5 @@
---- etc/drweb_smf.conf.orig	Fri Feb 14 17:06:02 2003
-+++ etc/drweb_smf.conf	Tue Feb 18 06:36:20 2003
+--- 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 @@
  #   Address = local:/usr/local/drweb/run/drwebd.skt
  #   Address = pid:/usr/local/drweb/run/drwebd.pid
@@ -30,14 +30,22 @@
  
  # Permissions for created spool files
  SpoolFilesMode = 0600
-@@ -179,22 +179,22 @@
- ProcessingErrors = reject
+@@ -195,28 +195,28 @@
+ #        redirect - redirect to RedirectMail and reject message 
+ #        reject - reject such messages with permanent error 
+ #        tempfail - reject such message with temporary error 
+-ProcessingErrors = quarantine 
++ProcessingErrors = tempfail
  
  # Admin mail address (may be unix-local address)
 -AdminMail = av-master@example.com
 +AdminMail = postmaster
  
- # Filter address, that be used in From:
+ # 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%
  
@@ -58,49 +66,57 @@
  
  # Permissions for quarantined files
  QuarantineFilesMode = 0660
-@@ -223,9 +223,9 @@
+@@ -254,15 +254,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 = /etc/drweb/templates/en-ru/sendmail/virus-sender.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
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/virus-sender.msg
  
  [SkipNotifications]
  SenderNotify = yes
-@@ -233,23 +233,23 @@
+ AdminNotify = no
  RcptsNotify = no
- AdminTemplate = 
- RcptsTemplate = 
 -SenderTemplate = /etc/drweb/templates/en-ru/sendmail/skip-sender.msg
 +SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/skip-sender.msg
+ AdminTemplate = 
+ RcptsTemplate = 
  
- [ArchiveRestrictionNotifications]
+@@ -270,16 +270,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 = 
--SenderTemplate = /etc/drweb/templates/en-ru/sendmail/archive-sender.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-sender.msg
  
  [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 = 
--SenderTemplate = /etc/drweb/templates/en-ru/sendmail/error-sender.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-sender.msg
+ 
+ [RuleFilterNotifications]
+@@ -287,7 +287,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 = 
  
  ###################
- # Logging section #
-@@ -277,7 +277,7 @@
+@@ -316,7 +316,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
diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist
index dd9a53781eef..cb1b7a7bef4c 100644
--- a/security/drweb-sendmail/pkg-plist
+++ b/security/drweb-sendmail/pkg-plist
@@ -8,6 +8,9 @@ etc/drweb/drweb_smf.conf-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-ru/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg; fi
+etc/drweb/templates/en-ru/sendmail/rule-admin.msg-dist
+@exec [ -f %B/rule-admin.msg ] || cp %B/%f %B/rule-admin.msg
 @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
@@ -29,6 +32,33 @@ etc/drweb/templates/en-ru/sendmail/virus-rcpts.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/en-pl/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg; fi
+etc/drweb/templates/en-pl/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-pl/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg; fi
+etc/drweb/templates/en-pl/sendmail/rule-admin.msg-dist
+@exec [ -f %B/rule-admin.msg ] || cp %B/%f %B/rule-admin.msg
+@unexec if [ -f %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg; fi
+etc/drweb/templates/en-pl/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-pl/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg; fi
+etc/drweb/templates/en-pl/sendmail/archive-admin.msg-dist
+@exec [ -f %B/archive-admin.msg ] || cp %B/%f %B/archive-admin.msg
+@unexec if [ -f %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg; fi
+etc/drweb/templates/en-pl/sendmail/archive-sender.msg-dist
+@exec [ -f %B/archive-sender.msg ] || cp %B/%f %B/archive-sender.msg
+@unexec if [ -f %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg; fi
+etc/drweb/templates/en-pl/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-pl/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg; fi
+etc/drweb/templates/en-pl/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-pl/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg; fi
+etc/drweb/templates/en-pl/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-pl/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg; fi
+etc/drweb/templates/en-pl/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
 @exec [ -f %B/users.conf ] || cp %B/%f %B/users.conf