kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modify pkg-install to handle situations in which

Browse source 
/etc/mail/mailer.conf does not exist, e.g. when
FreeBSD is built WITHOUT_MAILWRAPPER.

This commit only affects legacy Postfix releases,
as the latest stable and development ports already
perform this check.

Requested by:	miwi
This commit is contained in:
Sahil Tandon 2012-02-11 21:27:57 +00:00
parent 33678047c6
commit 894bf93f40
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=290942
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/postfix25/pkg-install
View file

@ -10,6 +10,7 @@
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
MC=/etc/mail/mailer.conf
if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
DEFAULT_REPLACE_MAILERCONF=n
@ -152,7 +153,7 @@ replace() {
fi
}
if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
echo "#" > /etc/mail/mailer.conf

4
mail/postfix26/files/pkg-install.in
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.6 2011-07-30 01:34:51 sahil Exp $
# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@ -72,7 +72,7 @@ if [ "$2" = "POST-INSTALL" ]; then
upgrade-package
fi
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^send-mail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^mailq.*${PREFIX}/sbin/sendmail" ${MC} && \

4
mail/postfix27/files/pkg-install.in
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.6 2011-07-30 01:34:53 sahil Exp $
# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@ -72,7 +72,7 @@ if [ "$2" = "POST-INSTALL" ]; then
upgrade-package
fi
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^send-mail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^mailq.*${PREFIX}/sbin/sendmail" ${MC} && \

4
mail/postfix28/files/pkg-install.in
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.6 2012-02-07 01:41:44 sahil Exp $
# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@ -74,7 +74,7 @@ if [ "$2" = "POST-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^send-mail.*${PREFIX}/sbin/sendmail" ${MC} && \
egrep -q "^mailq.*${PREFIX}/sbin/sendmail" ${MC} && \