ports/115667: update mail/qmail fix a few issues with files/rcNG

[Zane C.B.]

>Number:         115667
>Category:       ports
>Synopsis:       update mail/qmail    fix a few issues with files/rcNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 21 03:20:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Zane C.B.
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.2-STABLE #0: Tue Jun 19 20:24:30 EDT 2007
    root at vixen42.vulpes:/usr/obj/usr/src/sys/vixen42-2



>Description:


Found I slightly mucked up the rcNG script when created it awhile back. Patched it on my test system, but that was not the submitted.



>How-To-Repeat:


1: try to set it up using rcNG
2:
3: notice it won't accept mail regardless of what you do
4: apply patch and enjoy
5: monkeys?


>Fix:


--- mail_qmail_files_rcNG.diff begins here ---
--- files/rcNG.orig	Sat Jul 28 09:50:18 2007
+++ files/rcNG	Mon Aug 20 22:09:44 2007
@@ -47,12 +47,12 @@
 
 [ -z "$qmail_enable" ] && qmail_enable="NO"
 [ -z "$qmail_checkpw" ] && qmail_checkpw="/usr/local/bin/checkpassword"
-[ -z "$qmail_checkpwsuccess" ] && qmail_checkpw="/bin/true"
+[ -z "$qmail_checkpwsuccess" ] && qmail_checkpwsuccess="/usr/bin/true"
 [ -z "$qmail_server" ] && qmail_server="YES"
 [ -z "$qmail_server_ip" ] && qmail_server_ip="0"
 [ -z "$qmail_server_port" ] && qmail_server_port="smtp"
 [ -z "$qmail_defaultdelivery" ] && qmail_defaultdelivery="./Maildir"
-[ -z "$qmail_logger" ] && qmail_defaultdelivery="splogger qmail"
+[ -z "$qmail_logger" ] && qmail_logger="splogger qmail"
 [ -z "$qmail_server_logger" ] && qmail_server_logger="/var/qmail/bin/splogger smtpd"
 
 qmail_start(){
@@ -60,12 +60,11 @@
      qmail-start $qmail_defaultdelivery $qmail_server_logger &
 
     if checkyesno qmail_server; then
-	qmaildUID=`id qmaild | cut -d\  -f 1 | cut -d= -f 2 | cut -d\( -f 1`
 	qnofilesGID=`pw group show qnofiles | cut -d: -f 3`
 	
 	env - PATH="/var/qmail/bin:$PATH" /usr/local/bin/tcpserver $qmail_tcpserver_args -u \
-	    $qmaildUID -g $qnofilesGID $qmail_server_ip $qmail_server_port \
-	    /var/qmail/bin/qmail-smtpd $qmail_checkpw -- /bin/true 2>&1 | $qmail_server_logger &
+	    0 -g $qnofilesGID $qmail_server_ip $qmail_server_port \
+	    /var/qmail/bin/qmail-smtpd $qmail_checkpw $qmail_checkpwsuccess 2>&1 | $qmail_server_logger &
     fi
 
 }
--- mail_qmail_files_rcNG.diff ends here ---



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