ports/100055: [PATCH] Fix rc.subr script in mail/sid-milter

[Xin LI]

>Number:         100055
>Category:       ports
>Synopsis:       [PATCH] Fix rc.subr script in mail/sid-milter
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 11 04:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 6.1-RELEASE-p2 i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.1-RELEASE-p2 FreeBSD 6.1-RELEASE-p2 #34: Thu Jun 15 02:13:19 CST 2006 delphij at tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386


>Description:
	It seems that specifing miltersid_socket does not work.
This can in turn cause postfix to be unable to work together with
the milter.  The attached patch is supposed to fix the problem.
>How-To-Repeat:
	Try to specify miltersid_socket.
>Fix:


--- patch-sid-milter begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/sid-milter/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	25 May 2006 15:31:25 -0000	1.10
+++ Makefile	11 Jul 2006 03:58:48 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	sid-milter
 PORTVERSION=	0.2.13
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sid-milter
Index: files/milter-sid.sh.in
===================================================================
RCS file: /home/ncvs/ports/mail/sid-milter/files/milter-sid.sh.in,v
retrieving revision 1.2
diff -u -r1.2 milter-sid.sh.in
--- files/milter-sid.sh.in	11 Jul 2006 03:10:39 -0000	1.2
+++ files/milter-sid.sh.in	11 Jul 2006 03:57:54 -0000
@@ -13,24 +13,25 @@
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/miltersid
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-miltersid_enable=${miltersid_enable:-"NO"}
-miltersid_socket=${miltersid_socket:-"local:/var/run/sid-filter"}
-miltersid_pid=${miltersid_pid:-"/var/run/sid-filter.pid"}
-miltersid_flags=${miltersid_flags:-"-r 0 -t"}
 
 . %%RC_SUBR%%
 
 name="miltersid"
-pidfile=${miltersid_pid}
 rcvar=`set_rcvar`
+load_rc_config $name
+
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+: ${miltersid_enable="NO"}
+: ${miltersid_socket="local:/var/run/sid-filter"}
+: ${miltersid_pid="/var/run/sid-filter.pid"}
+: ${miltersid_flags="-r 0 -t"}
+
+pidfile=${miltersid_pid}
 command="%%PREFIX%%/libexec/sid-filter"
 command_args="-l -p ${miltersid_socket} -P ${miltersid_pid}"
 stop_postcmd="sid_postcmd"
 
-load_rc_config $name
-
 sid_postcmd ()
 {
     if [ -S ${miltersid_socket##local:} ] ; then
--- patch-sid-milter ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: