Attachment 70873 Details for Bug 103344 – file.diff

[patch] file.diff

file.diff (text/plain), 2.50 KB, created by Yoshisato YANAGISAWA on 2006-09-18 07:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato YANAGISAWA

Created: 2006-09-18 07:50:20 UTC

Size: 2.50 KB

patch

obsolete

>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}
> }

Actions: View | Diff

Attachments on bug 103344: 70873