diff options
| -rw-r--r-- | security/drweb-sendmail/Makefile | 18 | ||||
| -rw-r--r-- | security/drweb-sendmail/distinfo | 3 | ||||
| -rw-r--r-- | security/drweb-sendmail/files/patch-ae | 8 | ||||
| -rw-r--r-- | security/drweb-sendmail/files/patch-af | 51 | ||||
| -rw-r--r-- | security/drweb-sendmail/pkg-plist | 32 |
5 files changed, 69 insertions, 43 deletions
diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile index 94f29e38e702..8ea770e67cb2 100644 --- a/security/drweb-sendmail/Makefile +++ b/security/drweb-sendmail/Makefile @@ -6,20 +6,20 @@ # PORTNAME= drweb_sendmail -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= anton@chelcom.ru +MAINTAINER= ports@FreeBSD.org 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 +BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 +RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/00drwebd.sh:${PORTSDIR}/security/drweb -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME} INST_PREFIX= ${PREFIX}/${PORTNAME} DOC_DIR= ${PREFIX}/share/doc/drweb-sendmail @@ -30,7 +30,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail .if !defined(WITH_DRWEBSMF_HOSTNAME) .if defined(BATCH) -WITH_DRWEBSMF_HOSTNAME= your.domain.name +WITH_DRWEBSMF_HOSTNAME= your.domain.name .else WITH_DRWEBSMF_HOSTNAME!=hostname .endif @@ -42,7 +42,7 @@ RANDOM_NUMBER=!!!___EDIT_THIS___!!! RANDOM_NUMBER!=dd if=/dev/random count=1 2> /dev/null | /sbin/md5 .endif -LANGS=en-ru en-pl +LANGS=en 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 rule-admin diff --git a/security/drweb-sendmail/distinfo b/security/drweb-sendmail/distinfo index 697c24beef13..003369aeb2b6 100644 --- a/security/drweb-sendmail/distinfo +++ b/security/drweb-sendmail/distinfo @@ -1 +1,2 @@ -MD5 (drweb-clients-4.29.12-F-sources.tar.gz) = 5736324a8aa3053f4848ec25783bd494 +MD5 (drweb-clients-4.31-sources.tar.gz) = 7215ff50a75d088eab210bcdb257effe +SIZE (drweb-clients-4.31-sources.tar.gz) = 537926 diff --git a/security/drweb-sendmail/files/patch-ae b/security/drweb-sendmail/files/patch-ae index d46af20a78ed..9ec4d924cd7d 100644 --- a/security/drweb-sendmail/files/patch-ae +++ b/security/drweb-sendmail/files/patch-ae @@ -1,10 +1,10 @@ ---- dw_options.c.orig Fri Feb 14 16:52:50 2003 -+++ dw_options.c Tue Feb 18 04:58: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-sendmail/files/patch-af b/security/drweb-sendmail/files/patch-af index 40f70a692d60..23012b4381e7 100644 --- a/security/drweb-sendmail/files/patch-af +++ b/security/drweb-sendmail/files/patch-af @@ -1,53 +1,46 @@ ---- 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 @@ +--- etc/drweb_smf.conf.orig Fri Feb 27 23:21:37 2004 ++++ etc/drweb_smf.conf Sat Mar 6 23:10:40 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 # -@@ -72,10 +72,10 @@ - DenyOnOne = yes +@@ -91,10 +91,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 -@@ -195,28 +195,28 @@ - # redirect - redirect to RedirectMail and reject message +@@ -245,7 +245,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% + # These reply strings will be used as SMTP reply if message has been rejected. + # You can specify only text part of reply: 550 5.7.0 Text part of reply. +@@ -269,16 +269,16 @@ + FilterMail = DrWEB-DAEMON # List of unnotificable viruses -UnnotificableVirusesList = /etc/drweb/viruses.conf @@ -59,14 +52,14 @@ # 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 -@@ -254,15 +254,15 @@ +@@ -317,15 +317,15 @@ RcptsNotify = yes # Files with notification templates @@ -86,7 +79,7 @@ AdminTemplate = RcptsTemplate = -@@ -270,16 +270,16 @@ +@@ -333,16 +333,16 @@ SenderNotify = yes AdminNotify = yes RcptsNotify = no @@ -107,7 +100,7 @@ RcptsTemplate = [RuleFilterNotifications] -@@ -287,7 +287,7 @@ +@@ -350,7 +350,7 @@ AdminNotify = yes RcptsNotify = no SenderTemplate = @@ -116,7 +109,7 @@ RcptsTemplate = ################### -@@ -316,7 +316,7 @@ +@@ -391,7 +391,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 @@ -124,4 +117,4 @@ +MilterAddress = local:%PREFIX%/drweb/run/drweb-smf.sock # Timeout for drweb-smf to sendmail connection - # (Must be greater that any Timeout. parameter in sendmail.cf) + # (Must be greater than any Timeout. parameter in sendmail.cf) diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist index cb1b7a7bef4c..785503d81a19 100644 --- a/security/drweb-sendmail/pkg-plist +++ b/security/drweb-sendmail/pkg-plist @@ -5,6 +5,33 @@ etc/drweb/addresses.conf-dist @unexec if [ -f %D/etc/drweb/drweb_smf.conf ] && cmp -s %D/etc/drweb/drweb_smf.conf %D/etc/drweb/drweb_smf.conf-dist; then rm -f %D/etc/drweb/drweb_smf.conf; fi etc/drweb/drweb_smf.conf-dist @exec [ -f %B/drweb_smf.conf ] || cp %B/%f %B/drweb_smf.conf +@unexec if [ -f %D/etc/drweb/templates/en/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/error-admin.msg %D/etc/drweb/templates/en/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/error-admin.msg; fi +etc/drweb/templates/en/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/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/rule-admin.msg %D/etc/drweb/templates/en/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/rule-admin.msg; fi +etc/drweb/templates/en/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/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/error-sender.msg %D/etc/drweb/templates/en/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/error-sender.msg; fi +etc/drweb/templates/en/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/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/archive-admin.msg %D/etc/drweb/templates/en/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/archive-admin.msg; fi +etc/drweb/templates/en/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/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/archive-sender.msg %D/etc/drweb/templates/en/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/archive-sender.msg; fi +etc/drweb/templates/en/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/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/skip-sender.msg %D/etc/drweb/templates/en/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/skip-sender.msg; fi +etc/drweb/templates/en/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/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-admin.msg %D/etc/drweb/templates/en/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-admin.msg; fi +etc/drweb/templates/en/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/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-rcpts.msg; fi +etc/drweb/templates/en/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/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en/sendmail/virus-sender.msg %D/etc/drweb/templates/en/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en/sendmail/virus-sender.msg; fi +etc/drweb/templates/en/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-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 @@ -70,6 +97,7 @@ etc/rc.d/drweb-sendmail.sh-dist @exec if [ ! -f %D/etc/rc.d/drweb-sendmail.sh ] ; then cp -p %D/%F %B/drweb-sendmail.sh; chmod 555 %B/drweb-sendmail.sh; fi sbin/drweb-smf sbin/drwebdc +share/doc/drweb-sendmail/FAQ.rus.txt share/doc/drweb-sendmail/addresses_list.rus.txt share/doc/drweb-sendmail/addresses_list.txt share/doc/drweb-sendmail/conf_file.rus.txt @@ -84,6 +112,10 @@ share/doc/drweb-sendmail/users_list.rus.txt share/doc/drweb-sendmail/users_list.txt share/doc/drweb-sendmail/viruses_list.rus.txt share/doc/drweb-sendmail/viruses_list.txt +@dirrm etc/drweb/templates/en/sendmail +@dirrm etc/drweb/templates/en +@dirrm etc/drweb/templates/en-pl/sendmail +@dirrm etc/drweb/templates/en-pl @dirrm etc/drweb/templates/en-ru/sendmail @dirrm etc/drweb/templates/en-ru @dirrm etc/drweb/templates |