diff options
author | ache <ache@FreeBSD.org> | 2006-11-08 11:01:06 +0800 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2006-11-08 11:01:06 +0800 |
commit | 34b60214bf02cc4af23e8aec4f456d3ac8a58d7a (patch) | |
tree | 573a73d874df75864c6a2634abed74a00c89b5a5 /mail | |
parent | b3beb928b4139340d5e7a74823701585eb406485 (diff) | |
download | freebsd-ports-gnome-34b60214bf02cc4af23e8aec4f456d3ac8a58d7a.tar.gz freebsd-ports-gnome-34b60214bf02cc4af23e8aec4f456d3ac8a58d7a.tar.zst freebsd-ports-gnome-34b60214bf02cc4af23e8aec4f456d3ac8a58d7a.zip |
the boot script evaluated milterbogom_flags before reading the configuration
from rc.conf, so if you changed things like milterbogom_user it will not take
the changes.
This was noticed by Andrey Chernov and he also sent the patch to fix it.
PR: 105262
Submitted by: Victor Balada Diaz <victor@bsdes.net> (maintainer)
Diffstat (limited to 'mail')
-rw-r--r-- | mail/milter-bogom/Makefile | 1 | ||||
-rw-r--r-- | mail/milter-bogom/files/milter-bogom.sh.in | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile index 16e7dc3c4d86..b7869c82eb3d 100644 --- a/mail/milter-bogom/Makefile +++ b/mail/milter-bogom/Makefile @@ -7,6 +7,7 @@ PORTNAME= milter-bogom PORTVERSION= 1.9 +PORTREVISION 1 CATEGORIES= mail MASTER_SITES= http://www.usebox.net/jjm/bogom/ \ http://blackshell.usebox.net/bogom/ diff --git a/mail/milter-bogom/files/milter-bogom.sh.in b/mail/milter-bogom/files/milter-bogom.sh.in index 0688a91e879d..992801ecca8a 100644 --- a/mail/milter-bogom/files/milter-bogom.sh.in +++ b/mail/milter-bogom/files/milter-bogom.sh.in @@ -5,18 +5,9 @@ # BEFORE: sendmail # KEYWORD: milterbogom -milterbogom_enable=${milterbogom_enable-"NO"} -milterbogom_socket=${milterbogom_socket-"unix:/var/run/bogom/milter.sock"} -milterbogom_user=${milterbogom_user-"bogomilter"} -milterbogom_pid=${milterbogom_pid-"/var/run/bogom/bogom.pid"} -milterbogom_flags=${milterbogom_flags-"-u ${milterbogom_user} \ --s ${milterbogom_socket} -p ${milterbogom_pid}"} - - . %%RC_SUBR%% name=milterbogom -pidfile=${milterbogom_pid} rcvar=`set_rcvar` command=%%PREFIX%%/sbin/bogom start_precmd="bogom_precmd" @@ -24,6 +15,15 @@ stop_postcmd="bogom_postcmd" load_rc_config $name +milterbogom_enable=${milterbogom_enable-"NO"} +milterbogom_socket=${milterbogom_socket-"unix:/var/run/bogom/milter.sock"} +milterbogom_user=${milterbogom_user-"bogomilter"} +milterbogom_pid=${milterbogom_pid-"/var/run/bogom/bogom.pid"} +milterbogom_flags=${milterbogom_flags-"-u ${milterbogom_user} \ +-s ${milterbogom_socket} -p ${milterbogom_pid}"} + +pidfile=${milterbogom_pid} + bogom_precmd() { if [ -d `dirname ${milterbogom_pid}` ] |