Configuration tunings

6 files changed, 84 insertions, 8 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index 4754a1309dc0..f8803b90d780 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drweb_sendmail
 PORTVERSION=    4.26
+PORTREVISION=   1
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	drwebd-${PORTVERSION}-freebsd4
@@ -24,10 +25,13 @@ INST_PREFIX=	${PREFIX}/${PORTNAME}
 SENDMAIL_DIR=	/usr/src/contrib/sendmail
 LIBSMUTIL_DIR=  /usr/src/lib/libsmutil
 DOC_DIR=	${PREFIX}/share/doc/drweb-sendmail
+
+.if !defined(WITH_DRWEBSMF_HOSTNAME)
 .if defined(BATCH)
-HOSTNAME=       your.domain.name
+WITH_DRWEBSMF_HOSTNAME= your.domain.name
 .else
-HOSTNAME!=      hostname
+WITH_DRWEBSMF_HOSTNAME!=hostname
+.endif
 .endif
 
 .if exists( ${SENDMAIL_DIR}/include/libmilter/mfapi.h )
@@ -89,11 +93,11 @@ post-build:
 		${ECHO} /tmp; \
 		${ECHO} y; \
 		${ECHO} ; \
-		${ECHO} postmaster@${HOSTNAME}; \
+		${ECHO} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
 		${ECHO} y; \
 		${ECHO} y; \
 		${ECHO} d; \
-		${ECHO} a; \
+		${ECHO} t; \
 		${ECHO} t; \
 		${ECHO} t; \
 		${ECHO} a; \
@@ -111,10 +115,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/drwebdc ${PREFIX}/drweb/
 	cd ${WRKSRC}/../sendmail; \
 		${INSTALL_DATA} readme.* sendmail.*.addon ${DOC_DIR}
-	${SED} 's#!!PREFIX!!#${PREFIX}#g;s#!!HOSTNAME!!#${HOSTNAME}#g' \
+	${SED} 's#!!PREFIX!!#${PREFIX}#g;s#!!HOSTNAME!!#${WITH_DRWEBSMF_HOSTNAME}#g' \
 		< ${FILESDIR}/drweb-smf.sh >${WRKSRC}/drweb-smf.sh
 # drwebsmf.sh instead drweb-smf.sh to start after drwebd.sh
-	${INSTALL_DATA} ${WRKSRC}/drweb-smf.sh ${PREFIX}/etc/rc.d/drwebsmf.sh-dist
+	${INSTALL_SCRIPT} ${WRKSRC}/drweb-smf.sh ${PREFIX}/etc/rc.d/drwebsmf.sh
 
 post-install:
 	@echo
diff --git a/security/drweb-sendmail/files/drweb-smf.sh b/security/drweb-sendmail/files/drweb-smf.sh
index 3c3ac82f22d8..2d0acf98f61d 100644
--- a/security/drweb-sendmail/files/drweb-smf.sh
+++ b/security/drweb-sendmail/files/drweb-smf.sh
@@ -8,7 +8,7 @@ case "$1" in
 start)
 	if [ -x $drwebfilter ] ; then
 	    echo -n ' drweb-smf'
-	    $drwebfilter -u/var/run/drwebd -m/var/run/drweb-smf.sock \
+	    $drwebfilter -u/var/run/drwebd.sock -m/var/run/drweb-smf.sock \
 		-a!!PREFIX!!/drweb/infected.!!! -f/tmp -r -x -h -l \
 		-t 160000 -bt -yt -ka -jr -zd \
 		-gpostmaster -epostmaster@!!HOSTNAME!!
diff --git a/security/drweb-sendmail/files/patch-ac b/security/drweb-sendmail/files/patch-ac
new file mode 100644
index 000000000000..dadb24eba75b
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ac
@@ -0,0 +1,47 @@
+--- ../sendmail/configure.orig	Wed Sep 26 01:02:29 2001
++++ ../sendmail/configure	Wed Oct  3 11:27:50 2001
+@@ -22,6 +22,7 @@
+ ___T_MILTER_LOGLEVEL___="-- ERROR ---"
+ ___T_MILTER_TIMEOUT_1___="-- ERROR ---"
+ ___T_MILTER_TIMEOUT_2___="-- ERROR ---"
++___T_COMMENT_LCF___="-- ERROR --"
+ ___T_COMMENT_LOG___="-- ERROR --"
+ ___T_COMMENT_FFR___="-- ERROR --"
+ 
+@@ -106,7 +107,7 @@
+     POS=`$GREP SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
+     if [ $POS -eq 0 ] ; then
+         echo " but defined UNIX sockets"
+-        ___T_DAEMON_SOCKET___=`$GREP SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
++	___T_DAEMON_SOCKET___=`$GREP SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+         ___T_DAEMON_IP___=""
+         ___T_DAEMON_PORT___=""
+         ___T_DAEMON_PID___=""
+@@ -421,10 +422,12 @@
+ read INPUT
+ if [ "x$INPUT" = "x" -o "x$INPUT" = "xy" -o "x$INPUT" = "xY" ] ; then
+     MILTER_FFR="n"
++    ___T_COMMENT_LCF___=""
+     ___T_COMMENT_LOG___=""
+     ___T_COMMENT_FFR___="dnl "
+ else
+     MILTER_FFR="y"
++    ___T_COMMENT_LCF___="#"
+     ___T_COMMENT_LOG___="dnl "
+     ___T_COMMENT_FFR___=""
+ fi
+@@ -633,7 +636,7 @@
+     mv -f sendmail.cf.addon sendmail.cf.addon.bak
+ fi
+ $SED \
+-        -e "s&___COMMENT_LOG___&${___T_COMMENT_LOG___}&" \
++	-e "s&___COMMENT_LCF___&${___T_COMMENT_LCF___}&" \
+         -e "s&___MILTER_LOGLEVEL___&${___T_MILTER_LOGLEVEL___}&" \
+         -e "s&___MILTER_ADDRESS___&${___T_MILTER_ADDRESS___}&" \
+         -e "s&___MILTER_ACTION___&${___T_MILTER_ACTION___}&" \
+@@ -729,4 +732,5 @@
+ #echo "___T_MILTER_TIMEOUT_1___="${___T_MILTER_TIMEOUT_1___}
+ #echo "___T_MILTER_TIMEOUT_2___="${___T_MILTER_TIMEOUT_2___}
+ #echo "___T_COMMENT_LOG___="${___T_COMMENT_LOG___}
++#echo "___T_COMMENT_LCF___="${___T_COMMENT_LCF___}
+ #echo "___T_COMMENT_FFR___="${___T_COMMENT_FFR___}
diff --git a/security/drweb-sendmail/files/patch-ad b/security/drweb-sendmail/files/patch-ad
new file mode 100644
index 000000000000..83a6f0776882
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ad
@@ -0,0 +1,9 @@
+--- ../sendmail/template.mc.addon.bak	Wed Sep 26 01:02:29 2001
++++ ../sendmail/template.mc.addon	Wed Oct  3 11:17:54 2001
+@@ -1,5 +1,4 @@
+ ___COMMENT_FFR___define(`_FFR_MILTER',1)
+-MAIL_FILTER(`drweb-filter', `S=___MILTER_ADDRESS___
+-, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___')
++MAIL_FILTER(`drweb-filter', `S=___MILTER_ADDRESS___, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___')
+ define(`confINPUT_MAIL_FILTERS', `drweb-filter')
+ ___COMMENT_LOG___define(`confMILTER_LOG_LEVEL',`___MILTER_LOGLEVEL___')
diff --git a/security/drweb-sendmail/files/patch-ae b/security/drweb-sendmail/files/patch-ae
new file mode 100644
index 000000000000..b70ce7107155
--- /dev/null
+++ b/security/drweb-sendmail/files/patch-ae
@@ -0,0 +1,16 @@
+--- ../sendmail/template.cf.addon.bak	Wed Sep 26 01:02:29 2001
++++ ../sendmail/template.cf.addon	Wed Oct  3 11:17:54 2001
+@@ -2,11 +2,10 @@
+ # Input mail filters
+ ############################
+ O InputMailFilters=drweb-filter
+-___COMMENT_LOG___O Milter.LogLevel=___MILTER_LOGLEVEL___
++___COMMENT_LCF___O Milter.LogLevel=___MILTER_LOGLEVEL___
+ 
+ ############################
+ # The eXternal filters
+ ############################
+ 
+-Xdrweb-filter,  S=___MILTER_ADDRESS___
+-, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___
++Xdrweb-filter,  S=___MILTER_ADDRESS___, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___
diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist
index a9110537e4c0..924b5843361c 100644
--- a/security/drweb-sendmail/pkg-plist
+++ b/security/drweb-sendmail/pkg-plist
@@ -1,5 +1,5 @@
 drweb/drwebdc
-etc/rc.d/drwebsmf.sh-dist
+etc/rc.d/drwebsmf.sh
 sbin/drweb-smf
 share/doc/drweb-sendmail/readme.sendmail
 share/doc/drweb-sendmail/readme.sendmail.rus