aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/drweb-postfix/Makefile24
-rw-r--r--security/drweb-postfix/distinfo4
-rw-r--r--security/drweb-postfix/files/patch-aa8
-rw-r--r--security/drweb-postfix/files/patch-ab52
-rw-r--r--security/drweb-postfix/pkg-plist13
5 files changed, 42 insertions, 59 deletions
diff --git a/security/drweb-postfix/Makefile b/security/drweb-postfix/Makefile
index 705510aff884..bf39c1916593 100644
--- a/security/drweb-postfix/Makefile
+++ b/security/drweb-postfix/Makefile
@@ -6,28 +6,28 @@
#
PORTNAME= drweb_postfix
-PORTVERSION= 4.29.12f
+PORTVERSION= 4.31
CATEGORIES= security mail
MASTER_SITES= ftp://ftp.drweb.ru/pub/unix/ \
ftp://ftp.drweb.ru/pub/unix/archive/ \
- ftp://ftp.drweb.ru/pub/unix/archive/drweb-clients-4.29.12/
-DISTNAME= drweb-clients-4.29.12-F-sources
+ ftp://ftp.drweb.ru/pub/unix/archive/drweb-clients-${PORTVERSION}/
+DISTNAME= drweb-clients-${PORTVERSION}-sources
MAINTAINER= zaa@ulstu.ru
COMMENT= Postfix message filter for virus processing through DrWeb daemon
+BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
RUN_DEPENDS= ${LOCALBASE}/drweb/drwebd:${PORTSDIR}/security/drweb
WRKSRC= ${WRKDIR}/${DISTNAME}
INST_PREFIX= ${PREFIX}/${PORTNAME}
-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 rule-admin
-DOCS=addresses_list.rus.txt addresses_list.txt conf_file.rus.txt \
+PORTDOCS= FAQ.rus.txt 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
@@ -56,7 +56,6 @@ post-configure:
} | ./configure
do-install:
- ${MKDIR} ${DOC_DIR}
.for LANG in ${LANGS}
${MKDIR} ${PREFIX}/etc/drweb/templates/${LANG}/postfix
.endfor
@@ -81,14 +80,17 @@ do-install:
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/drweb-postfix ${PREFIX}/sbin/
${INSTALL_PROGRAM} ${WRKSRC}/drwebdc ${PREFIX}/sbin/
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc/postfix && \
- ${INSTALL_DATA} ${DOCS} ${DOC_DIR}
+ ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
post-install:
@${CAT} ${PKGMESSAGE}
- @echo
- @echo "Read documentation about additional Postfix tuning needed"
- @echo "in ${DOC_DIR}."
- @echo
+ @${ECHO}
+ @${ECHO} "Read documentation about additional Postfix tuning needed"
+ @${ECHO} "in ${DOCSDIR}."
+ @${ECHO}
.include <bsd.port.mk>
diff --git a/security/drweb-postfix/distinfo b/security/drweb-postfix/distinfo
index a61e2f721f65..003369aeb2b6 100644
--- a/security/drweb-postfix/distinfo
+++ b/security/drweb-postfix/distinfo
@@ -1,2 +1,2 @@
-MD5 (drweb-clients-4.29.12-F-sources.tar.gz) = 5736324a8aa3053f4848ec25783bd494
-SIZE (drweb-clients-4.29.12-F-sources.tar.gz) = 338133
+MD5 (drweb-clients-4.31-sources.tar.gz) = 7215ff50a75d088eab210bcdb257effe
+SIZE (drweb-clients-4.31-sources.tar.gz) = 537926
diff --git a/security/drweb-postfix/files/patch-aa b/security/drweb-postfix/files/patch-aa
index cac6a9dd8f38..9ec4d924cd7d 100644
--- a/security/drweb-postfix/files/patch-aa
+++ b/security/drweb-postfix/files/patch-aa
@@ -1,10 +1,10 @@
---- 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 @@
+--- dw_options.c.orig Tue Dec 9 01:23:55 2003
++++ dw_options.c Tue Mar 2 20:54:56 2004
+@@ -117,7 +117,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 "/usr/local/etc/drweb/"CONF_FNAME
+#define OS_SPEC_CONFNAME "%PREFIX%/etc/drweb/"CONF_FNAME
#else /* FreeBSD */
#define OS_SPEC_CONFNAME "/opt/drweb/"CONF_FNAME
diff --git a/security/drweb-postfix/files/patch-ab b/security/drweb-postfix/files/patch-ab
index 392095ce0407..b47c064941fb 100644
--- a/security/drweb-postfix/files/patch-ab
+++ b/security/drweb-postfix/files/patch-ab
@@ -1,53 +1,46 @@
---- 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 @@
+--- etc/drweb_postfix.conf.orig Sun Jul 18 14:55:55 2004
++++ etc/drweb_postfix.conf Sun Jul 18 15:00:45 2004
+@@ -18,14 +18,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
- # Enable/disable caching resolved daemon host
+ # Enable/disable caching of the resolved daemon host
# (useful only if daemon uses TCP/IP communications)
Cache = yes
- # Timeout for whole scanning session (in seconds)
+ # Timeout for the whole scanning session (seconds)
-Timeout = 120
+Timeout = 160
########################
# Scan options section #
-@@ -69,10 +69,10 @@
- DenyOnOne = yes
+@@ -83,10 +83,10 @@
+ DenyByDefault = no
# List with rules for users or domains to block scanning
-DenyList = /etc/drweb/users.conf
+DenyList = %PREFIX%/etc/drweb/users.conf
- # Directory used for story temporary files
+ # Directory used to store temporary files
-Spool = /var/drweb/spool
+Spool = /tmp
# Permissions for created spool files
SpoolFilesMode = 0600
-@@ -192,28 +192,28 @@
- # redirect - redirect to RedirectMail and reject message
+@@ -237,7 +237,7 @@
+ # pass - pass such messages
# reject - reject such messages with permanent error
# tempfail - reject such message with temporary error
--ProcessingErrors = quarantine
+-ProcessingErrors = reject
+ProcessingErrors = tempfail
# Admin mail address (may be unix-local address)
--AdminMail = av-master@example.com
-+AdminMail = postmaster
-
- # 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%
+ AdminMail = postmaster
+@@ -249,16 +249,16 @@
+ FilterMail = DrWEB-DAEMON
# List of unnotificable viruses
-UnnotificableVirusesList = /etc/drweb/viruses.conf
@@ -59,23 +52,24 @@
# Quarantine directory.
# The infected files could be moved in that dir
- # if you stay this field empty or commented then
- # infected messages would not been storied
+ # if you leave this field empty or commented out then
+ # infected messages will not be stored
-Quarantine = /var/drweb/infected
+Quarantine = %PREFIX%/drweb/infected
# Permissions for quarantined files
QuarantineFilesMode = 0660
-@@ -237,15 +237,15 @@
+@@ -282,15 +282,16 @@
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
-+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
++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
++
[SkipNotifications]
SenderNotify = yes
@@ -86,7 +80,7 @@
AdminTemplate =
RcptsTemplate =
-@@ -253,16 +253,16 @@
+@@ -298,16 +299,16 @@
SenderNotify = yes
AdminNotify = yes
RcptsNotify = no
@@ -107,7 +101,7 @@
RcptsTemplate =
[RuleFilterNotifications]
-@@ -270,7 +270,7 @@
+@@ -315,7 +316,7 @@
AdminNotify = yes
RcptsNotify = no
SenderTemplate =
diff --git a/security/drweb-postfix/pkg-plist b/security/drweb-postfix/pkg-plist
index 658e54c74297..32ac153402f8 100644
--- a/security/drweb-postfix/pkg-plist
+++ b/security/drweb-postfix/pkg-plist
@@ -40,19 +40,6 @@ 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/addresses_list.rus.txt
-share/doc/drweb-postfix/addresses_list.txt
-share/doc/drweb-postfix/conf_file.rus.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-ru/postfix
@dirrm etc/drweb/templates/en-ru
@dirrm etc/drweb/templates