mail/fetchmail: mail/fetchmailconf: Update to 6.4.13 [1], fix rcfile …

…bug [2] Update mail/fetchmail{,conf} to 6.4.13 and fix rc script to work correctly when root's shell does not include /usr/local/bin in $PATH. mail/fetchmail passes 'poudriere testport' on both i386 and amd64 under 11.4 and 12.1 for the following configurations: - Default settings - Default settings, build as non-root - ssl=base, GSSAPI_MIT - ssl=base, GSSAPI_NONE - ssl=openssl - ssl=openssl with SSL2 and SSL3 disabled - ssl=openssl, GSSAPI_NONE - ssl=libressl - ssl=libressl, GSSAPI_NONE mail/fetchmailconf passes 'poudriere testport' on both i386 and amd64 under 11.4 and 12.1 with default settings Additionally, passes bulk -tC on 12.1-arm64. PR: 250925 [1] Submitted by: Corey Halpin (maintainer) PR: 250691 [2, comments #14, #15] Reported by: Brian Biskeborn [2], Andrey Kiryanov [2]
freebsd · Nov 8, 2020 · f225c61 · f225c61
1 parent 80b9375
commit f225c61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	fetchmail
-DISTVERSION=	6.4.12
-PORTREVISION?=	3
+DISTVERSION=	6.4.13
 CATEGORIES=	mail
 # The next line is inherited by the fetchmailconf slave port,
 # do NOT replace fetchmail by ${PORTNAME}

diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599207773
-SHA256 (fetchmail-6.4.12.tar.xz) = 2b84e0971dbf683ec7edd313f9218adbc7dc51c1de9825b3b549bf619c1a4887
-SIZE (fetchmail-6.4.12.tar.xz) = 1303532
+TIMESTAMP = 1604697110
+SHA256 (fetchmail-6.4.13.tar.xz) = 7d28cf060b06b9c8ec72267be7edc9a99b70f61d7d32d8b609458dcedfa74be1
+SIZE (fetchmail-6.4.13.tar.xz) = 1308248
diff --git a/mail/fetchmail/files/fetchmail.in b/mail/fetchmail/files/fetchmail.in
@@ -116,7 +116,7 @@ fetchmail_awaken()
 # query a value from the fetchmail config file, value specified in first argument
 fetchmail_dump_config()
 {
-	su -m ${fetchmail_user} -c "/bin/sh -c 'fetchmail -f ${fetchmail_config} --configdump'" | fgrep $1 | cut -d: -f2
+	su -m ${fetchmail_user} -c "/bin/sh -c '${command} -f ${fetchmail_config} --configdump'" | fgrep $1 | cut -d: -f2
 }
 
 # arguments: