Update fetchmail to 5.1.4.

fetchmail-5.1.4 (Sun Nov  7 17:40:21 EST 1999), 18302 lines:
* Mike Pearce's patch to fix a compile-time error recently introduced into
  the socket code when HAVE_INET_ATON is off.
* Added warning to fetchmailconf autoprobe about a flaky Netscape IMAP server.
* Disable duplicate suppression when there is only one recognized recipient.

fetchmail-5.1.3 (Sun Oct 31 12:19:52 EST 1999), 18290 lines:
* Grant Edwards's patch to correct NTLM behavior.
* James Brister's fix for IP-address hostnames.
* Updated config.guess and config.sub.
* Backed out the 5.1.0 change to quote usernames with embedded spaces.
  It actually breaks things.
* Added to fetchmailconf a warning about Imail IMAP servers.
* SSL patches by Michael Warfield merged in.  Distribution still contains
  no crypto code.

fetchmail-5.1.2 (Thu Oct  7 09:46:07 EDT 1999), 17906 lines:
* Joe Loughry <loughry@uswest.net> sent a patch to handle multihomed machines.
* Changed mimedecode default to `off'; it seems that doing RFC2047 decoding
  on headers throws away information that the MUA may need to see.
* Change Received header parsing to no longer demand an embedded dot in
  a mailhost address.
* Incorporated Grant Edwards's ntlmlib-0.2 with fixes for byte-order problems.

fetchmail-5.1.1 (Wed Sep 29 11:52:06 EDT 1999), 17827 lines:
* Added workaround, fetchmailconf warning, and FAQ about Novell GroupWise.
* Consistently show dummy arguments on manual page.
* Fix lexer to permit `antispam -1'.
* John Cigas's delay patch to avoid a timing problem with plugins.
* During IMAP authentication, canonicalize both name and password.
* -A has been retired (goes with authenticate -> preauthenticate change).
* Check for both fetchall and keep on in daemon mode; reject this.
* Fixed a logfile bug dumping IMAP-LOGIN and IMAP-CRAM-MD5.
* Tolerate a tunable constant number of authorization failures before
  complaining and wedging.

5 files changed, 20 insertions, 40 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index d3e3ef01417..55d2ab9fc7a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 1999/10/08 22:06:51 tron Exp $
+# $NetBSD: Makefile,v 1.58 1999/11/21 18:37:57 frueauf Exp $
 #
 
-DISTNAME=       fetchmail-5.1.0
+DISTNAME=       fetchmail-5.1.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 		http://www.tuxedo.org/~esr/fetchmail/ \
diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5
index 98b3d5232b0..87dde8cb8ad 100644
--- a/mail/fetchmail/files/md5
+++ b/mail/fetchmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.36 1999/09/25 11:18:34 frueauf Exp $
+$NetBSD: md5,v 1.37 1999/11/21 18:37:58 frueauf Exp $
 
-MD5 (fetchmail-5.1.0.tar.gz) = e8de130d95bd9a68863d27ac8c5a0fdc
+MD5 (fetchmail-5.1.4.tar.gz) = fee8c9a801eeb08f167cccc20ba0d209
diff --git a/mail/fetchmail/files/patch-sum b/mail/fetchmail/files/patch-sum
index aea00168990..24ee80a0da2 100644
--- a/mail/fetchmail/files/patch-sum
+++ b/mail/fetchmail/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.5 1999/11/18 14:20:15 agc Exp $
+$NetBSD: patch-sum,v 1.6 1999/11/21 18:37:58 frueauf Exp $
 
 MD5 (patch-aa) = cc1298297934cf1b0821583ef27ac5d9
 MD5 (patch-ab) = dcbd9a50e28acc1bd321e776add01826
-MD5 (patch-ac) = 0d3ec248fde73c402eea978fbe54c911
+MD5 (patch-ac) = aa44698fac33efbe0576f591ac4d4150
 MD5 (patch-ba) = 498ab1120edc90111572689f142c953b
-MD5 (patch-bb) = 39f9be97652cf615519a7f7f44264803
diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac
index 0fa655e97f5..90ef62e860c 100644
--- a/mail/fetchmail/patches/patch-ac
+++ b/mail/fetchmail/patches/patch-ac
@@ -1,22 +1,25 @@
-$NetBSD: patch-ac,v 1.5 1999/07/07 23:28:13 itojun Exp $
+$NetBSD: patch-ac,v 1.6 1999/11/21 18:37:58 frueauf Exp $
 
---- configure.in.orig	Sat Jun 12 15:57:57 1999
-+++ configure.in	Wed Jul  7 08:46:29 1999
-@@ -276,10 +276,9 @@
+--- configure.in.orig	Sun Nov  7 23:50:31 1999
++++ configure.in	Sun Nov 21 18:21:39 1999
+@@ -287,13 +287,9 @@
  
  AC_ARG_ENABLE(inet6,
  	[  --enable-inet6          support IPv6 (requires the inet6-apps library)],
--        [ unset ac_cv_lib_inet6_getaddrinfo; AC_CHECK_LIB(inet6, getaddrinfo,,
--	[ unset ac_cv_lib_inet6_getaddrinfo; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; AC_CHECK_LIB(inet6, getaddrinfo,,
--        [ echo 'configure: cannot find libinet6, which is required for IPv6 support.'; exit 1]) ])
--          AC_DEFINE(INET6, 1) ])
-+        [ AC_CHECK_FUNCS(getaddrinfo,
+-        [ unset ac_cv_lib_inet6_getaddrinfo; AC_CHECK_LIB(inet6,getaddrinfo,,
+-	  [ unset ac_cv_lib_inet6_getaddrinfo;
+-	    LDFLAGS="$LDFLAGS -L/usr/inet6/lib";
+-            AC_CHECK_LIB(inet6, getaddrinfo,,
+-              [ echo 'configure: cannot find libinet6, which is required for IPv6 support.'; 
+-	      exit 1]) ]) ]
+-	[with_inet6=no])
++	[ AC_CHECK_FUNCS(getaddrinfo,
 +		[AC_DEFINE(INET6, 1)],
 +		[echo 'configure: cannot find getaddrinfo which is required for inet6 support.'; exit 1]) ])
+ test "$with_inet6" = "yes" && AC_DEFINE(INET6_ENABLE)
  
  AC_ARG_ENABLE(netsec,
- 	[  --enable-netsec         support network security (requires inet6-apps library)],
-@@ -403,7 +402,7 @@
+@@ -496,7 +492,7 @@
      LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
      LIBS="$LIBS -lhesiod"
  else
diff --git a/mail/fetchmail/patches/patch-bb b/mail/fetchmail/patches/patch-bb
deleted file mode 100644
index d0c2bbfb092..00000000000
--- a/mail/fetchmail/patches/patch-bb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bb,v 1.1 1999/07/07 23:28:13 itojun Exp $
-
---- conf.c.orig	Mon Jan  4 05:11:43 1999
-+++ conf.c	Tue Jan  5 19:47:33 1999
-@@ -230,7 +230,7 @@
- 
- 	    using_kpop =
- 		(ctl->server.protocol == P_POP3 &&
--#if !INET6
-+#ifndef INET6
- 		 ctl->server.port == KPOP_PORT &&
- #else
- 		 0 == strcmp( ctl->server.service, KPOP_PORT ) &&
-@@ -242,7 +242,7 @@
- 	    stringdump("via", ctl->server.via); 
- 	    stringdump("protocol", 
- 		       using_kpop ? "KPOP" : showproto(ctl->server.protocol));
--#if !INET6
-+#ifndef INET6
- 	    numdump("port",  ctl->server.port);
- #else
- 	    stringdump("service", ctl->server.service);