[pkgsrc/trunk]: pkgsrc/mail Modify the Courier services rc.d scripts so that:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail Modify the Courier services rc.d scripts so that:
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:38:14 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/601b7d95272b
branches:  trunk
changeset: 514748:601b7d95272b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jun 17 19:26:48 2006 +0000

description:
Modify the Courier services rc.d scripts so that:

   (1) they are more likely to do the right thing if the user sets
       rc_fast_and_loose; and

   (2) they pre-create any necessary directories prior to start the
       respective services.

Also, fix the path to the courierwebadmin binary in SPECIAL_PERMS for the
courier-mta package.

Bump the PKGREVISION.

diffstat:

 mail/courier-imap/Makefile                  |   4 +-
 mail/courier-imap/files/courierimap.sh      |   8 ++--
 mail/courier-imap/files/courierimaps.sh     |   8 ++--
 mail/courier-imap/files/courierpop.sh       |   8 ++--
 mail/courier-imap/files/courierpops.sh      |   8 ++--
 mail/courier-mta/Makefile                   |   4 +-
 mail/courier-mta/files/courierd.sh          |  47 +++++++++++++++++++++++++---
 mail/courier-mta/files/courieresmtp.sh      |   8 ++--
 mail/courier-mta/files/courieresmtpmsa.sh   |   8 ++--
 mail/courier-mta/files/courieresmtps.sh     |   8 ++--
 mail/courier-mta/files/courierfilter.sh     |  30 +++++++++++++++---
 mail/courier-mta/files/courierldapaliasd.sh |  26 ++++++++++++---
 mail/courier-mta/pkginstall.mk              |   5 +-
 mail/sqwebmail/Makefile                     |   6 +++-
 mail/sqwebmail/files/sqwebmail.sh           |  32 +++++++++++++++++--
 15 files changed, 156 insertions(+), 54 deletions(-)

diffs (truncated from 446 to 300 lines):

diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-imap/Makefile        Sat Jun 17 19:26:48 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/06/14 17:01:08 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/06/17 19:26:48 jlam Exp $
 
 DISTNAME=      courier-imap-4.1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-imap/files/courierimap.sh
--- a/mail/courier-imap/files/courierimap.sh    Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-imap/files/courierimap.sh    Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.12 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier IMAP services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierimap_doit start"
+stop_cmd="courierimap_doit stop"
 
-courier_doit()
+courierimap_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-imap/files/courierimaps.sh
--- a/mail/courier-imap/files/courierimaps.sh   Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-imap/files/courierimaps.sh   Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.14 2006/06/09 16:35:04 reed Exp $
+# $NetBSD: courierimaps.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierimaps_doit start"
+stop_cmd="courierimaps_doit stop"
 
-courier_doit()
+courierimaps_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-imap/files/courierpop.sh
--- a/mail/courier-imap/files/courierpop.sh     Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-imap/files/courierpop.sh     Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.12 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier POP3 services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierpop_doit start"
+stop_cmd="courierpop_doit stop"
 
-courier_doit()
+courierpop_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-imap/files/courierpops.sh
--- a/mail/courier-imap/files/courierpops.sh    Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-imap/files/courierpops.sh    Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.14 2006/06/09 16:35:04 reed Exp $
+# $NetBSD: courierpops.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierpops_doit start"
+stop_cmd="courierpops_doit stop"
 
-courier_doit()
+courierpops_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/Makefile Sat Jun 17 19:26:48 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/06/14 17:01:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/17 19:26:48 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/files/courierd.sh
--- a/mail/courier-mta/files/courierd.sh        Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/files/courierd.sh        Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierd.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courierd.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier core processes 
 #
@@ -15,11 +15,48 @@
 command="@PREFIX@/sbin/${name}"
 ctl_command="@PREFIX@/sbin/courier"
 
-restart_cmd="courier_doit restart"
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+restart_cmd="courierd_doit restart"
+start_precmd="courierd_prestart"
+start_cmd="courierd_doit start"
+stop_cmd="courierd_doit stop"
+
+mkdir_perms() {
+       dir="$1"; owner="$2"; group="$3"; mode="$4"
+       @TEST@ -d $dir || @MKDIR@ $dir
+       @CHOWN@ $user $dir
+       @CHGRP@ $group $dir
+       @CHMOD@ $mode $dir
+}
 
-courier_doit()
+courierd_prestart() {
+       # Courier mail submission directories
+       mkdir_perms @COURIER_STATEDIR@/msgq \
+                       @COURIER_USER@ @COURIER_GROUP@ 0750
+       mkdir_perms @COURIER_STATEDIR@/msgs \
+                       @COURIER_USER@ @COURIER_GROUP@ 0750
+       mkdir_perms @COURIER_STATEDIR@/tmp\
+                       @COURIER_USER@ @COURIER_GROUP@ 0770
+       mkdir_perms @COURIER_STATEDIR@/track \
+                       @COURIER_USER@ @COURIER_GROUP@ 0755
+
+       # Courier webadmin directories
+       mkdir_perms @COURIER_STATEDIR@/webadmin \
+                       @COURIER_USER@ @COURIER_GROUP@ 0700
+       mkdir_perms @COURIER_STATEDIR@/webadmin/added \
+                       @COURIER_USER@ @COURIER_GROUP@ 0700
+       mkdir_perms @COURIER_STATEDIR@/webadmin/removed \
+                       @COURIER_USER@ @COURIER_GROUP@ 0700
+
+       # Courier delivery configuration directories
+       mkdir_perms @PKG_SYSCONFDIR@/aliasdir \
+                       @COURIER_USER@ @COURIER_GROUP@ 0755
+       mkdir_perms @PKG_SYSCONFDIR@/aliases \
+                       @COURIER_USER@ @COURIER_GROUP@ 0750
+       mkdir_perms @PKG_SYSCONFDIR@/smtpaccess \
+                       @COURIER_USER@ @COURIER_GROUP@ 0755
+}
+
+courierd_doit()
 {
        action=$1
 
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/files/courieresmtp.sh
--- a/mail/courier-mta/files/courieresmtp.sh    Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/files/courieresmtp.sh    Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtp.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courieresmtp.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier ESMTP services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/esmtp.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courieresmtp_doit start"
+stop_cmd="courieresmtp_doit stop"
 
-courier_doit()
+courieresmtp_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/files/courieresmtpmsa.sh
--- a/mail/courier-mta/files/courieresmtpmsa.sh Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/files/courieresmtpmsa.sh Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtpmsa.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courieresmtpmsa.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier ESMTP-MSA (RFC 2476) services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/esmtpd-msa.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-msa"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courieresmtpmsa_doit start"
+stop_cmd="courieresmtpmsa_doit stop"
 
-courier_doit()
+courieresmtpmsa_doit()
 {
        action=$1
        case ${action} in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/files/courieresmtps.sh
--- a/mail/courier-mta/files/courieresmtps.sh   Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/files/courieresmtps.sh   Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courieresmtps.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courieresmtps.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier ESMTP/SSL services daemon
 #
@@ -17,10 +17,10 @@
 pidfile="@VARBASE@/run/esmtpd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/esmtpd @PKG_SYSCONFDIR@/esmtpd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courieresmtps_doit start"
+stop_cmd="courieresmtps_doit stop"
 
-courier_doit()
+courieresmtps_doit()
 {
        action=$1
        case $action in
diff -r 84ab49bc9ccf -r 601b7d95272b mail/courier-mta/files/courierfilter.sh
--- a/mail/courier-mta/files/courierfilter.sh   Sat Jun 17 19:26:11 2006 +0000
+++ b/mail/courier-mta/files/courierfilter.sh   Sat Jun 17 19:26:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierfilter.sh,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: courierfilter.sh,v 1.2 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier mail filter daemon
 #
@@ -15,12 +15,32 @@
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
 
-restart_cmd="courier_doit restart"
+restart_cmd="courierfilter_doit restart"
 start_precmd="courierfilter_prestart"
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierfilter_doit start"
+stop_cmd="courierfilter_doit stop"
+
+mkdir_perms() {
+       dir="$1"; owner="$2"; group="$3"; mode="$4"
+       @TEST@ -d $dir || @MKDIR@ $dir
+       @CHOWN@ $user $dir
+       @CHGRP@ $group $dir
+       @CHMOD@ $mode $dir
+}
 
-courier_doit()
+courierfilter_prestart() {
+       # Courier filter directories
+       mkdir_perms @COURIER_STATEDIR@/allfilters \
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed the adjustment of the dir...
Next by Date: [pkgsrc/trunk]: pkgsrc/fonts/ttf2pk Update ttf2pk to 1.5 to sync with freetyp...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed the adjustment of the dir...
Next by Thread: [pkgsrc/trunk]: pkgsrc/fonts/ttf2pk Update ttf2pk to 1.5 to sync with freetyp...
Indexes:
Home | Main Index | Thread Index | Old Index