[Midnightbsd-cvs] mports: mail/fetchmail: Update to 6.3.8 Regression fixes for KPOP and

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 6.3.8

Regression fixes for KPOP and repoll after server disconnect.

Fix insecure APOP authentication.

Fix master sites for fetching.

Add pkg-message pointing to documenation in rc script.

Install fetchmailrc with 640 since it may contain passwords.
The fetchmailrc.sample file is still installed 644

Remove circular dependency in rcorder by removing the (unnessary) constraint
that fetchmail is started "BEFORE LOGIN". "REQUIRE mail" (which in turn
requires LOGIN) is enough.

Actually respect the `fetchmail_user' variable in single daemon
mode

Modified Files:
--------------
    mports/mail/fetchmail:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.2 -> r1.3)
    mports/mail/fetchmail/files:
        fetchmail.in (r1.2 -> r1.3)

Added Files:
-----------
    mports/mail/fetchmail/files:
        pkg-message.in (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/fetchmail/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmail/fetchmail/Makefile -Lmail/fetchmail/Makefile -u -r1.4 -r1.5
--- mail/fetchmail/Makefile
+++ mail/fetchmail/Makefile
@@ -11,12 +11,13 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	6.3.6
+PORTVERSION=	6.3.8
 CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_BERLIOS}/%SUBDIR%/ \
-		http://home.pages.de/~mandree/%SUBDIR%/ \
-		http://home.leo.org/~barner/freebsd/distfiles/
+MASTER_SITES=	${MASTER_SITE_BERLIOS} \
+		${MASTER_SITE_SUNSITE:S/$/:sunsite/
 MASTER_SITE_SUBDIR=	fetchmail
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT,leo,sunsite
+SUB_FILES=	pkg-message
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
@@ -44,7 +45,7 @@
 
 OPTIONS=	X11	"Python/Tkinter dependencies for fetchmailconf" off \
 		NLS	"National language support (NLS)."		on \
-		NTLM	"Building in support for NTLM/MSN authentication." off \
+		NTLM	"Build in support for NTLM/MSN authentication." off \
 		POP2	"Build pop2 support (obsolete)." off \
 		GSSAPI	"Build GSSAPI support (requires KRB5_HOME to be set)" off
 
@@ -140,6 +141,6 @@
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
 #	the group and owner of this file get changed by the plist.
-	${INSTALL} -m 644 -o root -g wheel ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
+	${INSTALL} -m 640 -o root -g wheel ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/fetchmail/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/fetchmail/distinfo -Lmail/fetchmail/distinfo -u -r1.2 -r1.3
--- mail/fetchmail/distinfo
+++ mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (fetchmail-6.3.6.tar.bz2) = 4fab7ca100ca36e41a2e8dbf5b32a3cf
-SHA256 (fetchmail-6.3.6.tar.bz2) = 3c81e7776617b78f18d9cd8b5e5f62944e70f1d7bd47a840fd8d44bcded784ff
-SIZE (fetchmail-6.3.6.tar.bz2) = 1307730
+MD5 (fetchmail-6.3.8.tar.bz2) = 66b97500b0a1e3c0916b3b5314f597f5
+SHA256 (fetchmail-6.3.8.tar.bz2) = 5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b
+SIZE (fetchmail-6.3.8.tar.bz2) = 1323515
Index: fetchmail.in
===================================================================
RCS file: /home/cvs/mports/mail/fetchmail/files/fetchmail.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/fetchmail/files/fetchmail.in -Lmail/fetchmail/files/fetchmail.in -u -r1.2 -r1.3
--- mail/fetchmail/files/fetchmail.in
+++ mail/fetchmail/files/fetchmail.in
@@ -12,12 +12,12 @@
 #
 # fetchmail_enable="YES"
 #
-# There are two modes:
+# There are two variants:
 #
 #  * Single system-wide fetchmail daemon:
 #    - It is run as user `fetchmail_user' (default: fetchmail)
 #    - All configuration is contained in one global file
-#      `fetchmail_config' (default: %%PREFIX/etc/fetchmailrc),
+#      `fetchmail_config' (default: %%PREFIX%%/etc/fetchmailrc),
 #      that must be owned by `fetchmail_user' (mode 700)
 #    - The fetchmail daemon awakes to fetch mail every 
 #      `fetchmail_polling_interval' seconds (default: 900).
@@ -36,7 +36,7 @@
 #      defaults, i.e. for the user `user1' there are variables
 #      `fetchmail_user1_config' and `fetchmail_user1_polling_interval'
 #    - All commands (e.g. start, stop, awaken (see below)) can be either
-#      passed to all instances of the daemon (if %%PREFIX/etc/rc.d/fetchmail)
+#      passed to all instances of the daemon (if %%PREFIX%%/etc/rc.d/fetchmail)
 #      is run as root), or just to the instance belonging to the respective
 #      user.
 #
@@ -64,6 +64,7 @@
 # read settings, set default values
 load_rc_config "$name"
 : ${fetchmail_enable="NO"}
+: ${fetchmail_user="fetchmail"}
 : ${fetchmail_config="%%PREFIX%%/etc/fetchmailrc"}
 : ${fetchmail_polling_interval="900"}
 : ${fetchmail_logging_facility="--syslog"}
@@ -93,7 +94,6 @@
 			eval pidfile="${fetchmail_home_prefix}/${user}/.fetchmail.pid"
 			eval fetchmail_user=$user
 		else
-			eval fetchmail_user=fetchmail
 			eval pidfile=/var/run/fetchmail/fetchmail.pid
 		fi
 		required_files=${fetchmail_config}
--- /dev/null
+++ mail/fetchmail/files/pkg-message.in
@@ -0,0 +1,2 @@
+For pointers how to configure fetchmail in daemon mode
+please consult %%PREFIX%%/etc/rc.d/fetchmail.