Fri Jul 27 17:46:01 2012 UTC ()
enable reload in rc.d scripts


(jnemeth)
diff -r1.109 -r1.110 pkgsrc/mail/sendmail/Makefile
diff -r1.1 -r1.2 pkgsrc/mail/sendmail/files/sendmail.sh
diff -r1.1 -r1.2 pkgsrc/mail/sendmail/files/smmsp.sh
cvs diff -r1.109 -r1.110 pkgsrc/mail/sendmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/Makefile 2010/03/12 13:19:49 1.109
+++ pkgsrc/mail/sendmail/Makefile 2012/07/27 17:46:01 1.110
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.109 2010/03/12 13:19:49 obache Exp $ 1# $NetBSD: Makefile,v 1.110 2012/07/27 17:46:01 jnemeth Exp $
2 2
3PKGNAME= sendmail-${DIST_VERS} 3PKGNAME= sendmail-${DIST_VERS}
4COMMENT= The well known Mail Transport Agent 4COMMENT= The well known Mail Transport Agent
 5PKGREVISION= 1
5 6
6CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* 7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
7CONFLICTS+= esmtp>=1.2 8CONFLICTS+= esmtp>=1.2
8 9
9PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
10 11
11.include "options.mk" 12.include "options.mk"
12.include "../../mail/sendmail/Makefile.common" 13.include "../../mail/sendmail/Makefile.common"
13 14
14USE_TOOLS+= pax 15USE_TOOLS+= pax
15 16
16MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC 17MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
17PLIST_SRC= ${WRKDIR}/.PLIST_SRC 18PLIST_SRC= ${WRKDIR}/.PLIST_SRC
cvs diff -r1.1 -r1.2 pkgsrc/mail/sendmail/files/sendmail.sh (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/files/sendmail.sh 2006/06/06 22:03:36 1.1
+++ pkgsrc/mail/sendmail/files/sendmail.sh 2012/07/27 17:46:01 1.2
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: sendmail.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $ 3# $NetBSD: sendmail.sh,v 1.2 2012/07/27 17:46:01 jnemeth Exp $
4# 4#
5 5
6# PROVIDE: mail 6# PROVIDE: mail
7# REQUIRE: LOGIN 7# REQUIRE: LOGIN
8# we make mail start late, so that things like .forward's are not 8# we make mail start late, so that things like .forward's are not
9# processed until the system is fully operational 9# processed until the system is fully operational
10 10
11 11
12. /etc/rc.subr 12. /etc/rc.subr
13 13
14name="sendmail" 14name="sendmail"
15rcvar=$name 15rcvar=$name
16command="/usr/sbin/${name}" 16command="/usr/sbin/${name}"
17pidfile="@VARBASE@/run/${name}.pid" 17pidfile="@VARBASE@/run/${name}.pid"
18required_files="/etc/mail/sendmail.cf" 18required_files="/etc/mail/sendmail.cf"
19start_precmd="sendmail_precmd" 19start_precmd="sendmail_precmd"
 20extra_commands="reload"
 21
20makemap="@PREFIX@/sbin/makemap" 22makemap="@PREFIX@/sbin/makemap"
21newaliases="@PREFIX@/bin/newaliases" 23newaliases="@PREFIX@/bin/newaliases"
22smbin="@PREFIX@/libexec/sendmail/sendmail" 24smbin="@PREFIX@/libexec/sendmail/sendmail"
23check_files="aliases access genericstable virtusertable domaintable mailertable" 25check_files="aliases access genericstable virtusertable domaintable mailertable"
24sendmail_flags="-Lsm-mta -bd -q30m" 26sendmail_flags="-Lsm-mta -bd -q30m"
25 27
26sendmail_precmd() 28sendmail_precmd()
27{ 29{
28 # check modifications on /etc/mail/ databases 30 # check modifications on /etc/mail/ databases
29 for f in ${check_files}; do 31 for f in ${check_files}; do
30 if [ -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then 32 if [ -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
31 if [ ! "/etc/mail/$f" -ot "/etc/mail/$f.db" ]; then 33 if [ ! "/etc/mail/$f" -ot "/etc/mail/$f.db" ]; then
32 echo \ 34 echo \
cvs diff -r1.1 -r1.2 pkgsrc/mail/sendmail/files/smmsp.sh (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/files/smmsp.sh 2006/06/06 22:03:36 1.1
+++ pkgsrc/mail/sendmail/files/smmsp.sh 2012/07/27 17:46:01 1.2
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: smmsp.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $ 3# $NetBSD: smmsp.sh,v 1.2 2012/07/27 17:46:01 jnemeth Exp $
4# 4#
5 5
6# REQUIRE: mail 6# REQUIRE: mail
7 7
8# The only function of the smmsp process is to push locally 8# The only function of the smmsp process is to push locally
9# collected mail (which got stuck in the local client queue) 9# collected mail (which got stuck in the local client queue)
10# to a more fully functional smtp relay. It is not a fully 10# to a more fully functional smtp relay. It is not a fully
11# functional smtp daemon. 11# functional smtp daemon.
12# 12#
13# It can, however, be used as a completely unprivileged 13# It can, however, be used as a completely unprivileged
14# replacement for hosts that were previously using a "null 14# replacement for hosts that were previously using a "null
15# client" configuration and a smart relay. 15# client" configuration and a smart relay.
16 16
17. /etc/rc.subr 17. /etc/rc.subr
18 18
19name="smmsp" 19name="smmsp"
20rcvar=$name 20rcvar=$name
21command="/usr/sbin/sendmail" 21command="/usr/sbin/sendmail"
22pidfile="@VARBASE@/spool/clientmqueue/sm-client.pid" 22pidfile="@VARBASE@/spool/clientmqueue/sm-client.pid"
23required_files="/etc/mail/submit.cf" 23required_files="/etc/mail/submit.cf"
 24extra_commands="reload"
 25
24smbin="@PREFIX@/libexec/sendmail/sendmail" 26smbin="@PREFIX@/libexec/sendmail/sendmail"
25smmsp_flags="-Lsm-msp-queue -Ac -q30m" 27smmsp_flags="-Lsm-msp-queue -Ac -q30m"
26 28
27load_rc_config $name 29load_rc_config $name
28run_rc_command "$1" 30run_rc_command "$1"