Attachment 218297 Details for Bug 249860 – Proposed patch

[patch] Proposed patch

bug_249860.patch (text/plain), 1.97 KB, created by Corey Halpin on 2020-09-25 21:16:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Halpin

Created: 2020-09-25 21:16:38 UTC

Size: 1.97 KB

patch

obsolete

>Index: fetchmail/Makefile
>===================================================================
>--- fetchmail/Makefile	(revision 548985)
>+++ fetchmail/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME?=	fetchmail
> DISTVERSION=	6.4.12
>+PORTREVISION?=	1
> CATEGORIES=	mail
> # The next line is inherited by the fetchmailconf slave port,
> # do NOT replace fetchmail by ${PORTNAME}
>Index: fetchmail/files/fetchmail.in
>===================================================================
>--- fetchmail/files/fetchmail.in	(revision 548985)
>+++ fetchmail/files/fetchmail.in	(working copy)
>@@ -107,14 +107,17 @@
> 		eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"
> 		fetchmail_flags="-f ${fetchmail_config} \
> 				--pidfile ${pidfile} \
>-				-d ${fetchmail_polling_interval} \
> 				${fetchmail_logging_facility}"
>-        else
>-                echo "$0: extra argument ignored"
>-        fi
>+		# if no polling interval in config file, use value from rc.conf
>+		if [ "$(fetchmail -f ${fetchmail_config} --configdump | fgrep poll_interval | cut -d: -f2)" = "0," ] ; then
>+			fetchmail_flags="${fetchmail_flags} -d ${fetchmail_polling_interval}"
>+		fi
>+	else
>+		echo "$0: extra argument ignored"
>+	fi
> else
> 	uid=`id -u`
>-        if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then
>+	if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then
> 		# root mode: multiple user profiles are handled by recursive
> 		# calls of this script
> 		for user in ${fetchmail_users}; do
>Index: fetchmailconf/Makefile
>===================================================================
>--- fetchmailconf/Makefile	(revision 548985)
>+++ fetchmailconf/Makefile	(working copy)
>@@ -1,6 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fetchmailconf
>+PORTREVISION=	0
> DISTNAME=	fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
> # NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,
> # else _this_ port (fetchmailconf) becomes unfetchable

Flags:

chalpin: maintainer-approval+

Actions: View | Diff

Attachments on bug 249860: 218297 | 218317 | 218495