Ready to ship.

svn path=/trunk/; revision=2734

3 files changed, 29 insertions, 16 deletions

diff --git a/NEWS b/NEWS
index abd0ee70..86854dd5 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,15 @@ The Debian bug-tracking page for fetchmail is:
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
-fetchmail-5.2.5 (Sat Feb  5 00:01:53 EST 2000), 18517 lines:
+fetchmail-5.2.7 (Sun Feb  6 20:45:41 EST 2000), 18517 lines:
+* Updated FAQ.
+* Updated es.po.
+* Disable mail notification on server unreachable.  This turned out to
+  be a very bad idea.
+
+There are 276 people on fetchmail-friends and 493 on fetchmail-announce.
+
+fetchmail-5.2.6 (Sat Feb  5 00:01:53 EST 2000), 18517 lines:
 * Close down sockets using shutdown(2) and discarding read data until we
   get a TCP FIN.  With any luck this will squash our socket leak.
 * Open the lockfile with O_SYNC, so we know the file has been written
diff --git a/driver.c b/driver.c
index cd89408e..8daf5f3e 100644
--- a/driver.c
+++ b/driver.c
@@ -1620,6 +1620,13 @@ const int maxfetch;		/* maximum number of messages to fetch */
 		    strcpy(errbuf, strerror(err_no));
 		report_complete(stderr, ": %s\n", errbuf);
 
+#ifdef __UNUSED
+		/* 
+		 * Don't use this.  It was an attempt to address Debian bug
+		 * #47143 (Notify user by mail when pop server nonexistent).
+		 * Trouble is, that doesn't work; you trip over the case 
+		 * where your SLIP or PPP link is down...
+		 */
 		/* warn the system administrator */
 		if (open_warning_by_mail(ctl, (struct msgblk *)NULL) == 0)
 		{
@@ -1627,8 +1634,9 @@ const int maxfetch;		/* maximum number of messages to fetch */
 		    stuff_warning(ctl, OPENFAIL, ctl->server.pollname);
 		    stuff_warning(ctl, errbuf, ctl->server.pollname);
 		    close_warning_by_mail(ctl, (struct msgblk *)NULL);
-		}
 #undef OPENFAIL
+		}
+#endif
 	    }
 #endif /* INET6_ENABLE */
 	    ok = PS_SOCKET;
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 256406c3..67c79b2b 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/01/31 22:16:21 $
+<td width="30%" align=right>$Date: 2000/02/07 01:50:05 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -467,16 +467,12 @@ of UW IMAP.  Or you can use <a href="#K5">SSL</a> for complete
 end-to-end encryption if you have an SSL-enabled mailserver.<P>
 
 You can get both POP3 and IMAP OTP patches from <a name="cmetz">Craig
-Metz</A>, over FTP via either
-<a href="ftp://ftp.inner.net/pub/opie/patches">
-ftp://ftp.inner.net/pub/opie/patches</a> (IPv4) or
-<a href="ftp://ftp.ipv6.inner.net/pub/opie/patches">
-ftp://ftp.ipv6.inner.net/pub/opie/patches</a> (IPv6).<P>
-
-These patches use a SASL authentication method named "X-OTP" because there is
-not currently a standard way to do this; fetchmail also uses this method, so
-the two will interoperate happily.  They better, because this is how Craig gets
-his mail ;-)<P>
+Metz</A> at <a
+href="http://www.inner.net/pub/">http://www.inner.net/pub/</a>.<P>
+These patches use a SASL authentication method named "X-OTP" because
+there is not currently a standard way to do this; fetchmail also uses
+this method, so the two will interoperate happily.  They better,
+because this is how Craig gets his mail ;-)<P>
 
 (One important win of OTP is that it's not subject to U.S. export
 restrictions.)<P>
@@ -1464,9 +1460,10 @@ project manager claims these bugs have been fixed in 6.0.<P>
 
 You can't, yet.  But Hugo Rabson has written a script called `hotmole'
 that can retrieve Hotmail mail via the web using Lynx.  The script
-is available on <a
+was available on <a
 href="http://www.jin-sei-kai.demon.co.uk/hugo/linux.html">
-Hugo Rabson's Linux page</a>.<P>
+Hugo Rabson's Linux page</a>, but we're told that project is dead and
+the web page seems to be gone.<P>
 
 <hr>
 <h2><a name="S9">S9. How can I use fetchmail with MSN?</a></h2>
@@ -2581,7 +2578,7 @@ terminate it.<p>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/01/31 22:16:21 $
+<td width="30%" align=right>$Date: 2000/02/07 01:50:05 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>