cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't check existence of mailer.conf.postfix before starting postfix.

Browse Source 
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.
This commit is contained in:
sthen 2011-07-17 20:14:56 +00:00
parent 10b8a0ea38
commit c0ad91f0c0
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/postfix/snapshot/Makefile
View File

@ -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 VERSION= 2.9-20110706
REVISION= 0 REVISION= 1
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}

2
mail/postfix/snapshot/pkg/MESSAGE
View File

@ -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 documentation at file:${PREFIX}/share/doc/postfix/html/index.html or
${HOMEPAGE} carefully before you decide to do this! ${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: using the following command:
${PREFIX}/sbin/postfix-enable ${PREFIX}/sbin/postfix-enable

6
mail/postfix/snapshot/pkg/postfix.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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" daemon="${TRUEPREFIX}/libexec/postfix/master"
@ -8,10 +8,6 @@ daemon="${TRUEPREFIX}/libexec/postfix/master"
pexp="${daemon}" pexp="${daemon}"
rc_pre() {
[ ! -f /etc/mailer.conf.postfix ]
}
rc_start() { rc_start() {
${TRUEPREFIX}/sbin/postfix ${daemon_flags} start ${TRUEPREFIX}/sbin/postfix ${daemon_flags} start
} }

4
mail/postfix/stable/Makefile
View File

@ -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 VERSION= 2.8.4
REVISION= 0 REVISION= 1
MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/} MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/}

2
mail/postfix/stable/pkg/MESSAGE
View File

@ -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 documentation at file:${PREFIX}/share/doc/postfix/html/index.html or
${HOMEPAGE} carefully before you decide to do this! ${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: using the following command:
${PREFIX}/sbin/postfix-enable ${PREFIX}/sbin/postfix-enable

6
mail/postfix/stable/pkg/postfix.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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" daemon="${TRUEPREFIX}/libexec/postfix/master"
@ -8,10 +8,6 @@ daemon="${TRUEPREFIX}/libexec/postfix/master"
pexp="${daemon}" pexp="${daemon}"
rc_pre() {
[ ! -f /etc/mailer.conf.postfix ]
}
rc_start() { rc_start() {
${TRUEPREFIX}/sbin/postfix ${daemon_flags} start ${TRUEPREFIX}/sbin/postfix ${daemon_flags} start
} }