From nobody Sun Oct 24 07:59:45 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 595581810CE7; Sun, 24 Oct 2021 07:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HcVqQ20Rgz3qFy; Sun, 24 Oct 2021 07:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EE4B12030; Sun, 24 Oct 2021 07:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19O7xjOc003211; Sun, 24 Oct 2021 07:59:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19O7xjwq003210; Sun, 24 Oct 2021 07:59:45 GMT (envelope-from git) Date: Sun, 24 Oct 2021 07:59:45 GMT Message-Id: <202110240759.19O7xjwq003210@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 145c527f0c73 - main - mail/fetchmail: fix restart with "service -R" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 145c527f0c730ec3617b220cd3ff27d0af9139ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=145c527f0c730ec3617b220cd3ff27d0af9139ad commit 145c527f0c730ec3617b220cd3ff27d0af9139ad Author: Bernard Spil AuthorDate: 2021-10-24 07:56:29 +0000 Commit: Bernard Spil CommitDate: 2021-10-24 07:56:29 +0000 mail/fetchmail: fix restart with "service -R" PR: 258207 Approved by: chalpin cs wisc edu (maintainer) --- mail/fetchmail/Makefile | 1 + mail/fetchmail/files/fetchmail.in | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 0ed21d352bcf..21a0b7561e00 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -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} diff --git a/mail/fetchmail/files/fetchmail.in b/mail/fetchmail/files/fetchmail.in index 208e4526a6b2..99756ee8c540 100644 --- a/mail/fetchmail/files/fetchmail.in +++ b/mail/fetchmail/files/fetchmail.in @@ -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)" @@ -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"