From c0ad91f0c05d2bfb860436675d654b32d2536adf Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 17 Jul 2011 20:14:56 +0000 Subject: [PATCH] Don't check existence of mailer.conf.postfix before starting postfix. The mailer.conf* files aren't robustly controlled so we shouldn't prevent the daemon starting if they aren't how we expect. ok aja@, Brad. --- mail/postfix/snapshot/Makefile | 4 ++-- mail/postfix/snapshot/pkg/MESSAGE | 2 +- mail/postfix/snapshot/pkg/postfix.rc | 6 +----- mail/postfix/stable/Makefile | 4 ++-- mail/postfix/stable/pkg/MESSAGE | 2 +- mail/postfix/stable/pkg/postfix.rc | 6 +----- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index fbfdd75f74b..bb5e229682e 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.218 2011/07/15 18:10:18 robert Exp $ +# $OpenBSD: Makefile,v 1.219 2011/07/17 20:14:56 sthen Exp $ VERSION= 2.9-20110706 -REVISION= 0 +REVISION= 1 MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} diff --git a/mail/postfix/snapshot/pkg/MESSAGE b/mail/postfix/snapshot/pkg/MESSAGE index 20da1dd126a..917d91f7829 100644 --- a/mail/postfix/snapshot/pkg/MESSAGE +++ b/mail/postfix/snapshot/pkg/MESSAGE @@ -2,7 +2,7 @@ Postfix can be set up to replace sendmail entirely. Please read the documentation at file:${PREFIX}/share/doc/postfix/html/index.html or ${HOMEPAGE} carefully before you decide to do this! -To replace sendmail with postfix you have to install a new mailer.conf +To replace sendmail with Postfix you have to install a new mailer.conf using the following command: ${PREFIX}/sbin/postfix-enable diff --git a/mail/postfix/snapshot/pkg/postfix.rc b/mail/postfix/snapshot/pkg/postfix.rc index 88028888fc1..371d3ebe0f1 100755 --- a/mail/postfix/snapshot/pkg/postfix.rc +++ b/mail/postfix/snapshot/pkg/postfix.rc @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: postfix.rc,v 1.1 2011/07/15 18:10:18 robert Exp $ +# $OpenBSD: postfix.rc,v 1.2 2011/07/17 20:14:56 sthen Exp $ daemon="${TRUEPREFIX}/libexec/postfix/master" @@ -8,10 +8,6 @@ daemon="${TRUEPREFIX}/libexec/postfix/master" pexp="${daemon}" -rc_pre() { - [ ! -f /etc/mailer.conf.postfix ] -} - rc_start() { ${TRUEPREFIX}/sbin/postfix ${daemon_flags} start } diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile index c2108c6b5c8..5e37478408a 100644 --- a/mail/postfix/stable/Makefile +++ b/mail/postfix/stable/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.140 2011/07/15 18:10:18 robert Exp $ +# $OpenBSD: Makefile,v 1.141 2011/07/17 20:14:56 sthen Exp $ VERSION= 2.8.4 -REVISION= 0 +REVISION= 1 MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/} diff --git a/mail/postfix/stable/pkg/MESSAGE b/mail/postfix/stable/pkg/MESSAGE index 20da1dd126a..917d91f7829 100644 --- a/mail/postfix/stable/pkg/MESSAGE +++ b/mail/postfix/stable/pkg/MESSAGE @@ -2,7 +2,7 @@ Postfix can be set up to replace sendmail entirely. Please read the documentation at file:${PREFIX}/share/doc/postfix/html/index.html or ${HOMEPAGE} carefully before you decide to do this! -To replace sendmail with postfix you have to install a new mailer.conf +To replace sendmail with Postfix you have to install a new mailer.conf using the following command: ${PREFIX}/sbin/postfix-enable diff --git a/mail/postfix/stable/pkg/postfix.rc b/mail/postfix/stable/pkg/postfix.rc index 70d108bdf4e..371d3ebe0f1 100755 --- a/mail/postfix/stable/pkg/postfix.rc +++ b/mail/postfix/stable/pkg/postfix.rc @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: postfix.rc,v 1.1 2011/07/15 18:10:19 robert Exp $ +# $OpenBSD: postfix.rc,v 1.2 2011/07/17 20:14:56 sthen Exp $ daemon="${TRUEPREFIX}/libexec/postfix/master" @@ -8,10 +8,6 @@ daemon="${TRUEPREFIX}/libexec/postfix/master" pexp="${daemon}" -rc_pre() { - [ ! -f /etc/mailer.conf.postfix ] -} - rc_start() { ${TRUEPREFIX}/sbin/postfix ${daemon_flags} start }