ports/103344: maintainer update of ports mail/dkfilter to fix problems.

[Yoshisato YANAGISAWA]

>Number:         103344
>Category:       ports
>Synopsis:       maintainer update of ports mail/dkfilter to fix problems.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 18 06:50:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yoshisato YANAGISAWA
>Release:        FreeBSD 6.1-RELEASE-p5 i386
>Organization:
Tokyo Institute of Technology.
>Environment:
System: FreeBSD frodo.csg.is.titech.ac.jp 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #91: Wed Aug 30 18:11:53 JST 2006 yanagisawa at frodo.csg.is.titech.ac.jp:/usr/obj/usr/src/sys/FRODO i386


	
>Description:
	+ Rc.d scripts have race condition to stop executing at start-up time.
	  This also stops FreeBSD start up.
	  See Also: http://docs.freebsd.org/cgi/getmsg.cgi?fetch=0+0+current/freebsd-ports

	+ There are potential DoS attacks by dkfilter_{in,out} program.
	  They can change their pid file to illegally stop any program
	  when an administrator try to stop them by rc.d script.

	+ Some portlint problems are fixed.

>How-To-Repeat:
	n/a
>Fix:
	Apply following patch:

diff -ruN dkfilter.bak/Makefile dkfilter/Makefile
--- dkfilter.bak/Makefile	Sun Sep 17 19:13:45 2006
+++ dkfilter/Makefile	Mon Sep 18 14:52:22 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	dkfilter
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://jason.long.name/dkfilter/
 
@@ -30,11 +30,11 @@
 DKFILTER_GROUPNAME?=	${DKFILTER_USERNAME}
 DKFILTER_GROUPID?=	${DKFILTER_USERID}
 
-SUB_FILES=      pkg-install pkg-deinstall
-SUB_LIST=       USER=${DKFILTER_USERNAME} \
-                UID=${DKFILTER_USERID} \
-                GROUP=${DKFILTER_GROUPNAME} \
-                GID=${DKFILTER_GROUPID}
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST=	USER=${DKFILTER_USERNAME} \
+		UID=${DKFILTER_USERID} \
+		GROUP=${DKFILTER_GROUPNAME} \
+		GID=${DKFILTER_GROUPID}
 
 .include <bsd.port.pre.mk>
 
diff -ruN dkfilter.bak/files/dkfilter_in.in dkfilter/files/dkfilter_in.in
--- dkfilter.bak/files/dkfilter_in.in	Sun Sep 17 19:13:45 2006
+++ dkfilter/files/dkfilter_in.in	Mon Sep 18 15:22:52 2006
@@ -42,13 +42,24 @@
 	su -m ${dkfilter_in_user} -c "daemon -p ${dkfilter_in_pidfile} \
 		%%PREFIX%%/bin/dkfilter.in ${dkfilter_in_flags}" \
 		> /dev/null 2> ${tmpfile}
-	sleep 1 # XXX: wait until dkfilter start.
+	# wait until dkfilter start.
+	while true
+	do
+		filesize=`ls -l $tmpfile|awk '{print $5}'`
+		if [ ${filesize} -gt 0 ]; then
+			break
+		fi
+	done
+
 	logger -t ${name} `cat ${tmpfile}`
 	err=`grep Error ${tmpfile}`
 	if [ "${err}" ]; then
 		echo "Failed to start ${name}."
 		echo "${err}"
 		rm -f ${dkfilter_in_pidfile}
+	else
+		# To prevent DoS attack by dkfilter_in_user.
+		chown root:wheel ${dkfilter_in_pidfile}
 	fi
 	rm -f ${tmpfile}
 }
diff -ruN dkfilter.bak/files/dkfilter_out.in dkfilter/files/dkfilter_out.in
--- dkfilter.bak/files/dkfilter_out.in	Sun Sep 17 19:13:45 2006
+++ dkfilter/files/dkfilter_out.in	Mon Sep 18 15:23:24 2006
@@ -48,13 +48,24 @@
 	su -m ${dkfilter_out_user} -c "daemon -p ${dkfilter_out_pidfile} \
 		%%PREFIX%%/bin/dkfilter.out ${dkfilter_out_flags}" \
 		> /dev/null 2> ${tmpfile}
-	sleep 1	# XXX: wait until dkfilter start.
+	# wait until dkfilter start.
+	while true
+	do
+		filesize=`ls -l $tmpfile|awk '{print $5}'`
+		if [ ${filesize} -gt 0 ]; then
+			break
+		fi
+	done
+
 	logger -t ${name} `cat ${tmpfile}`
 	err=`grep Error ${tmpfile}`
 	if [ "${err}" ]; then
 		echo "Failed to start ${name}."
 		echo "${err}"
 		rm -f ${dkfilter_out_pidfile}
+	else
+		# To prevent DoS attack by dkfilter_out_user.
+		chown root:wheel ${dkfilter_out_pidfile}
 	fi
 	rm -f ${tmpfile}
 }
>Release-Note:
>Audit-Trail:
>Unformatted: