Date: Mon, 25 Oct 2004 12:18:03 +0400 From: Demin Alexander <support@spectrum.ru> To: ports-bugs@freebsd.org Subject: ports/72511 - current diff for update security/drweb-sendmail Message-ID: <20041025121803.61c84f2e.support@spectrum.ru>
next in thread | raw e-mail | index | archive | help
diff -ruN security/drweb-sendmail.orig/Makefile security/drweb-sendmail/Makefile --- security/drweb-sendmail.orig/Makefile Tue May 25 22:42:12 2004 +++ security/drweb-sendmail/Makefile Mon Oct 25 12:14:06 2004 @@ -5,135 +5,86 @@ # $FreeBSD: ports/security/drweb-sendmail/Makefile,v 1.65 2004/05/25 18:42:12 pav Exp $ # -PORTNAME= drweb_sendmail -PORTVERSION= 4.31 +PORTNAME= drweb-sendmail +PORTVERSION= 4.32 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-${PORTVERSION}/ -DISTNAME= drweb-clients-${PORTVERSION}-sources - -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}/drweb/drwebd:${PORTSDIR}/security/drweb - -WRKSRC= ${WRKDIR}/${DISTNAME} - -INST_PREFIX= ${PREFIX}/${PORTNAME} -DOC_DIR= ${PREFIX}/share/doc/drweb-sendmail - -.if !exists( /usr/include/libmilter/mfapi.h ) -BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail -MAKE_ARGS+= ADDLIB_FreeBSD=-L${LOCALBASE}/lib -MAKE_ARGS+= "ADDF_FreeBSD=-Iaddons/md5 -I${LOCALBASE}/include" -.endif +MASTER_SITES= ftp://ftp.drweb.ru/pub/unix/Clients/ -.if !defined(WITH_DRWEBSMF_HOSTNAME) -.if defined(BATCH) -WITH_DRWEBSMF_HOSTNAME= your.domain.name -.else -WITH_DRWEBSMF_HOSTNAME!=hostname -.endif -.endif +MAINTAINER= ports@FreeBSD.org +COMMENT= Sendmail message filter for virus processing through DrWeb daemon + +RUN_DEPENDS= ${LOCALBASE}/drweb/drwebd:${PORTSDIR}/security/drweb \ + ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail -.if defined(BATCH) -RANDOM_NUMBER=!!!___EDIT_THIS___!!! +NO_BUILD= yes + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd4 .else -RANDOM_NUMBER!=dd if=/dev/random count=1 2> /dev/null | /sbin/md5 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd52 .endif -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 - -post-patch: - ${SED} "s#%PREFIX%#${PREFIX}#g" < ${FILESDIR}/drweb-sendmail.sh \ - > ${WRKSRC}/drweb-sendmail.sh - cd ${WRKSRC} && \ - ${SED} "s#%PREFIX%#${PREFIX}#g" < dw_options.c > ndwo.c && \ - mv ndwo.c dw_options.c - cd ${WRKSRC}/doc/sendmail && \ - ${SED} "s#%LOCALBASE%#${LOCALBASE}#g" < configure > nconf && \ - mv nconf configure && chmod a+rx configure - cd ${WRKSRC}/etc && \ - ${SED} "s#%PREFIX%#${PREFIX}#g;\ - s#%HOSTNAME%#${WITH_DRWEBSMF_HOSTNAME}#g;\ - s#!!!___EDIT_THIS___!!!#${RANDOM_NUMBER}#" \ - < drweb_smf.conf > ndrwsmf.conf && \ - mv ndrwsmf.conf drweb_smf.conf - -post-configure: - cd ${WRKSRC} && { \ - ${ECHO_CMD} ${PORTVERSION}; \ - ${ECHO_CMD} y; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} y; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} n; \ - ${ECHO_CMD} y; \ - ${ECHO_CMD} ${CFLAGS} ; \ - ${ECHO_CMD} y; \ - } | ./configure +WRKSRC= ${WRKDIR}/${PORTNAME} +INST_PREFIX= ${PREFIX}/${PORTNAME} +DOC_DIR= ${PREFIX}/share/doc/${PORTNAME} +CONFDIR= ${PREFIX}/etc/${PORTNAME} + +LANGS= en en-ru en-pl +CONFS= drweb_smf users viruses addresses drweb_agent +TMPLS= archive-admin archive-sender cured-admin cured-sender error-admin \ + error-sender rule-admin skip-sender virus-admin virus-rcpts virus-sender do-install: + ${MKDIR} ${INST_PREFIX} + ${MKDIR} ${INST_PREFIX}/run + ${MKDIR} ${CONFDIR} ${MKDIR} ${DOC_DIR} + ${MKDIR} ${DOC_DIR}/agent + ${MKDIR} ${DOC_DIR}/sendmail + ${INSTALL_PROGRAM} ${WRKSRC}/usr/local/drweb/drweb-agent.static \ + ${INST_PREFIX}/drweb-agent + ${INSTALL_PROGRAM} ${WRKSRC}/usr/local/drweb/drweb-smf.static \ + ${INST_PREFIX}/drweb-smf + ${SED} 's#%INSTALL%#${INST_PREFIX}#g' \ + < ${FILESDIR}/01.drweb-smf.sh \ + > ${PREFIX}/etc/rc.d/01.drweb-smf.sh-dist + ${CHMOD} 750 ${PREFIX}/etc/rc.d/01.drweb-smf.sh-dist + ${SED} 's#%INSTALL%#${INST_PREFIX}#g' \ + < ${WRKSRC}/usr/local/drweb/doc/agent/bsd/001.drweb-agent.sh \ + > ${PREFIX}/etc/rc.d/001.drweb-agent.sh-dist + ${CHMOD} 640 ${PREFIX}/etc/rc.d/001.drweb-agent.sh-dist .for LANG in ${LANGS} - ${MKDIR} ${PREFIX}/etc/drweb/templates/${LANG}/sendmail + ${MKDIR} ${PREFIX}/etc/${PORTNAME}/templates/${LANG}/sendmail .endfor .for CONF in ${CONFS} - ${INSTALL_DATA} -m 600 ${WRKSRC}/etc/${CONF}.conf \ - ${PREFIX}/etc/drweb/${CONF}.conf-dist - if [ ! -f ${PREFIX}/etc/drweb/${CONF}.conf ]; then \ - ${INSTALL_DATA} -m 600 ${WRKSRC}/etc/${CONF}.conf \ - ${PREFIX}/etc/drweb/${CONF}.conf; \ - fi + ${SED} 's#%CONFDIR%#${CONFDIR}#g' \ + < ${WRKSRC}/usr/local/etc/drweb/${CONF}.conf \ + > ${CONFDIR}/${CONF}.conf-dist + ${CHMOD} 640 ${CONFDIR}/${CONF}.conf-dist +.if !exists( ${PREFIX}/etc/${PORTNAME}/${CONF}.conf ) + ${CP} ${CONFDIR}/${CONF}.conf-dist ${CONFDIR}/${CONF}.conf + ${CHMOD} 600 ${CONFDIR}/${CONF}.conf +.endif .endfor .for LANG in ${LANGS} .for TMPL in ${TMPLS} - cd ${WRKSRC}/etc/templates/${LANG}/sendmail && \ - tr -d '\r' < ${TMPL}.msg > \ - ${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg-dist - if [ ! -f ${PREFIX}/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg ]; then \ - cd ${PREFIX}/etc/drweb/templates/${LANG}/sendmail && \ - ${CP} ${TMPL}.msg-dist ${TMPL}.msg; \ - fi + ${INSTALL_DATA} ${WRKSRC}/usr/local/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg \ + ${PREFIX}/etc/${PORTNAME}/templates/${LANG}/sendmail/${TMPL}.msg-dist +.if !exists( ${PREFIX}/etc/${PORTNAME}/templates/${LANG}/sendmail/${TMPL}.msg ) + ${INSTALL_DATA} -u drweb -g drweb -m 640 ${WRKSRC}/usr/local/etc/drweb/templates/${LANG}/sendmail/${TMPL}.msg \ + ${PREFIX}/etc/${PORTNAME}/templates/${LANG}/sendmail/${TMPL}.msg +.endif .endfor .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/drweb-smf ${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/drwebdc ${PREFIX}/sbin/ - cd ${WRKSRC}/doc/sendmail && { \ - ${ECHO_CMD} ; \ - ${ECHO_CMD} "${PREFIX}/drweb"; \ - ${ECHO_CMD} "${PREFIX}/drweb/drweb32.ini"; \ - ${ECHO_CMD} "${PREFIX}/sbin"; \ - ${ECHO_CMD} "${PREFIX}/etc/drweb/drweb_smf.conf"; \ - ${ECHO_CMD} ; \ - ${ECHO_CMD} ; \ - ${ECHO_CMD} t; \ - ${ECHO_CMD} ; \ - ${ECHO_CMD} ; \ - } | ./configure - cd ${WRKSRC}/doc/sendmail && \ - ${INSTALL_DATA} readme* *.txt sendmail.??.addon \ - ${DOC_DIR} - ${INSTALL_DATA} ${WRKSRC}/drweb-sendmail.sh \ - ${PREFIX}/etc/rc.d/drweb-sendmail.sh-dist - if [ ! -f ${PREFIX}/etc/rc.d/drweb-sendmail.sh ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/drweb-sendmail.sh \ - ${PREFIX}/etc/rc.d/; \ - fi - -post-install: - @echo - @echo "Read documentation about additional sendmail tuning needed" - @echo "in ${DOC_DIR}." - @echo + ${CP} ${WRKSRC}/usr/local/drweb/doc/agent/*.txt \ + ${DOC_DIR}/agent/ + ${CP} ${WRKSRC}/usr/local/drweb/doc/agent/read* \ + ${DOC_DIR}/agent/ + ${CP} ${WRKSRC}/usr/local/drweb/doc/sendmail/*.txt \ + ${DOC_DIR}/sendmail/ + ${CP} ${WRKSRC}/usr/local/drweb/doc/sendmail/read* \ + ${DOC_DIR}/sendmail/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN security/drweb-sendmail.orig/distinfo security/drweb-sendmail/distinfo --- security/drweb-sendmail.orig/distinfo Thu Mar 25 01:14:56 2004 +++ security/drweb-sendmail/distinfo Fri Oct 8 09:56:08 2004 @@ -1,2 +1,4 @@ -MD5 (drweb-clients-4.31-sources.tar.gz) = 7215ff50a75d088eab210bcdb257effe -SIZE (drweb-clients-4.31-sources.tar.gz) = 537926 +MD5 (drweb-sendmail-4.32-freebsd4.tar.gz) = d6739f343fe726edbfbfac4f20fab38d +SIZE (drweb-sendmail-4.32-freebsd4.tar.gz) = 588334 +MD5 (drweb-sendmail-4.32-freebsd52.tar.gz) = 520f26d1e8d623444fee9af0e804b0df +SIZE (drweb-sendmail-4.32-freebsd52.tar.gz) = 781610 diff -ruN security/drweb-sendmail.orig/files/01.drweb-smf.sh security/drweb-sendmail/files/01.drweb-smf.sh --- security/drweb-sendmail.orig/files/01.drweb-smf.sh Mon Oct 11 14:01:47 2004 +++ security/drweb-sendmail/files/01.drweb-smf.sh Mon Oct 11 13:21:06 2004 @@ -4,7 +4,7 @@ start) if [ -x %INSTALL%/drweb-smf ]; then killall drweb-smf >/dev/null 2>& 1; - %INSTALL%/drweb-smf --conf=%CONFDIR%/drweb_smf.conf && \ + %INSTALL%/drweb-smf --conf=/usr/local/etc/drweb-sendmail/drweb_smf.conf && \ echo ' Starting drweb-smf'; fi ;; diff -ruN security/drweb-sendmail.orig/files/drweb-sendmail.sh security/drweb-sendmail/files/drweb-sendmail.sh --- security/drweb-sendmail.orig/files/drweb-sendmail.sh Sat May 11 07:26:45 2002 +++ security/drweb-sendmail/files/drweb-sendmail.sh Thu Jan 1 03:00:00 1970 @@ -1,20 +0,0 @@ -#!/bin/sh - -case "$1" in -start) - if [ -x %PREFIX%/sbin/drweb-smf ]; then - rm -f %PREFIX%/drweb/run/drweb-smf.sock; - %PREFIX%/sbin/drweb-smf --conf=%PREFIX%/etc/drweb/drweb_smf.conf && \ - echo -n ' drweb-smf'; - fi - ;; -stop) - killall drweb-smf >/dev/null 2>& 1; - echo -n ' drweb-smf'; - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff -ruN security/drweb-sendmail.orig/files/patch-aa security/drweb-sendmail/files/patch-aa --- security/drweb-sendmail.orig/files/patch-aa Sun Aug 25 09:30:34 2002 +++ security/drweb-sendmail/files/patch-aa Fri Oct 8 18:05:32 2004 @@ -1,17 +1,11 @@ ---- configure.orig Thu Jul 25 17:31:39 2002 -+++ configure Sat Aug 24 20:10:04 2002 -@@ -148,14 +148,6 @@ - -o\ - $NO_ADD = "yes" ] ; then - echo -- echo "So you should to have next files:" -- echo "$SM_HDR" -- echo "include/libmilter/mfapi.h" -- echo "lib/libmilter.a" -- echo "$SM_LIB" -- echo -- echo "Do it and try again" -- exit 1 - fi - else - DRWEB_SM="" +--- usr/local/drweb/doc/agent/bsd/001.drweb-agent.sh.orig Fri Oct 8 18:03:31 2004 ++++ usr/local/drweb/doc/agent/bsd/001.drweb-agent.sh Fri Oct 8 18:04:14 2004 +@@ -1,7 +1,7 @@ + #!/bin/sh + case "$1" in + start) +- /usr/local/drweb/drweb-agent ++ %INSTALL%/drweb-agent + ;; + + reload) diff -ruN security/drweb-sendmail.orig/files/patch-ab security/drweb-sendmail/files/patch-ab --- security/drweb-sendmail.orig/files/patch-ab Thu Jan 1 03:00:00 1970 +++ security/drweb-sendmail/files/patch-ab Mon Oct 11 12:04:44 2004 @@ -0,0 +1,102 @@ +--- usr/local/etc/drweb/drweb_smf.conf.orig Mon Oct 11 11:55:31 2004 ++++ usr/local/etc/drweb/drweb_smf.conf Mon Oct 11 12:02:22 2004 +@@ -97,10 +97,10 @@ + DenyByDefault = no + + # List with rules for users or domains to block scanning +-DenyList = /usr/local/etc/drweb/users.conf ++DenyList = %CONFDIR%/users.conf + + # Directory used to store temporary files +-Spool = /var/drweb/spool ++Spool = /tmp + + # Permissions for created spool files + SpoolFilesMode = 0600 +@@ -282,16 +282,16 @@ + FilterMail = DrWEB-DAEMON + + # List of unnotificable viruses +-UnnotificableVirusesList = /usr/local/etc/drweb/viruses.conf ++UnnotificableVirusesList = %CONFDIR%/viruses.conf + + # List of unnotificable addresses +-UnnotificableAddressesList = /usr/local/etc/drweb/addresses.conf ++UnnotificableAddressesList = %CONFDIR%/addresses.conf + + # Quarantine directory. + # The infected files could be moved in that dir + # if you leave this field empty or commented out then + # infected messages will not be stored +-Quarantine = /var/drweb/infected ++Quarantine = /usr/local/drweb/infected + + # Permissions for quarantined files + QuarantineFilesMode = 0660 +@@ -330,21 +330,21 @@ + RcptsNotify = yes + + # Files with notification templates +-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/virus-sender.msg +-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/virus-admin.msg +-RcptsTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg ++SenderTemplate = %CONFDIR%/templates/en-ru/sendmail/virus-sender.msg ++AdminTemplate = %CONFDIR%/templates/en-ru/sendmail/virus-admin.msg ++RcptsTemplate = %CONFDIR%/templates/en-ru/sendmail/virus-rcpts.msg + + [CuredNotifications] + SenderNotify = yes + AdminNotify = yes +-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/cured-sender.msg +-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/cured-admin.msg ++SenderTemplate = %CONFDIR%/templates/en-ru/sendmail/cured-sender.msg ++AdminTemplate = %CONFDIR%/templates/en-ru/sendmail/cured-admin.msg + + [SkipNotifications] + SenderNotify = yes + AdminNotify = no + RcptsNotify = no +-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/skip-sender.msg ++SenderTemplate = %CONFDIR%/templates/en-ru/sendmail/skip-sender.msg + AdminTemplate = + RcptsTemplate = + +@@ -352,16 +352,16 @@ + SenderNotify = yes + AdminNotify = yes + RcptsNotify = no +-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/archive-sender.msg +-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/archive-admin.msg ++SenderTemplate = %CONFDIR%/templates/en-ru/sendmail/archive-sender.msg ++AdminTemplate = %CONFDIR%/templates/en-ru/sendmail/archive-admin.msg + RcptsTemplate = + + [ErrorNotifications] + SenderNotify = yes + AdminNotify = yes + RcptsNotify = no +-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/error-sender.msg +-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/error-admin.msg ++SenderTemplate = %CONFDIR%/templates/en-ru/sendmail/error-sender.msg ++AdminTemplate = %CONFDIR%/templates/en-ru/sendmail/error-admin.msg + RcptsTemplate = + + [RuleFilterNotifications] +@@ -369,7 +369,7 @@ + AdminNotify = yes + RcptsNotify = no + SenderTemplate = +-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/sendmail/rule-admin.msg ++AdminTemplate = %CONFDIR%/templates/en-ru/sendmail/rule-admin.msg + RcptsTemplate = + + ################### +@@ -430,7 +430,7 @@ + + # Milter (libmilter have its own output system) debug level (0 - quiet .. 5 - + # verbose) +-MilterDebugLevel = 0 ++MilterDebugLevel = 1 + + ################################ + # Mail system settings section # diff -ruN security/drweb-sendmail.orig/files/patch-ac security/drweb-sendmail/files/patch-ac --- security/drweb-sendmail.orig/files/patch-ac Tue Jul 1 10:51:41 2003 +++ security/drweb-sendmail/files/patch-ac Thu Jan 1 03:00:00 1970 @@ -1,31 +0,0 @@ ---- doc/sendmail/configure.orig Wed Jun 4 16:46:57 2003 -+++ doc/sendmail/configure Tue Jul 1 09:41:05 2003 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!%LOCALBASE%/bin/bash - # - # $Id: configure,v 1.25 2003/04/10 15:47:33 cvser Exp $ - # -@@ -134,7 +134,7 @@ - # Read transport - - POS=`$GREP -i PidFile $DAEMON_INI | $GREP -v ";"` --if [ "x$POS" = "x" ] ; then -+if [ "x" = "x" ] ; then - echo - echo -n "Daemon pidfile not defined in ini-file ..." - if [ $VER -eq 1 ] ; then -@@ -377,8 +377,13 @@ - echo "Edit one of configuration files and try again." - exit 1 - fi -+ else -+ echo "Press Enter" -+ read INPUT - fi - else -+ echo "Press Enter" -+ read INPUT - FILTER_TIMEOUT=0 - fi - diff -ruN security/drweb-sendmail.orig/files/patch-ae security/drweb-sendmail/files/patch-ae --- security/drweb-sendmail.orig/files/patch-ae Thu Mar 25 01:14:57 2004 +++ security/drweb-sendmail/files/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- 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/etc/drweb/"CONF_FNAME -+#define OS_SPEC_CONFNAME "%PREFIX%/etc/drweb/"CONF_FNAME - #else /* FreeBSD */ - #define OS_SPEC_CONFNAME "/opt/drweb/"CONF_FNAME - #endif /* FreeBSD */ diff -ruN security/drweb-sendmail.orig/files/patch-af security/drweb-sendmail/files/patch-af --- security/drweb-sendmail.orig/files/patch-af Thu Mar 25 01:14:57 2004 +++ security/drweb-sendmail/files/patch-af Thu Jan 1 03:00:00 1970 @@ -1,120 +0,0 @@ ---- 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 of the resolved daemon host - # (useful only if daemon uses TCP/IP communications) - Cache = yes - - # Timeout for the whole scanning session (seconds) --Timeout = 120 -+Timeout = 160 - - ######################## - # Scan options section # -@@ -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 to store temporary files --Spool = /var/drweb/spool -+Spool = /tmp - - # Permissions for created spool files - SpoolFilesMode = 0600 -@@ -245,7 +245,7 @@ - # pass - pass such messages - # reject - reject such messages with permanent error - # tempfail - reject such message with temporary error --ProcessingErrors = reject -+ProcessingErrors = tempfail - - # 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 -+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 - # 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 -@@ -317,15 +317,15 @@ - RcptsNotify = yes - - # Files with notification templates --SenderTemplate = /etc/drweb/templates/en-ru/sendmail/virus-sender.msg --AdminTemplate = /etc/drweb/templates/en-ru/sendmail/virus-admin.msg --RcptsTemplate = /etc/drweb/templates/en-ru/sendmail/virus-rcpts.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 - AdminNotify = no - RcptsNotify = no --SenderTemplate = /etc/drweb/templates/en-ru/sendmail/skip-sender.msg -+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/skip-sender.msg - AdminTemplate = - RcptsTemplate = - -@@ -333,16 +333,16 @@ - SenderNotify = yes - AdminNotify = yes - RcptsNotify = no --SenderTemplate = /etc/drweb/templates/en-ru/sendmail/archive-sender.msg --AdminTemplate = /etc/drweb/templates/en-ru/sendmail/archive-admin.msg -+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-sender.msg -+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/archive-admin.msg - RcptsTemplate = - - [ErrorNotifications] - SenderNotify = yes - AdminNotify = yes - RcptsNotify = no --SenderTemplate = /etc/drweb/templates/en-ru/sendmail/error-sender.msg --AdminTemplate = /etc/drweb/templates/en-ru/sendmail/error-admin.msg -+SenderTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-sender.msg -+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/error-admin.msg - RcptsTemplate = - - [RuleFilterNotifications] -@@ -350,7 +350,7 @@ - AdminNotify = yes - RcptsNotify = no - SenderTemplate = --AdminTemplate = /etc/drweb/templates/en-ru/sendmail/rule-admin.msg -+AdminTemplate = %PREFIX%/etc/drweb/templates/en-ru/sendmail/rule-admin.msg - RcptsTemplate = - - ################### -@@ -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 --MilterAddress = inet:3001@localhost -+MilterAddress = local:%PREFIX%/drweb/run/drweb-smf.sock - - # Timeout for drweb-smf to sendmail connection - # (Must be greater than any Timeout. parameter in sendmail.cf) diff -ruN security/drweb-sendmail.orig/pkg-plist security/drweb-sendmail/pkg-plist --- security/drweb-sendmail.orig/pkg-plist Thu Mar 25 01:14:56 2004 +++ security/drweb-sendmail/pkg-plist Fri Oct 8 19:40:33 2004 @@ -1,123 +1,153 @@ -@comment $FreeBSD: ports/security/drweb-sendmail/pkg-plist,v 1.15 2004/03/24 22:14:56 pav Exp $ -@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 +drweb-sendmail/drweb-agent +drweb-sendmail/drweb-smf +@unexec if [ -f %D/etc/drweb-sendmail/addresses.conf ] && cmp -s %D/etc/drweb-sendmail/addresses.conf %D/etc/drweb-sendmail/addresses.conf-dist; then rm -f %D/etc/drweb-sendmail/addresses.conf; fi +etc/drweb-sendmail/addresses.conf-dist @exec [ -f %B/addresses.conf ] || cp %B/%f %B/addresses.conf -@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 +@unexec if [ -f %D/etc/drweb-sendmail/drweb_agent.conf ] && cmp -s %D/etc/drweb-sendmail/drweb_agent.conf %D/etc/drweb-sendmail/drweb_agent.conf-dist; then rm -f %D/etc/drweb-sendmail/drweb_agent.conf; fi +etc/drweb-sendmail/drweb_agent.conf-dist +@exec [ -f %B/drweb_agent.conf ] || cp %B/%f %B/drweb_agent.conf +@unexec if [ -f %D/etc/drweb-sendmail/drweb_smf.conf ] && cmp -s %D/etc/drweb-sendmail/drweb_smf.conf %D/etc/drweb-sendmail/drweb_smf.conf-dist; then rm -f %D/etc/drweb-sendmail/drweb_smf.conf; fi +etc/drweb-sendmail/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-admin.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-admin.msg; fi +etc/drweb-sendmail/templates/en-pl/sendmail/archive-admin.msg-dist +@exec [ -f %B/archive-admin.msg ] || cp %B/%f %B/archive-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-sender.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/archive-sender.msg; fi +etc/drweb-sendmail/templates/en-pl/sendmail/archive-sender.msg-dist +@exec [ -f %B/archive-sender.msg ] || cp %B/%f %B/archive-sender.msg.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-admin.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-admin.msg; fi +etc/drweb-sendmail/templates/en-pl/sendmail/cured-admin.msg-dist +@exec [ -f %B/cured-admin.msg ] || cp %B/%f %B/cured-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-sender.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/cured-sender.msg; fi +etc/drweb-sendmail/templates/en-pl/sendmail/cured-sender.msg-dist +@exec [ -f %B/cured-sender.msg ] || cp %B/%f %B/cured-sender.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-admin.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-admin.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-sender.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/error-sender.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/rule-admin.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/rule-admin.msg; fi +etc/drweb-sendmail/templates/en-pl/sendmail/rule-admin.msg-dist +@exec [ -f %B/rule-admin.msg ] || cp %B/%f %B/rule-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/skip-sender.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/skip-sender.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-admin.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-admin.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-rcpts.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-rcpts.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-sender.msg %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-pl/sendmail/virus-sender.msg; fi +etc/drweb-sendmail/templates/en-pl/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 +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-admin.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-admin.msg; fi +etc/drweb-sendmail/templates/en-ru/sendmail/archive-admin.msg-dist +@exec [ -f %B/archive-admin.msg ] || cp %B/%f %B/archive-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-sender.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/archive-sender.msg; fi +etc/drweb-sendmail/templates/en-ru/sendmail/archive-sender.msg-dist +@exec [ -f %B/archive-sender.msg ] || cp %B/%f %B/archive-sender.msg.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-admin.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-admin.msg; fi +etc/drweb-sendmail/templates/en-ru/sendmail/cured-admin.msg-dist +@exec [ -f %B/cured-admin.msg ] || cp %B/%f %B/cured-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-sender.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/cured-sender.msg; fi +etc/drweb-sendmail/templates/en-ru/sendmail/cured-sender.msg-dist +@exec [ -f %B/cured-sender.msg ] || cp %B/%f %B/cured-sender.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-admin.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-admin.msg; fi +etc/drweb-sendmail/templates/en-ru/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-ru/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/rule-admin.msg; fi -etc/drweb/templates/en-ru/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-ru/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/error-sender.msg; fi -etc/drweb/templates/en-ru/sendmail/error-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-sender.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/error-sender.msg; fi +etc/drweb-sendmail/templates/en-ru/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-ru/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/archive-admin.msg %D/etc/drweb/templates/en-ru/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/archive-admin.msg; fi -etc/drweb/templates/en-ru/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-ru/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/archive-sender.msg %D/etc/drweb/templates/en-ru/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/archive-sender.msg; fi -etc/drweb/templates/en-ru/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-ru/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/skip-sender.msg; fi -etc/drweb/templates/en-ru/sendmail/skip-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/rule-admin.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/rule-admin.msg; fi +etc/drweb-sendmail/templates/en-ru/sendmail/rule-admin.msg-dist +@exec [ -f %B/rule-admin.msg ] || cp %B/%f %B/rule-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/skip-sender.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/skip-sender.msg; fi +etc/drweb-sendmail/templates/en-ru/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-ru/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-admin.msg; fi -etc/drweb/templates/en-ru/sendmail/virus-admin.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-admin.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-admin.msg; fi +etc/drweb-sendmail/templates/en-ru/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-ru/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg; fi -etc/drweb/templates/en-ru/sendmail/virus-rcpts.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-rcpts.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-rcpts.msg; fi +etc/drweb-sendmail/templates/en-ru/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-ru/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-ru/sendmail/virus-sender.msg; fi -etc/drweb/templates/en-ru/sendmail/virus-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-sender.msg %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en-ru/sendmail/virus-sender.msg; fi +etc/drweb-sendmail/templates/en-ru/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-pl/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/error-admin.msg; fi -etc/drweb/templates/en-pl/sendmail/error-admin.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/archive-admin.msg %D/etc/drweb-sendmail/templates/en/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/archive-admin.msg; fi +etc/drweb-sendmail/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-sendmail/templates/en/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/archive-sender.msg %D/etc/drweb-sendmail/templates/en/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/archive-sender.msg; fi +etc/drweb-sendmail/templates/en/sendmail/archive-sender.msg-dist +@exec [ -f %B/archive-sender.msg ] || cp %B/%f %B/archive-sender.msg.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/cured-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/cured-admin.msg %D/etc/drweb-sendmail/templates/en/sendmail/cured-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/cured-admin.msg; fi +etc/drweb-sendmail/templates/en/sendmail/cured-admin.msg-dist +@exec [ -f %B/cured-admin.msg ] || cp %B/%f %B/cured-admin.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/cured-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/cured-sender.msg %D/etc/drweb-sendmail/templates/en/sendmail/cured-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/cured-sender.msg; fi +etc/drweb-sendmail/templates/en/sendmail/cured-sender.msg-dist +@exec [ -f %B/cured-sender.msg ] || cp %B/%f %B/cured-sender.msg +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/error-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/error-admin.msg %D/etc/drweb-sendmail/templates/en/sendmail/error-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/error-admin.msg; fi +etc/drweb-sendmail/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-pl/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/rule-admin.msg; fi -etc/drweb/templates/en-pl/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-pl/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/error-sender.msg; fi -etc/drweb/templates/en-pl/sendmail/error-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/error-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/error-sender.msg %D/etc/drweb-sendmail/templates/en/sendmail/error-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/error-sender.msg; fi +etc/drweb-sendmail/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-pl/sendmail/archive-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/archive-admin.msg; fi -etc/drweb/templates/en-pl/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-pl/sendmail/archive-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/archive-sender.msg; fi -etc/drweb/templates/en-pl/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-pl/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/skip-sender.msg; fi -etc/drweb/templates/en-pl/sendmail/skip-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/rule-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/rule-admin.msg %D/etc/drweb-sendmail/templates/en/sendmail/rule-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/rule-admin.msg; fi +etc/drweb-sendmail/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-sendmail/templates/en/sendmail/skip-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/skip-sender.msg %D/etc/drweb-sendmail/templates/en/sendmail/skip-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/skip-sender.msg; fi +etc/drweb-sendmail/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-pl/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-admin.msg; fi -etc/drweb/templates/en-pl/sendmail/virus-admin.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-admin.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/virus-admin.msg %D/etc/drweb-sendmail/templates/en/sendmail/virus-admin.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-admin.msg; fi +etc/drweb-sendmail/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-pl/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg; fi -etc/drweb/templates/en-pl/sendmail/virus-rcpts.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-rcpts.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/virus-rcpts.msg %D/etc/drweb-sendmail/templates/en/sendmail/virus-rcpts.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-rcpts.msg; fi +etc/drweb-sendmail/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-pl/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb/templates/en-pl/sendmail/virus-sender.msg; fi -etc/drweb/templates/en-pl/sendmail/virus-sender.msg-dist +@unexec if [ -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-sender.msg ] && cmp -s %D/etc/drweb-sendmail/templates/en/sendmail/virus-sender.msg %D/etc/drweb-sendmail/templates/en/sendmail/virus-sender.msg-dist; then rm -f %D/etc/drweb-sendmail/templates/en/sendmail/virus-sender.msg; fi +etc/drweb-sendmail/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/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 +@unexec if [ -f %D/etc/drweb-sendmail/users.conf ] && cmp -s %D/etc/drweb-sendmail/users.conf %D/etc/drweb-sendmail/users.conf-dist; then rm -f %D/etc/drweb-sendmail/users.conf; fi +etc/drweb-sendmail/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 +@unexec if [ -f %D/etc/drweb-sendmail/viruses.conf ] && cmp -s %D/etc/drweb-sendmail/viruses.conf %D/etc/drweb-sendmail/viruses.conf-dist; then rm -f %D/etc/drweb-sendmail/viruses.conf; fi +etc/drweb-sendmail/viruses.conf-dist @exec [ -f %B/viruses.conf ] || cp %B/%f %B/viruses.conf -@unexec if [ -f %D/etc/rc.d/drweb-sendmail.sh ] && cmp -s %D/etc/rc.d/drweb-sendmail.sh %D/etc/rc.d/drweb-sendmail.sh-dist; then rm -f %D/etc/rc.d/drweb-sendmail.sh; fi -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 -share/doc/drweb-sendmail/conf_file.txt -share/doc/drweb-sendmail/notify.rus.txt -share/doc/drweb-sendmail/notify.txt -share/doc/drweb-sendmail/readme -share/doc/drweb-sendmail/readme.rus -share/doc/drweb-sendmail/sendmail.cf.addon -share/doc/drweb-sendmail/sendmail.mc.addon -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 -@dirrm etc/drweb +etc/rc.d/001.drweb-agent.sh-dist +etc/rc.d/01.drweb-smf.sh-dist +share/doc/drweb-sendmail/agent/agent_conf.rus.txt +share/doc/drweb-sendmail/agent/agent_conf.txt +share/doc/drweb-sendmail/agent/conf_file.rus.txt +share/doc/drweb-sendmail/agent/conf_file.txt +share/doc/drweb-sendmail/agent/readme +share/doc/drweb-sendmail/agent/readme.rus +share/doc/drweb-sendmail/sendmail/FAQ.rus.txt +share/doc/drweb-sendmail/sendmail/FAQ.txt +share/doc/drweb-sendmail/sendmail/addresses_list.rus.txt +share/doc/drweb-sendmail/sendmail/addresses_list.txt +share/doc/drweb-sendmail/sendmail/conf_file.rus.txt +share/doc/drweb-sendmail/sendmail/conf_file.txt +share/doc/drweb-sendmail/sendmail/notify.rus.txt +share/doc/drweb-sendmail/sendmail/notify.txt +share/doc/drweb-sendmail/sendmail/readme +share/doc/drweb-sendmail/sendmail/readme.rus +share/doc/drweb-sendmail/sendmail/users_list.rus.txt +share/doc/drweb-sendmail/sendmail/users_list.txt +share/doc/drweb-sendmail/sendmail/viruses_list.rus.txt +share/doc/drweb-sendmail/sendmail/viruses_list.txt +share/nls/POSIX +share/nls/en_US.US-ASCII +@dirrm share/doc/drweb-sendmail/sendmail +@dirrm share/doc/drweb-sendmail/agent @dirrm share/doc/drweb-sendmail +@dirrm etc/drweb-sendmail/templates/en-ru/sendmail +@dirrm etc/drweb-sendmail/templates/en-ru +@dirrm etc/drweb-sendmail/templates/en-pl/sendmail +@dirrm etc/drweb-sendmail/templates/en-pl +@dirrm etc/drweb-sendmail/templates/en/sendmail +@dirrm etc/drweb-sendmail/templates/en +@dirrm etc/drweb-sendmail/templates +@dirrm etc/drweb-sendmail +@dirrm drweb-sendmail/run +@dirrm drweb-sendmail Please update this port. -- =========================================== Spectrum, Moscow, 103009, Strastnoy blvr. 8 Demin Alexander - Network administrator http://www.spectrum.ru/ ===========================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041025121803.61c84f2e.support>