Upgrade to 4.29

4 files changed, 7 insertions, 148 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index ef77c67222e8..4e9d1a2bbe87 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	drweb_sendmail
-PORTVERSION=    4.28.11
+PORTVERSION=    4.29
 CATEGORIES=	security mail
 MASTER_SITES=   ftp://ftp.drweb.ru/pub/unix/
 DISTNAME=       drweb-clients-${PORTVERSION}-sources
diff --git a/security/drweb-sendmail/distinfo b/security/drweb-sendmail/distinfo
index 251e09cbbfee..d6175110d5d8 100644
--- a/security/drweb-sendmail/distinfo
+++ b/security/drweb-sendmail/distinfo
@@ -1 +1 @@
-MD5 (drweb-clients-4.28.11-sources.tar.gz) = 4c3e508b8d3ba00d740db0bd8c5d180d
+MD5 (drweb-clients-4.29-sources.tar.gz) = 5ce100d96dd3a43df4fb49b2a8891457
diff --git a/security/drweb-sendmail/files/patch-af b/security/drweb-sendmail/files/patch-af
index 089c6309f01d..73f10a05d10a 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 Jul 26 17:03:59 2002
-+++ etc/drweb_smf.conf	Sun Aug 25 06:48:32 2002
+--- etc/drweb_smf.conf.orig	Mon Oct 28 15:05:35 2002
++++ etc/drweb_smf.conf	Thu Oct 31 03:40:19 2002
 @@ -14,14 +14,14 @@
  #   Address = inet:3000@localhost
  #   Address = local:/usr/local/drweb/run/drwebd.skt
@@ -30,27 +30,14 @@
  
  # 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 - reject messages
- #        tempfail - says that we temporary unavailable
--ProcessingErrors = reject
-+ProcessingErrors = tempfail
+@@ -147,16 +147,16 @@
+ ProcessingErrors = reject
  
  # Admin mail address (may be unix-local address)
 -AdminMail = av-admin@example.com
 +AdminMail = postmaster
  
- # Filter address`,' that be used in From:
+ # Filter address, that be used in From:
 -FilterMail = DrWeb-DAEMON@example.com
 +FilterMail = DrWeb-DAEMON@%HOSTNAME%
  
diff --git a/security/drweb-sendmail/files/patch-ah b/security/drweb-sendmail/files/patch-ah
deleted file mode 100644
index d3d389a42b5e..000000000000
--- a/security/drweb-sendmail/files/patch-ah
+++ /dev/null
@@ -1,128 +0,0 @@
---- ./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--