6 files changed, 73 insertions, 81 deletions

diff --git a/security/drweb-postfix/Makefile b/security/drweb-postfix/Makefile
index af19073dd076..190b1dfa0b78 100644
--- a/security/drweb-postfix/Makefile
+++ b/security/drweb-postfix/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	drweb_postfix
-PORTVERSION=	4.29
+PORTVERSION=	4.29.10a
 CATEGORIES=	security mail
 MASTER_SITES=	ftp://ftp.drweb.ru/pub/unix/
-DISTNAME=	drweb-clients-${PORTVERSION}-sources
+DISTNAME=	drweb-clients-4.29.10-A-sources
 
 MAINTAINER=	zaa@ulstu.ru
 COMMENT=	Postfix message filter for virus processing through DrWeb daemon
@@ -21,12 +21,13 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 INST_PREFIX=	${PREFIX}/${PORTNAME}
 DOC_DIR=	${PREFIX}/share/doc/drweb-postfix
 
-LANGS=en-ru en-es
-CONFS=drweb_postfix users
-TMPLS=error-admin error-sender mailbomb-admin mailbomb-sender skip-sender \
+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
-DOCS=readme notify.rus.txt users_list.rus.txt conf_file.rus.txt notify.txt \
-	users_list.txt conf_file.txt readme.rus
+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
 
 post-patch:
 	cd ${WRKSRC} && \
@@ -39,6 +40,7 @@ post-patch:
 
 post-configure:
 	cd ${WRKSRC} && { \
+		${ECHO_CMD} ${PORTVERSION}; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
@@ -46,7 +48,6 @@ post-configure:
 		${ECHO_CMD} n; \
 		${ECHO_CMD} n; \
 		${ECHO_CMD} y; \
-		${ECHO_CMD} n; \
 		${ECHO_CMD} ${CFLAGS} ; \
 		${ECHO_CMD} y; \
 	} | ./configure
diff --git a/security/drweb-postfix/distinfo b/security/drweb-postfix/distinfo
index d6175110d5d8..2b1f1df3693b 100644
--- a/security/drweb-postfix/distinfo
+++ b/security/drweb-postfix/distinfo
@@ -1 +1 @@
-MD5 (drweb-clients-4.29-sources.tar.gz) = 5ce100d96dd3a43df4fb49b2a8891457
+MD5 (drweb-clients-4.29.10-A-sources.tar.gz) = c31e8383182e918e59d4ced8716cee4d
diff --git a/security/drweb-postfix/files/patch-aa b/security/drweb-postfix/files/patch-aa
index ac7905c948fe..cac6a9dd8f38 100644
--- a/security/drweb-postfix/files/patch-aa
+++ b/security/drweb-postfix/files/patch-aa
@@ -1,11 +1,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 @@
- 
+--- dw_options.c.orig	Fri Feb 14 16:52:50 2003
++++ dw_options.c	Sat Mar  1 00:18:04 2003
+@@ -113,7 +113,7 @@
  #if defined(__UNIX_DW)
  #if !defined(EMX_DW)
+ #if defined(FreeBSD_DW)
 -#define OS_SPEC_CONFNAME            "/usr/local/drweb/"CONF_FNAME
 +#define OS_SPEC_CONFNAME            "%PREFIX%/etc/drweb/"CONF_FNAME
- #else /* EMX */
- #define OS_SPEC_CONFNAME            "./"CONF_FNAME
- #endif /* EMX */
+ #else /* FreeBSD */
+ #define OS_SPEC_CONFNAME            "/opt/drweb/"CONF_FNAME
+ #endif /* FreeBSD */
diff --git a/security/drweb-postfix/files/patch-ab b/security/drweb-postfix/files/patch-ab
index 3f7485b7d02a..17ab6f036ca2 100644
--- a/security/drweb-postfix/files/patch-ab
+++ b/security/drweb-postfix/files/patch-ab
@@ -1,9 +1,9 @@
---- etc/drweb_postfix.conf.orig	Wed Dec  4 16:17:33 2002
-+++ etc/drweb_postfix.conf	Wed Dec  4 16:56:36 2002
-@@ -14,14 +14,14 @@
- #   Address = inet:3000@localhost
+--- etc/drweb_postfix.conf.orig	Sat Mar  1 00:19:10 2003
++++ etc/drweb_postfix.conf	Sat Mar  1 00:28:41 2003
+@@ -17,14 +17,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
  
@@ -17,7 +17,7 @@
  
  ########################
  # Scan options section #
-@@ -58,10 +58,10 @@
+@@ -69,10 +69,10 @@
  DenyOnOne = yes
  
  # List with rules for users or domains to block scanning 
@@ -30,16 +30,24 @@
  
  # Permissions for created spool files
  SpoolFilesMode = 0600
-@@ -144,16 +144,16 @@
+@@ -176,22 +176,22 @@
  ProcessingErrors = reject
  
  # Admin mail address (may be unix-local address)
--AdminMail = av-admin@example.com
+-AdminMail = av-master@example.com
 +AdminMail = postmaster
  
  # Filter address, that be used in From:
--FilterMail = DrWeb-DAEMON@example.com
-+FilterMail = DrWeb-DAEMON@%HOSTNAME%
+-FilterMail = DrWEB-DAEMON@example.com
++FilterMail = DrWEB-DAEMON@%HOSTNAME%
+ 
+ # 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 
@@ -50,44 +58,45 @@
  
  # Permissions for quarantined files
  QuarantineFilesMode = 0660
-@@ -168,32 +168,32 @@
+@@ -206,9 +206,9 @@
  RcptsNotify = yes
  
  # Files with notification templates
 -AdminTemplate = /etc/drweb/templates/en-ru/postfix/virus-admin.msg
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/virus-sender.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
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-sender.msg
 +RcptsTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-rcpts.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/virus-sender.msg
  
  [SkipNotifications]
- AdminNotify = no
  SenderNotify = yes
+@@ -216,23 +216,23 @@
  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
- RcptsTemplate = 
  
- [MailbombNotifications]
- AdminNotify = yes
+ [ArchiveRestrictionNotifications]
  SenderNotify = yes
+ AdminNotify = yes
  RcptsNotify = no
--AdminTemplate = /etc/drweb/templates/en-ru/postfix/mailbomb-admin.msg
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/mailbomb-sender.msg
-+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/mailbomb-admin.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/mailbomb-sender.msg
+-AdminTemplate = /etc/drweb/templates/en-ru/postfix/archive-admin.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]
- AdminNotify = yes
  SenderNotify = yes
+ AdminNotify = yes
  RcptsNotify = no
 -AdminTemplate = /etc/drweb/templates/en-ru/postfix/error-admin.msg
--SenderTemplate = /etc/drweb/templates/en-ru/postfix/error-sender.msg
 +AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-admin.msg
-+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-sender.msg
  RcptsTemplate = 
+-SenderTemplate = /etc/drweb/templates/en-ru/postfix/error-sender.msg
++SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/postfix/error-sender.msg
  
  ###################
+ # Logging section #
diff --git a/security/drweb-postfix/pkg-descr b/security/drweb-postfix/pkg-descr
index 854b7cad914d..4a63e85ac2d2 100644
--- a/security/drweb-postfix/pkg-descr
+++ b/security/drweb-postfix/pkg-descr
@@ -1,8 +1,6 @@
 Postfix message filter for virus processing through DrWeb daemon
 
 WWW: http://www.drweb.ru/unix/
-
---
-zhuravlev alexander
- u l s t u  n o c
- zaa @ ulstu . ru
+	
+	                             -- zhuravlev alexander
+				             (zaa@ulstu.ru)
diff --git a/security/drweb-postfix/pkg-plist b/security/drweb-postfix/pkg-plist
index e8a588752bd9..a0b5b8b9cfec 100644
--- a/security/drweb-postfix/pkg-plist
+++ b/security/drweb-postfix/pkg-plist
@@ -1,19 +1,22 @@
 @comment $FreeBSD$
+@unexec if [ -f %D/etc/drweb/addresses.conf ] && cmp -s %D/etc/drweb/addresses.conf %D/etc/drweb/addresses.conf-dist; then rm -f %D/etc/drweb/addresses.conf; fi
+etc/drweb/addresses.conf-dist
+@exec [ -f %B/addresses.conf ] || cp %B/%f %B/addresses.conf
 @unexec if [ -f %D/etc/drweb/drweb_postfix.conf ] && cmp -s %D/etc/drweb/drweb_postfix.conf %D/etc/drweb/drweb_postfix.conf-dist; then rm -f %D/etc/drweb/drweb_postfix.conf; fi
 etc/drweb/drweb_postfix.conf-dist
 @exec [ -f %B/drweb_postfix.conf ] || cp %B/%f %B/drweb_postfix.conf
+@unexec if [ -f %D/etc/drweb/templates/en-ru/postfix/archive-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/archive-admin.msg %D/etc/drweb/templates/en-ru/postfix/archive-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/archive-admin.msg; fi
+etc/drweb/templates/en-ru/postfix/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-ru/postfix/archive-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/archive-sender.msg %D/etc/drweb/templates/en-ru/postfix/archive-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/archive-sender.msg; fi
+etc/drweb/templates/en-ru/postfix/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-ru/postfix/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/error-admin.msg %D/etc/drweb/templates/en-ru/postfix/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/error-admin.msg; fi
 etc/drweb/templates/en-ru/postfix/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/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/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/mailbomb-admin.msg %D/etc/drweb/templates/en-ru/postfix/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/mailbomb-admin.msg; fi
-etc/drweb/templates/en-ru/postfix/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-ru/postfix/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/mailbomb-sender.msg %D/etc/drweb/templates/en-ru/postfix/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/mailbomb-sender.msg; fi
-etc/drweb/templates/en-ru/postfix/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-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
@@ -26,46 +29,27 @@ etc/drweb/templates/en-ru/postfix/virus-rcpts.msg-dist
 @unexec if [ -f %D/etc/drweb/templates/en-ru/postfix/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/postfix/virus-sender.msg %D/etc/drweb/templates/en-ru/postfix/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/postfix/virus-sender.msg; fi
 etc/drweb/templates/en-ru/postfix/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-es/postfix/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/error-admin.msg %D/etc/drweb/templates/en-es/postfix/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/error-admin.msg; fi
-etc/drweb/templates/en-es/postfix/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-es/postfix/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/error-sender.msg %D/etc/drweb/templates/en-es/postfix/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/error-sender.msg; fi
-etc/drweb/templates/en-es/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-es/postfix/mailbomb-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/mailbomb-admin.msg %D/etc/drweb/templates/en-es/postfix/mailbomb-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/mailbomb-admin.msg; fi
-etc/drweb/templates/en-es/postfix/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-es/postfix/mailbomb-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/mailbomb-sender.msg %D/etc/drweb/templates/en-es/postfix/mailbomb-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/mailbomb-sender.msg; fi
-etc/drweb/templates/en-es/postfix/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-es/postfix/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/skip-sender.msg %D/etc/drweb/templates/en-es/postfix/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/skip-sender.msg; fi
-etc/drweb/templates/en-es/postfix/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/postfix/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/virus-admin.msg %D/etc/drweb/templates/en-es/postfix/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/virus-admin.msg; fi
-etc/drweb/templates/en-es/postfix/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-es/postfix/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/virus-rcpts.msg %D/etc/drweb/templates/en-es/postfix/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/virus-rcpts.msg; fi
-etc/drweb/templates/en-es/postfix/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-es/postfix/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-es/postfix/virus-sender.msg %D/etc/drweb/templates/en-es/postfix/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-es/postfix/virus-sender.msg; fi
-etc/drweb/templates/en-es/postfix/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
+@unexec if [ -f %D/etc/drweb/viruses.conf ] && cmp -s %D/etc/drweb/viruses.conf %D/etc/drweb/viruses.conf-dist; then rm -f %D/etc/drweb/viruses.conf; fi
+etc/drweb/viruses.conf-dist
+@exec [ -f %B/viruses.conf ] || cp %B/%f %B/viruses.conf
 sbin/drweb-postfix
 sbin/drwebdc
-share/doc/drweb-postfix/readme
-share/doc/drweb-postfix/notify.rus.txt
-share/doc/drweb-postfix/users_list.rus.txt
+share/doc/drweb-postfix/addresses_list.rus.txt
+share/doc/drweb-postfix/addresses_list.txt
 share/doc/drweb-postfix/conf_file.rus.txt
-share/doc/drweb-postfix/notify.txt
-share/doc/drweb-postfix/users_list.txt
 share/doc/drweb-postfix/conf_file.txt
+share/doc/drweb-postfix/notify.rus.txt
+share/doc/drweb-postfix/notify.txt
+share/doc/drweb-postfix/readme
 share/doc/drweb-postfix/readme.rus
+share/doc/drweb-postfix/users_list.rus.txt
+share/doc/drweb-postfix/users_list.txt
+share/doc/drweb-postfix/viruses_list.rus.txt
+share/doc/drweb-postfix/viruses_list.txt
 @dirrm share/doc/drweb-postfix
-@dirrm etc/drweb/templates/en-es/postfix
-@dirrm etc/drweb/templates/en-es
 @dirrm etc/drweb/templates/en-ru/postfix
 @dirrm etc/drweb/templates/en-ru
 @dirrm etc/drweb/templates