4 files changed, 40 insertions, 20 deletions

diff --git a/security/drweb-postfix/Makefile b/security/drweb-postfix/Makefile
index 190b1dfa0b78..c54a86937488 100644
--- a/security/drweb-postfix/Makefile
+++ b/security/drweb-postfix/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	drweb_postfix
-PORTVERSION=	4.29.10a
+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=	zaa@ulstu.ru
 COMMENT=	Postfix message filter for virus processing through DrWeb daemon
@@ -24,7 +24,7 @@ DOC_DIR=	${PREFIX}/share/doc/drweb-postfix
 LANGS=en-ru
 CONFS=drweb_postfix users viruses addresses
 TMPLS=archive-admin archive-sender error-admin error-sender skip-sender \
-      virus-admin virus-rcpts virus-sender
+      virus-admin virus-rcpts virus-sender rule-admin
 DOCS=addresses_list.rus.txt addresses_list.txt conf_file.rus.txt \
 	conf_file.txt notify.rus.txt notify.txt readme readme.rus \
 	users_list.rus.txt users_list.txt viruses_list.rus.txt viruses_list.txt
@@ -44,6 +44,7 @@ post-configure:
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
+		${ECHO_CMD} n; \
 		${ECHO_CMD} y; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
diff --git a/security/drweb-postfix/distinfo b/security/drweb-postfix/distinfo
index 2b1f1df3693b..a03f1c5cab76 100644
--- a/security/drweb-postfix/distinfo
+++ b/security/drweb-postfix/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-postfix/files/patch-ab b/security/drweb-postfix/files/patch-ab
index 17ab6f036ca2..392095ce0407 100644
--- a/security/drweb-postfix/files/patch-ab
+++ b/security/drweb-postfix/files/patch-ab
@@ -1,5 +1,5 @@
---- etc/drweb_postfix.conf.orig	Sat Mar  1 00:19:10 2003
-+++ etc/drweb_postfix.conf	Sat Mar  1 00:28:41 2003
+--- etc/drweb_postfix.conf.orig	Sat Jul 12 16:30:33 2003
++++ etc/drweb_postfix.conf	Sat Jul 12 16:40:30 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
-@@ -176,22 +176,22 @@
- ProcessingErrors = reject
+@@ -192,28 +192,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,45 +66,53 @@
  
  # Permissions for quarantined files
  QuarantineFilesMode = 0660
-@@ -206,9 +206,9 @@
+@@ -237,15 +237,15 @@
  RcptsNotify = yes
  
  # Files with notification templates
+-SenderTemplate = /etc/drweb/templates/en-ru/postfix/virus-sender.msg
 -AdminTemplate = /etc/drweb/templates/en-ru/postfix/virus-admin.msg
 -RcptsTemplate = /etc/drweb/templates/en-ru/postfix/virus-rcpts.msg
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/virus-sender.msg
 +AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-admin.msg
 +RcptsTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-rcpts.msg
 +SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-sender.msg
  
  [SkipNotifications]
  SenderNotify = yes
-@@ -216,23 +216,23 @@
+ AdminNotify = no
  RcptsNotify = no
- AdminTemplate = 
- RcptsTemplate = 
 -SenderTemplate = /etc/drweb/templates/en-ru/postfix/skip-sender.msg
 +SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/skip-sender.msg
+ AdminTemplate = 
+ RcptsTemplate = 
  
- [ArchiveRestrictionNotifications]
+@@ -253,16 +253,16 @@
  SenderNotify = yes
  AdminNotify = yes
  RcptsNotify = no
+-SenderTemplate = /etc/drweb/templates/en-ru/postfix/archive-sender.msg
 -AdminTemplate = /etc/drweb/templates/en-ru/postfix/archive-admin.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/archive-sender.msg
 +AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/archive-admin.msg
  RcptsTemplate = 
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/archive-sender.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/archive-sender.msg
  
  [ErrorNotifications]
  SenderNotify = yes
  AdminNotify = yes
  RcptsNotify = no
+-SenderTemplate = /etc/drweb/templates/en-ru/postfix/error-sender.msg
 -AdminTemplate = /etc/drweb/templates/en-ru/postfix/error-admin.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-sender.msg
 +AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-admin.msg
  RcptsTemplate = 
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/error-sender.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-sender.msg
+ 
+ [RuleFilterNotifications]
+@@ -270,7 +270,7 @@
+ AdminNotify = yes
+ RcptsNotify = no
+ SenderTemplate = 
+-AdminTemplate = /etc/drweb/templates/en-ru/postfix/rule-admin.msg
++AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/rule-admin.msg
+ RcptsTemplate = 
  
  ###################
- # Logging section #
diff --git a/security/drweb-postfix/pkg-plist b/security/drweb-postfix/pkg-plist
index a0b5b8b9cfec..658e54c74297 100644
--- a/security/drweb-postfix/pkg-plist
+++ b/security/drweb-postfix/pkg-plist
@@ -17,6 +17,9 @@ etc/drweb/templates/en-ru/postfix/error-admin.msg-dist
 @unexec if [ -f %D/etc/drweb/templates/en-ru/postfix/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/error-sender.msg %D/etc/drweb/templates/en-ru/postfix/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/error-sender.msg; fi
 etc/drweb/templates/en-ru/postfix/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/postfix/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/rule-admin.msg %D/etc/drweb/templates/en-ru/postfix/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/rule-admin.msg; fi
+etc/drweb/templates/en-ru/postfix/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/postfix/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/skip-sender.msg %D/etc/drweb/templates/en-ru/postfix/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/skip-sender.msg; fi
 etc/drweb/templates/en-ru/postfix/skip-sender.msg-dist
 @exec [ -f %B/skip-sender.msg ] || cp %B/%f %B/skip-sender.msg