[Midnightbsd-cvs] mports [24347] trunk/mail/courier/files: update patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 17 22:40:39 EDT 2018
Revision: 24347
http://svnweb.midnightbsd.org/mports/?rev=24347
Author: laffer1
Date: 2018-09-17 22:40:39 -0400 (Mon, 17 Sep 2018)
Log Message:
-----------
update patchset
Modified Paths:
--------------
trunk/mail/courier/files/courier.in
trunk/mail/courier/files/crontab.in
trunk/mail/courier/files/pkg-install.in
trunk/mail/courier/files/pkg-message.in
Modified: trunk/mail/courier/files/courier.in
===================================================================
--- trunk/mail/courier/files/courier.in 2018-09-18 02:39:36 UTC (rev 24346)
+++ trunk/mail/courier/files/courier.in 2018-09-18 02:40:39 UTC (rev 24347)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/mail/courier/files/courier.in 340872 2014-01-24 00:14:07Z mat $
#
# Adapted for FreeBSD from courier.sysvinit
#
Modified: trunk/mail/courier/files/crontab.in
===================================================================
--- trunk/mail/courier/files/crontab.in 2018-09-18 02:39:36 UTC (rev 24346)
+++ trunk/mail/courier/files/crontab.in 2018-09-18 02:40:39 UTC (rev 24347)
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: head/mail/courier/files/crontab.in 340872 2014-01-24 00:14:07Z mat $
#minute hour mday month wday command
25 * * * * %%PREFIX%%/share/courier/sqwebmail/cleancache.pl
Modified: trunk/mail/courier/files/pkg-install.in
===================================================================
--- trunk/mail/courier/files/pkg-install.in 2018-09-18 02:39:36 UTC (rev 24346)
+++ trunk/mail/courier/files/pkg-install.in 2018-09-18 02:40:39 UTC (rev 24347)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/mail/courier/files/pkg-install.in 360268 2014-07-02 21:52:11Z marino $
#
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
@@ -8,53 +8,10 @@
USER=%%MAILOWN%%; UID=%%MAILUID%%
GROUP=%%MAILGRP%%; GID=%%MAILGID%%
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ -z "${answer}" ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local question default answer
-
- question=$1
- default=$2
- while :; do
- answer=$(ask "${question}" "${default}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-replace() {
- local orig repl
-
- orig=$1
- repl=$2
- if [ -e ${orig} ]; then
- mv -f ${orig} ${orig}.OFF
- chmod 0 ${orig}.OFF
- fi
- if [ -e ${repl} ]; then
- ln -s ${repl} ${orig}
- fi
-}
-
if [ ":$2" = ":POST-INSTALL" ]; then
- if yesno "Would you like to activate Courier in /etc/mail/mailer.conf" n; then
+ if [ "%%MAILCONF%%" = "y" ]; then
mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
- echo "#" > /etc/mail/mailer.conf
+ echo "# created by courier's pkg-install" > /etc/mail/mailer.conf
echo -n "# Execute the Courier sendmail program" >> /etc/mail/mailer.conf
echo ", named ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf
echo "#" >> /etc/mail/mailer.conf
@@ -64,4 +21,8 @@
echo "newaliases ${PKG_PREFIX}/sbin/makealiases" >> /etc/mail/mailer.conf
echo "Done."
fi
+ if [ "%%RCCONF%%" = "y" ]; then
+ fi
+ if [ "%%PERIODIC%%" = "y" ]; then
+ fi
fi
Modified: trunk/mail/courier/files/pkg-message.in
===================================================================
--- trunk/mail/courier/files/pkg-message.in 2018-09-18 02:39:36 UTC (rev 24346)
+++ trunk/mail/courier/files/pkg-message.in 2018-09-18 02:40:39 UTC (rev 24347)
@@ -1,58 +1,60 @@
- RTFM before configuring and running Courier!!!
+ RTFM before configuring and running Courier!!!
- Check and/or modify the following configuration files to
- suit your needs:
+Check and/or modify the following configuration files to suit your needs:
- %%PREFIX%%/etc/courier/courierd
- %%PREFIX%%/etc/courier/esmtpd
- %%PREFIX%%/etc/courier/esmtpd-msa
- %%PREFIX%%/etc/courier/esmtpd-ssl
-%%WITHFAX%% %%PREFIX%%/etc/courier/faxcoverpage.tr
-%%WITHFAX%% %%PREFIX%%/etc/courier/faxnotifyrc
-%%WITHFAX%% %%PREFIX%%/etc/courier/faxrc
- %%PREFIX%%/etc/courier/imapd
- %%PREFIX%%/etc/courier/imapd-ssl
- %%PREFIX%%/etc/courier/ldapaddressbook
-%%WITHLDAP%% %%PREFIX%%/etc/courier/ldapaliasrc
- %%PREFIX%%/etc/courier/pop3d
- %%PREFIX%%/etc/courier/pop3d-ssl
+ %%PREFIX%%/etc/courier/courierd
+ %%PREFIX%%/etc/courier/esmtpd
+ %%PREFIX%%/etc/courier/esmtpd-msa
+ %%PREFIX%%/etc/courier/esmtpd-ssl
+%%WITHFAX%% %%PREFIX%%/etc/courier/faxcoverpage.tr
+%%WITHFAX%% %%PREFIX%%/etc/courier/faxnotifyrc
+%%WITHFAX%% %%PREFIX%%/etc/courier/faxrc
+ %%PREFIX%%/etc/courier/imapd
+ %%PREFIX%%/etc/courier/imapd-ssl
+ %%PREFIX%%/etc/courier/ldapaddressbook
+%%WITHLDAP%% %%PREFIX%%/etc/courier/ldapaliasrc
+ %%PREFIX%%/etc/courier/pop3d
+ %%PREFIX%%/etc/courier/pop3d-ssl
- Do not forget to update /etc/pam.d/ or /etc/pam.conf with
- the contents of %%PREFIX%%/etc/courier/*.authpam.
+Do not forget to update /etc/pam.d/ or /etc/pam.conf with the contents of
+%%PREFIX%%/etc/courier/*.authpam.
- To enable Courier-MTA to start at boot time,
- set these variables in your /etc/rc.conf file:
+To enable Courier-MTA to start at boot time, set these variables in your
+/etc/rc.conf file:
- courier_enable="YES"
- sendmail_enable="NONE"
+ courier_enable="YES"
+ sendmail_enable="NONE"
- Note: in newer OS versions you should change variables
- used in /etc/rc.conf file, as NONE for sendmail_enable
- is deprecated and will be not supported in future:
+Note: as in newer OS versions NONE for sendmail_enable is deprecated and
+will be not supported in future, use following instead:
- courier_enable="YES"
- sendmail_enable="NO"
- sendmail_submit_enable="NO"
- sendmail_outbound_enable="NO"
- sendmail_msp_queue_enable="NO"
+ courier_enable="YES"
+ sendmail_enable="NO"
+ sendmail_submit_enable="NO"
+ sendmail_outbound_enable="NO"
+ sendmail_msp_queue_enable="NO"
- Also, you will want to disable some Sendmail
- specific daily maintenance routines in your
- /etc/periodic.conf file:
+Usually editing /etc/mail/mailer.conf is necessary, too, so it contains
+following lines:
- daily_clean_hoststat_enable="NO"
- daily_status_mail_rejects_enable="NO"
- daily_status_include_submit_mailq="NO"
- daily_submit_queuerun="NO"
+ sendmail %%PREFIX%%/bin/sendmail
+ send-mail %%PREFIX%%/bin/sendmail
+ mailq %%PREFIX%%/bin/mailq
+ newaliases %%PREFIX%%/sbin/makealiases
- Documentation (if installed locally) is located in
- %%DOCSDIR%%/ otherwise see
- http://www.Courier-MTA.org/
+Also, you will want to disable some Sendmail specific daily maintenance
+routines in your /etc/periodic.conf file:
- If you are planning to serve shared maildirs, then
- you should create a cron job that runs at regular
- intervals (once every few hours is fine) that
- executes the following script to update the
- shared folder index:
+ daily_clean_hoststat_enable="NO"
+ daily_status_mail_rejects_enable="NO"
+ daily_status_include_submit_mailq="NO"
+ daily_submit_queuerun="NO"
- %%PREFIX%%/share/courier/sharedindexupdate
+Documentation (if installed locally) is located in %%DOCSDIR%%,
+otherwise see http://www.Courier-MTA.org/
+
+If you are planning to serve shared maildirs, then you should create a cron
+job that runs at regular intervals (once every few hours is fine) that
+executes the following script to update the shared folder index:
+
+ %%PREFIX%%/share/courier/sharedindexupdate
More information about the Midnightbsd-cvs
mailing list