Update to 6.3.1

 * Fix null pointer dereference w/ headerless message in
   multi-drop mode [1]
 * Removed patches are in the upstream distribution now
 * ChangeLog: https://lists.berlios.de/pipermail/fetchmail-announce/2005-December/000017.html

Security: http://www.vuxml.org/freebsd/f7eb0b23-7099-11da-a15c-0060084a00e5.html
Security: http://fetchmail.berlios.de/fetchmail-SA-2005-03.txt
Security: CVE-2005-4348

6 files changed, 4 insertions, 153 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 27dd93ce9f3f..760b46d820d9 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -10,8 +10,7 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	6.3.0
-PORTREVISION=	3
+PORTVERSION=	6.3.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://download.berlios.de/%SUBDIR%/ \
 		http://home.pages.de/~mandree/%SUBDIR%/ \
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index a5e52d27fdeb..07f524a0f153 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (fetchmail-6.3.0.tar.bz2) = b547b59f352af956911ce812773b3976
-SHA256 (fetchmail-6.3.0.tar.bz2) = abe34809e1a6a4eb27c8c91efe763e7c9762d50bfee31d3174703f022982b76e
-SIZE (fetchmail-6.3.0.tar.bz2) = 1155334
+MD5 (fetchmail-6.3.1.tar.bz2) = 6b7cd0e76465250d4c02367a90c08da6
+SHA256 (fetchmail-6.3.1.tar.bz2) = 4ba186eb7306161eb9181fb737840873564287cb37f5bdec48d4c31ad734e7b4
+SIZE (fetchmail-6.3.1.tar.bz2) = 1163151
diff --git a/mail/fetchmail/files/patch-checkalias.c b/mail/fetchmail/files/patch-checkalias.c
deleted file mode 100644
index 1f6325ad7066..000000000000
--- a/mail/fetchmail/files/patch-checkalias.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- checkalias.c.orig	Thu Dec  1 00:33:18 2005
-+++ checkalias.c	Sun Dec 11 14:32:33 2005
-@@ -155,10 +155,11 @@
-      */
-     memset(&hints, 0, sizeof hints);
-     hints.ai_family=AF_UNSPEC;
-     hints.ai_protocol=PF_UNSPEC;
-     hints.ai_socktype=SOCK_STREAM;
-+    hints.ai_flags=AI_CANONNAME;
- 
-     e = getaddrinfo(name, NULL, &hints, &res);
-     if (e == 0)
-     {
- 	int rr = (strcasecmp(ctl->server.truename, res->ai_canonname) == 0);
diff --git a/mail/fetchmail/files/patch-fetchmail.man b/mail/fetchmail/files/patch-fetchmail.man
deleted file mode 100644
index 552fae173a23..000000000000
--- a/mail/fetchmail/files/patch-fetchmail.man
+++ /dev/null
@@ -1,108 +0,0 @@
-Index: fetchmail.man
-===================================================================
---- fetchmail.man	(Revision 4499)
-+++ fetchmail.man	(Arbeitskopie)
-@@ -798,7 +798,7 @@
- but a string matching the user host name is likely.
- By using the option 'envelope Delivered\-To:' you can make fetchmail reliably
- identify the original envelope recipient, but you have to strip the
--'mbox\-userstr\-' prefix to deliver to the correct user.
-+\&'mbox\-userstr\-' prefix to deliver to the correct user.
- This is what this option is for.
- .TP
- .B \-\-configdump
-@@ -1339,11 +1339,11 @@
- two or more lines, unless you use a backslash to join lines (see below).
- An unquoted string is any whitespace-delimited token that is neither
- numeric, string quoted nor contains the special characters ',', ';',
--':', or '='.
-+\&':', or '='.
- .PP
- Any amount of whitespace separates tokens in server entries, but is
- otherwise ignored. You may use backslash escape sequences (\en for LF,
--\&\et for HT, \&\eb for BS, \er for CR, \e\fInnn\fP for decimal (where
-+\&\et for HT, \eb for BS, \er for CR, \e\fInnn\fP for decimal (where
- nnn cannot start with a 0), \e0\fIooo\fP for octal, and \ex\fIhh\fP for
- hex) to embed non-printable characters or string delimiters in strings.
- In quoted strings, a backslash at the very end of a line will cause the
-@@ -1386,7 +1386,7 @@
- square brackets are optional.  Those corresponding to short command-line
- options are followed by '\-' and the appropriate option letter.  If
- option is only relevant to a single mode of operation, it is noted as
--'s' or 'm' for singledrop- or multidrop-mode, respectively.
-+\&'s' or 'm' for singledrop- or multidrop-mode, respectively.
- 
- Here are the legal global options:
- 
-@@ -1452,7 +1452,7 @@
- local[domains]	\&	m	T{
- Specify domain(s) to be regarded as local
- T}
--port    		\&	T{
-+port    	\&	\&	T{
- Specify TCP/IP service port (obsolete, use 'service' instead).
- T}
- service 	\-P	\&	T{
-@@ -1489,7 +1489,7 @@
- plugout   	\&	\&	T{
- Specify command through which to make listener connections.
- T}
--dns   	\&	m	T{
-+dns     	\&	m	T{
- Enable DNS lookup for multidrop (default)
- T}
- no dns   	\&	m	T{
-@@ -1519,7 +1519,7 @@
- esmtpname   	\&	\&	T{
- Set name for RFC2554 authentication to the ESMTP server.
- T}
--esmtppassword   	\&	\&	T{
-+esmtppassword	\&	\&	T{
- Set password for RFC2554 authentication to the ESMTP server.
- T}
- .TE
-@@ -1788,7 +1788,7 @@
- to the listener or MDA unaltered (local-name mappings are \fInot\fR
- applied).
- .PP
--If you are using 'localdomains', you may also need to specify \&'no
-+If you are using 'localdomains', you may also need to specify 'no
- envelope', which disables \fIfetchmail\fR's normal attempt to deduce
- an envelope address from the Received line or X-Envelope-To header or
- whatever header has been previously set by 'envelope'.  If you set 'no
-@@ -1923,7 +1923,7 @@
- followed by a string sets the same global specified by \-\-logfile.  A
- command-line \-\-logfile option will override this. Note that \-\-logfile is
- only effective if fetchmail detaches itself from the terminal.  Also,
--'set daemon' sets the poll interval as \-\-daemon does.  This can be
-+\&'set daemon' sets the poll interval as \-\-daemon does.  This can be
- overridden by a command-line \-\-daemon option; in particular \-\-daemon\~0
- can be used to force foreground operation. The 'set postmaster'
- statement sets the address to which multidrop mail defaults if there are
-@@ -2182,13 +2182,13 @@
- header. But this doesn't work reliably for other MTAs, nor if there is
- more than one recipient.  By default, \fIfetchmail\fR looks for
- envelope addresses in these lines; you can restore this default with
--\&\-E "Received" or \&'envelope Received'.
-+\&\-E "Received" or 'envelope Received'.
- .PP
- .B As a better alternative,
- some SMTP listeners and/or mail servers insert a header
- in each message containing a copy of the envelope addresses.  This
- header (when it exists) is often 'X\-Original\-To', 'Delivered\-To' or
--'X\-Envelope\-To'.  Fetchmail's assumption about this can be changed with
-+\&'X\-Envelope\-To'.  Fetchmail's assumption about this can be changed with
- the \-E or 'envelope' option.  Note that writing an envelope header of
- this kind exposes the names of recipients (including blind-copy
- recipients) to all receivers of the messages, so the upstream must store
-@@ -2243,8 +2243,8 @@
- list called (say) "fetchmail-friends", and you want to keep the alias
- list on your client machine.
- .PP
--On your server, you can alias \&'fetchmail\-friends' to 'esr'; then, in
--your \fI.fetchmailrc\fR, declare \&'to esr fetchmail\-friends here'.
-+On your server, you can alias 'fetchmail\-friends' to 'esr'; then, in
-+your \fI.fetchmailrc\fR, declare 'to esr fetchmail\-friends here'.
- Then, when mail including 'fetchmail\-friends' as a local address
- gets fetched, the list name will be appended to the list of
- recipients your SMTP listener sees.  Therefore it will undergo alias
diff --git a/mail/fetchmail/files/patch-pop2.c b/mail/fetchmail/files/patch-pop2.c
deleted file mode 100644
index b99fd716ba67..000000000000
--- a/mail/fetchmail/files/patch-pop2.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pop2.c
-+++ pop2.c
-@@ -132,8 +132,8 @@
- static const struct method pop2 =
- {
-     "POP2",				/* Post Office Protocol v2 */
--    109,				/* standard POP2 port */
--    109,				/* ssl POP2 port - not */
-+    "pop2",				/* standard POP2 port */
-+    "pop2",				/* ssl POP2 port - not */
-     FALSE,				/* this is not a tagged protocol */
-     FALSE,				/* does not use message delimiter */
-     pop2_ok,				/* parse command response */
diff --git a/mail/fetchmail/files/patch-socket.c b/mail/fetchmail/files/patch-socket.c
deleted file mode 100644
index 91fba2b5c0fa..000000000000
--- a/mail/fetchmail/files/patch-socket.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: socket.c
-===================================================================
---- socket.c	(Revision 4499)
-+++ socket.c	(Arbeitskopie)
-@@ -841,6 +841,8 @@
- 	}
- 	if (certpath)
- 		SSL_CTX_load_verify_locations(_ctx, NULL, certpath);
-+	else
-+		SSL_CTX_set_default_verify_paths(_ctx);
- 	
- 	_ssl_context[sock] = SSL_new(_ctx);
-