Wed Nov 10 19:24:53 2021 UTC ()
fetchmail: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

Bumps PKGREVISION.


(khorben)
diff -r1.199 -r1.200 pkgsrc/mail/fetchmail/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/fetchmail/files/fetchmail.sh
cvs diff -r1.199 -r1.200 pkgsrc/mail/fetchmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/fetchmail/Makefile 2021/10/21 07:46:35 1.199
+++ pkgsrc/mail/fetchmail/Makefile 2021/11/10 19:24:52 1.200
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.199 2021/10/21 07:46:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.200 2021/11/10 19:24:52 khorben Exp $
2 2
3# Note to updaters: mail/fetchmailconf reaches over here, make sure it builds. 3# Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
4DISTNAME= fetchmail-6.4.21 4DISTNAME= fetchmail-6.4.21
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchmail/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchmail/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.fetchmail.info/ 11HOMEPAGE= https://www.fetchmail.info/
12COMMENT= Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap 12COMMENT= Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
13LICENSE= gnu-gpl-v1 AND gnu-gpl-v2 AND modified-bsd AND public-domain AND gnu-lgpl-v2.1 13LICENSE= gnu-gpl-v1 AND gnu-gpl-v2 AND modified-bsd AND public-domain AND gnu-lgpl-v2.1
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --without-hesiod 17CONFIGURE_ARGS+= --without-hesiod
18CONFIGURE_ENV+= PYTHON=: 18CONFIGURE_ENV+= PYTHON=:
cvs diff -r1.3 -r1.4 pkgsrc/mail/fetchmail/files/fetchmail.sh (expand / switch to unified diff)

--- pkgsrc/mail/fetchmail/files/fetchmail.sh 2011/03/20 01:38:36 1.3
+++ pkgsrc/mail/fetchmail/files/fetchmail.sh 2021/11/10 19:24:52 1.4
@@ -1,38 +1,42 @@ @@ -1,38 +1,42 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: fetchmail.sh,v 1.3 2011/03/20 01:38:36 shattered Exp $ 3# $NetBSD: fetchmail.sh,v 1.4 2021/11/10 19:24:52 khorben Exp $
4# 4#
5# PROVIDE: fetchmail 5# PROVIDE: fetchmail
6# REQUIRE: mail 6# REQUIRE: mail
 7#
 8# You will need to set some variables in @SYSCONFBASE@/rc.conf to start fetchmail:
 9#
 10# fetchmail=YES
7 11
8if [ -f /etc/rc.subr ]; then 12if [ -f @SYSCONFBASE@/rc.subr ]; then
9 . /etc/rc.subr 13 $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
10fi 14fi
11 15
12name="fetchmail" 16name="fetchmail"
13rcvar=$name 17rcvar=$name
14command="@PREFIX@/bin/${name}" 18command="@PREFIX@/bin/${name}"
15pidfile="/var/run/${name}.pid" 19pidfile="/var/run/${name}.pid"
16required_files="@PKG_SYSCONFDIR@/${name}.conf" 20required_files="@PKG_SYSCONFDIR@/${name}.conf"
17extra_commands="awaken reload" 21extra_commands="awaken reload"
18command_args="-f - < @PKG_SYSCONFDIR@/${name}.conf" 22command_args="-f - < @PKG_SYSCONFDIR@/${name}.conf"
19awaken_cmd="start_poll" 23awaken_cmd="start_poll"
20 24
21start_poll ()  25start_poll ()
22{ 26{
23 DAEMON_PID=`sed 1q ${pidfile}` 27 DAEMON_PID=`sed 1q ${pidfile}`
24 : ${DAEMON_PID:=0} 28 : ${DAEMON_PID:=0}
25 @ECHO@ -n "Awakening ${name} daemon" 29 @ECHO@ -n "Awakening ${name} daemon"
26 if [ ${DAEMON_PID} -ne 0 ]; then 30 if [ ${DAEMON_PID} -ne 0 ]; then
27 kill -SIGUSR1 ${DAEMON_PID} >/dev/null 2>&1;  31 kill -SIGUSR1 ${DAEMON_PID} >/dev/null 2>&1;
28 fi 32 fi
29 @ECHO@ '.' 33 @ECHO@ '.'
30} 34}
31 35
32if [ -f /etc/rc.subr ]; then 36if [ -f @SYSCONFBASE@/rc.subr ]; then
33 load_rc_config $name 37 load_rc_config $name
34 run_rc_command "$1" 38 run_rc_command "$1"
35else 39else
36 @ECHO@ -n ' ${name}' 40 @ECHO@ -n ' ${name}'
37 ${command} ${fetchmail_flags} ${command_args} 41 ${command} ${fetchmail_flags} ${command_args}
38fi 42fi