Skip to content

Commit

Permalink
mail/fetchmail: fix restart with "service -R"
Browse files Browse the repository at this point in the history
PR:		258207
Approved by:	chalpin cs wisc edu (maintainer)
  • Loading branch information
Sp1l committed Oct 24, 2021
1 parent 7988695 commit 145c527
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions mail/fetchmail/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME?= fetchmail
DISTVERSION= 6.4.22
PORTREVISION= 1
CATEGORIES= mail
# The next line is inherited by the fetchmailconf dependent port,
# do NOT replace fetchmail by ${PORTNAME}
Expand Down
7 changes: 5 additions & 2 deletions mail/fetchmail/files/fetchmail.in
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,14 @@ if [ "x${fetchmail_users}" != "x" ]; then
eval fetchmail_${i}="\${${uvarname}-\${fetchmail_${i}}}"
done
else
pidfile=/var/run/fetchmail/fetchmail.pid
fetchmail_home=/var/run/fetchmail
fi
required_files=${fetchmail_config}

# set up environment
export FETCHMAILHOME=${fetchmail_home}
export FETCHMAILUSER=${fetchmail_user}

# add early command line arguments
# if logfile set in config file, do not override with rc.conf default (note logfile overrides syslog)
_logfile="$(fetchmail_dump_config logfile)"
Expand All @@ -184,5 +188,4 @@ if [ "$(fetchmail_dump_config poll_interval)" = "0," ] ; then
fi

# actually execute the fetchmail program
export FETCHMAILUSER=$fetchmail_user
run_rc_command "$1"

0 comments on commit 145c527

Please sign in to comment.