From SRS0=SchTcZ=IM=vvelox.net=v.velox@yourhostingaccount.com  Thu Mar  8 23:33:26 2007
Return-Path: <SRS0=SchTcZ=IM=vvelox.net=v.velox@yourhostingaccount.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D1FE016A401
	for <freebsd-gnats-submit@freebsd.org>; Thu,  8 Mar 2007 23:33:26 +0000 (UTC)
	(envelope-from SRS0=SchTcZ=IM=vvelox.net=v.velox@yourhostingaccount.com)
Received: from mailout15.yourhostingaccount.com (mailout15.yourhostingaccount.com [65.254.253.120])
	by mx1.freebsd.org (Postfix) with ESMTP id 962C913C481
	for <freebsd-gnats-submit@freebsd.org>; Thu,  8 Mar 2007 23:33:26 +0000 (UTC)
	(envelope-from SRS0=SchTcZ=IM=vvelox.net=v.velox@yourhostingaccount.com)
Received: from mailscan37.yourhostingaccount.com ([10.1.15.37] helo=mailscan37.yourhostingaccount.com)
	by mailout15.yourhostingaccount.com with esmtp (Exim)
	id 1HPRiL-0004CY-Nv
	for FreeBSD-gnats-submit@freebsd.org; Thu, 08 Mar 2007 18:08:01 -0500
Received: from authsmtp11.yourhostingaccount.com ([10.1.18.11] ident=exim)
	by mailscan37.yourhostingaccount.com with spamscanlookuphost (Exim)
	id 1HPRiL-0008Kf-My
	for FreeBSD-gnats-submit@freebsd.org; Thu, 08 Mar 2007 18:08:01 -0500
Received: from authsmtp11.yourhostingaccount.com ([10.1.18.11] helo=authsmtp11.yourhostingaccount.com)
	by mailscan37.yourhostingaccount.com with esmtp (Exim)
	id 1HPRiL-0008KZ-0H
	for FreeBSD-gnats-submit@freebsd.org; Thu, 08 Mar 2007 18:08:01 -0500
Received: from cpe-71-72-98-197.columbus.res.rr.com ([71.72.98.197] helo=vixen42.vulpes)
	by authsmtp11.yourhostingaccount.com with esmtpa (Exim)
	id 1HPRiK-0006qg-Jl
	for FreeBSD-gnats-submit@freebsd.org; Thu, 08 Mar 2007 18:08:00 -0500
Message-Id: <1173395289.12978@vixen42.vulpes>
Date: Thu, 8 Mar 2007 18:08:09 -0500
From: "kitsune " <v.velox@vvelox.net>
Sender: "kitsune " <v.velox@vvelox.net>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: Update port: mail/qmail add a boot script with rcNG support
X-Send-Pr-Version: gtk-send-pr 0.4.8 
X-GNATS-Notify:

>Number:         110109
>Category:       ports
>Synopsis:       Update port: mail/qmail add a boot script with rcNG support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 08 23:40:02 GMT 2007
>Closed-Date:    Sat Jul 28 13:50:36 GMT 2007
>Last-Modified:  Sat Jul 28 14:00:02 GMT 2007
>Originator:     kitsune
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.2-STABLE #2: Wed Mar  7 19:30:14 EST 2007
    root@vixen42.vulpes:/usr/obj/usr/src/sys/vixen42-2



>Description:


Currently none of the files install in /var/qmail/boot provide rcNG support. This one adds on to it that does.


>How-To-Repeat:


1: install a non-ldap qmail
2:
2: copy /var/qmail/boot/rcNG to /var/qmail/rc
3: less /var/qmail/rc to look at aviable rc.conf variables
4: configure rc.conf
5: enjoy


>Fix:


--- mail-qmail.diff begins here ---
diff -ruN qmail.bak/Makefile qmail/Makefile
--- qmail.bak/Makefile	Thu Mar  8 17:08:00 2007
+++ qmail/Makefile	Thu Mar  8 17:50:01 2007
@@ -690,6 +690,11 @@
 . if defined(SLAVE_SPAMCONTROL) && defined(WITH_SMTPEXTFORK)
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/README.smtpextfork ${DOCSDIR}
 . endif
+. if !defined(SLAVE_LDAP)
+	@${CP} -v ${PORTSDIR}/mail/qmail/files/rcNG ${PREFIX}/boot/rcNG
+	@${CHOWN} -v root:wheel ${PREFIX}/boot/rcNG
+	@${CHMOD} -v +x ${PREFIX}/boot/rcNG
+. endif
 . if defined(PACKAGE_BUILDING)
 	@${ECHO_CMD} "FreeBSD Binary package qmail installation" \
 		> ${DOCSDIR}/SYSDEPS
diff -ruN qmail.bak/files/rcNG qmail/files/rcNG
--- qmail.bak/files/rcNG	Wed Dec 31 19:00:00 1969
+++ qmail/files/rcNG	Thu Mar  8 18:02:56 2007
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# PROVIDE: qmail mail
+# REQUIRE: netif
+# BEFORE: LOGIN
+#
+#writen by Zane C. Bowers <vvelox@vvelox.net>
+
+. /etc/rc.subr
+
+name="qmail"
+rcvars=`set_rcvar`
+start_cmd="qmail_start"
+stop_cmd="qmail_stop"
+
+load_rc_config $name
+
+
+#
+# Add the following lines to /etc/rc.conf to enable qmail:
+# qmail_enable (bool):		Turn on QMail.
+#				Default: NO
+#
+# qmail_checkpw (str):		Tell QMail what chekpassword program to use.
+#				Default: /usr/local/bin/checkpassword
+#
+# qmail_checkpwsuccess (str):	Tell the server what to run if checkpassword works.
+#				Default: /bin/true
+#
+# qmail_server (bool):		Wether the SMTP server should be started.
+#				Default: YES
+#
+# qmail_server_ip (str):	The IP to listen on. 0 means all.
+#				Default: 0
+#
+# qmail_server_port (str):	The port to listen on. May be numeric or from /etc/services
+#				Default: smtp
+#
+# qmail_tcpserver_args (str):	Extra args to be passed to tcpserver.
+#
+# qmail_defaultdelivery (str):	Default delivery path.
+#				Default: ./Maildir
+# qmail_logger (str):		The logger to use.
+# 				Default: splogger qmail
+# qmail_server_logger (str):	The logger to use for the SMTP server.
+#				Default: /var/qmail/bin/splogger smtpd
+
+[ -z "$qmail_enable" ] && qmail_enable="NO"
+[ -z "$qmail_checkpw" ] && qmail_checkpw="/usr/local/bin/checkpassword"
+[ -z "$qmail_checkpwsuccess" ] && qmail_checkpw="/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_server_logger" ] && qmail_server_logger="/var/qmail/bin/splogger smtpd"
+
+qmail_start(){
+    env - PATH="/var/qmail/bin:$PATH" \
+     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 &
+    fi
+
+}
+
+qmail_stop(){
+    killall -9 qmail-send > /dev/null
+    
+    #tcpserverPID=`ps aux | grep tcpserver | grep ^qmaild | cut -d\  -f 4`
+    tcpserverPID=`ps -aw -o pid,user,command | grep tcpserver | grep qmail-smtpd | sed 's/^ *//' | cut -f 1 -d\ `
+    [ $tcpserverPID ] && kill -9 $tcpserverPID
+    #kill -9 $tcpserverPID
+}
+
+
+run_rc_command "$1"
diff -ruN qmail.bak/pkg-plist qmail/pkg-plist
--- qmail.bak/pkg-plist	Thu Mar  8 17:08:00 2007
+++ qmail/pkg-plist	Thu Mar  8 17:34:04 2007
@@ -66,6 +66,7 @@
 bin/sendmail
 bin/splogger
 bin/tcp-env
+%%NOT_LDAP%%boot/rcNG
 %%NOT_LDAP%%boot/binm1
 %%NOT_LDAP%%boot/binm1+df
 %%NOT_LDAP%%boot/binm2
--- mail-qmail.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 8 23:40:13 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110109 
State-Changed-From-To: open->analyzed 
State-Changed-By: garga 
State-Changed-When: Fri Apr 13 14:07:47 UTC 2007 
State-Changed-Why:  
I'm a bit busy right now to make all necessary tests, sorry. I'll do it 
ASAP. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110109 
State-Changed-From-To: analyzed->closed 
State-Changed-By: garga 
State-Changed-When: Sat Jul 28 13:50:34 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110109 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110109: commit references a PR
Date: Sat, 28 Jul 2007 13:50:24 +0000 (UTC)

 garga       2007-07-28 13:50:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/qmail           Makefile pkg-plist 
   Added files:
     mail/qmail/files     rcNG 
   Log:
   - Add a rcNG startup script to ${PREFIX}/boot
   
   PR:             ports/110109
   Submitted by:   kitsune <v.velox@vvelox.net>
   
   Revision  Changes    Path
   1.122     +3 -0      ports/mail/qmail/Makefile
   1.1       +83 -0     ports/mail/qmail/files/rcNG (new)
   1.15      +2 -1      ports/mail/qmail/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
