Use native drweb-sendmail.sh script for both daemon & filter

3 files changed, 12 insertions, 35 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index ec9f6a22341a..1030fe022a36 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drweb_sendmail
 PORTVERSION=    4.26
-PORTREVISION=   2
+PORTREVISION=   3
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	drwebd-${PORTVERSION}-freebsd4
@@ -79,7 +79,6 @@ post-configure:
 		${ECHO} y; \
 	} | ./configure
 
-# Not fully used yet
 pre-install:
 	cd ${WRKSRC}/../sendmail && { \
 		${ECHO} y; \
@@ -115,10 +114,14 @@ 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!!#${WITH_DRWEBSMF_HOSTNAME}#g' \
-		< ${FILESDIR}/drweb-smf.sh >${WRKSRC}/drweb-smf.sh
-# drwebsmf.sh instead drweb-smf.sh to start after drwebd.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/drweb-smf.sh ${PREFIX}/etc/rc.d/drwebsmf.sh
+	cd ${WRKSRC}/../sendmail; \
+		${INSTALL_DATA} drweb-sendmail.sh \
+		${PREFIX}/etc/rc.d/drweb-sendmail.sh-dist
+	if [ ! -f ${PREFIX}/etc/rc.d/drweb-sendmail.sh ] ; then \
+		cd ${WRKSRC}/../sendmail; \
+			${INSTALL_SCRIPT} drweb-sendmail.sh \
+			${PREFIX}/etc/rc.d/; \
+	fi
 
 post-install:
 	@echo
diff --git a/security/drweb-sendmail/files/drweb-smf.sh b/security/drweb-sendmail/files/drweb-smf.sh
deleted file mode 100644
index 2d0acf98f61d..000000000000
--- a/security/drweb-sendmail/files/drweb-smf.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-drwebfilter='!!PREFIX!!/sbin/drweb-smf'
-
-case "$1" in
-start)
-	if [ -x $drwebfilter ] ; then
-	    echo -n ' drweb-smf'
-	    $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!!
-	fi
-	;;
-stop)
-	/usr/bin/killall drweb-smf
-	/bin/rm -f /var/run/drweb-smf.sock
-	echo -n ' drweb-smf'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/security/drweb-sendmail/pkg-plist b/security/drweb-sendmail/pkg-plist
index 924b5843361c..d93acb19b3c3 100644
--- a/security/drweb-sendmail/pkg-plist
+++ b/security/drweb-sendmail/pkg-plist
@@ -1,5 +1,7 @@
 drweb/drwebdc
-etc/rc.d/drwebsmf.sh
+@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
 share/doc/drweb-sendmail/readme.sendmail
 share/doc/drweb-sendmail/readme.sendmail.rus