summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhorben <khorben@pkgsrc.org>2021-11-10 19:24:52 +0000
committerkhorben <khorben@pkgsrc.org>2021-11-10 19:24:52 +0000
commite52548289f71f09ec1d8d116f69a1d922620f6e1 (patch)
treec01ac6e0e797349fa785d5da3e59eceb0bb8c883
parentb249b2b41ca5bb65ae8c80d9d84695f78e372391 (diff)
downloadpkgsrc-e52548289f71f09ec1d8d116f69a1d922620f6e1.tar.gz
fetchmail: let the RC script work unprivileged
This takes advantage of the introduction of the SYSCONFBASE variable. Tested on NetBSD/amd64. Bumps PKGREVISION.
-rw-r--r--mail/fetchmail/Makefile4
-rwxr-xr-xmail/fetchmail/files/fetchmail.sh12
2 files changed, 10 insertions, 6 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 51e55132c84..e12e9fb906c 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.199 2021/10/21 07:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.200 2021/11/10 19:24:52 khorben Exp $
# Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
DISTNAME= fetchmail-6.4.21
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchmail/}
EXTRACT_SUFX= .tar.xz
diff --git a/mail/fetchmail/files/fetchmail.sh b/mail/fetchmail/files/fetchmail.sh
index 963cdffc547..7ff5f5c250b 100755
--- a/mail/fetchmail/files/fetchmail.sh
+++ b/mail/fetchmail/files/fetchmail.sh
@@ -1,12 +1,16 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: fetchmail.sh,v 1.3 2011/03/20 01:38:36 shattered Exp $
+# $NetBSD: fetchmail.sh,v 1.4 2021/11/10 19:24:52 khorben Exp $
#
# PROVIDE: fetchmail
# REQUIRE: mail
+#
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start fetchmail:
+#
+# fetchmail=YES
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+ $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
fi
name="fetchmail"
@@ -29,7 +33,7 @@ start_poll ()
@ECHO@ '.'
}
-if [ -f /etc/rc.subr ]; then
+if [ -f @SYSCONFBASE@/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else