aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING15
-rw-r--r--Makefile.in2
-rw-r--r--NEWS6
-rw-r--r--design-notes.html12
-rw-r--r--fetchmail-FAQ.html13
-rw-r--r--fetchmail.c5
-rwxr-xr-xupload2
7 files changed, 26 insertions, 29 deletions
diff --git a/COPYING b/COPYING
index 8ae894ac..e93e3f3f 100644
--- a/COPYING
+++ b/COPYING
@@ -5,19 +5,8 @@ retained for the purpose of protecting free redistribution of source.
The MD5 support is copyright by RSA Data Security, Inc. See the header
comment of the md5.c module for license terms.
- NO-INFECTION CLAUSE
-
-The intent of this license is to protect free redistribution and reuse of the
-source of the licensed distribution, not to prejudice the authorship
-rights of programmers of other code to control their original inventions.
-
-No portion of this license is to be interpreted as forbidding the reuse of
-this code or its constituent parts, algorithms, or inventions in commercial
-products.
-
-Nor shall such inclusion be construed to require the GPLing or disclosure of
-any portions of said commercial products other than those falling under
-the copyright of the licensed distribution.
+Specific permission is granted for this code to be linked to OpenSSL
+(this is necessary becuse the OpenSSL license is not GPL-compatible).
-------------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
diff --git a/Makefile.in b/Makefile.in
index 70e887d7..3fa4a9db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
# So just uncomment all the lines marked QNX.
PACKAGE = fetchmail
-VERSION = 5.5.6
+VERSION = 5.6.0
SUBDIRS = @INTLSUB@ @POSUB@
diff --git a/NEWS b/NEWS
index 80005759..120d4047 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,11 @@
(The `lines' figures total .c, .h, .l, and .y files under version control.)
-fetchmail-5.5.5 (Sat Nov 11 14:22:24 EST 2000), 19563 lines:
+* Updated FAQ on IPv6 operation.
+* Enabled showdots to work from the command line.
+* Fixed a bug in fetchmailconf's handling of the `principal' option.
+
+fetchmail-5.5.6 (Sat Nov 11 14:22:24 EST 2000), 19563 lines:
* Chip Salzenberg's patch to prevent wildcards in Common Names from causing
spurious error messages (resolved Debian bug #75011).
diff --git a/design-notes.html b/design-notes.html
index aa2e3960..11b17511 100644
--- a/design-notes.html
+++ b/design-notes.html
@@ -10,7 +10,7 @@
<table width="100%" cellpadding=0><tr>
<td width="30%">Back to <a href="/~esr/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/08/05 15:55:48 $
+<td width="30%" align=right>$Date: 2000/11/26 18:20:27 $
</table>
<HR>
<H1 ALIGN=CENTER>Design Notes On Fetchmail</H1>
@@ -330,9 +330,11 @@ following minimum steps.
<LI>Add code to dump the option value in <code>fetchmail.c:dump_params</code>.
-<LI>Add proper <code>FLAG_MERGE</code> actions in fetchmail.c's
- optmerge() function. (If it's a global option, add an override
- at the end of load_params.)
+<LI> For a per-site or per-user option, add proper
+ <code>FLAG_MERGE</code> actions in fetchmail.c's optmerge()
+ function. For a global option, add an override at the end of
+ load_params; this will involve copying a "cmd_run." field to a
+ corresponding "run." field, see the existing code for models.
<LI>Document the option in fetchmail.man. This will require at least
two changes; one to the collected table of options, and one full
@@ -547,7 +549,7 @@ RFC2221 IMAP4 Login Referrals
<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/08/05 15:55:48 $
+<td width="30%" align=right>$Date: 2000/11/26 18:20:27 $
</table>
<P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 5b52eb67..a47342d6 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/11/11 19:23:49 $
+<td width="30%" align=right>$Date: 2000/11/26 18:20:28 $
</table>
<HR>
<H1>Frequently Asked Questions About Fetchmail</H1>
@@ -1674,8 +1674,8 @@ Geocities are lame, you should boycott them anyway.<P>
To use fetchmail with IPv6, you need a system that supports IPv6, the "Basic
Socket Interface Extensions for IPv6" (RFC 2133).
This currently means that you need to have a BSD/OS or NetBSD system with
-the NRL IPv6+IPsec software distribution or a Linux system with the latest
-experimental kernel and net-tools. It should not be hard to build fetchmail on
+the NRL IPv6+IPsec software distribution or a Linux system with a 2.2 or
+later kernel and net-tools. It should not be hard to build fetchmail on
other IPv6 implementations if you can port the inet6-apps kit.<P>
To use fetchmail with networking security (read: IPsec), you need a system that
@@ -1689,10 +1689,7 @@ The NRL IPv6+IPsec software distribution can be obtained from: <a
href="http://web.mit.edu/network/isakmp">http://web.mit.edu/network/isakmp</a>
<P>
-The inet6-apps kit can be obtained from <a
-href="ftp://ftp.ipv6.inner.net/pub/ipv6">ftp://ftp.ipv6.inner.net/pub/ipv6</a>
-(via IPv6) or <a href="ftp://ftp.inner.net/pub/ipv6">
-ftp://ftp.inner.net/pub/ipv6</a> (via IPv4).<P>
+The inet6-apps kit can be obtained from <a href="http://ftp.ps.pl/pub/linux/IPv6/inet6-apps/">http://ftp.ps.pl/pub/linux/IPv6/inet6-apps/</a>.<P>
More information on using IPv6 with Linux can be obtained from:
<UL>
@@ -2966,7 +2963,7 @@ install Linux on your server...<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/11/11 19:23:49 $
+<td width="30%" align=right>$Date: 2000/11/26 18:20:28 $
</table>
<P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail.c b/fetchmail.c
index c9ce7bb8..33bed685 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -586,6 +586,11 @@ int main(int argc, char **argv)
close(st); /* should be safe, fd was opened with O_SYNC */
lock_acquired = TRUE;
}
+ else
+ {
+ fprintf(stderr, _("fetchmail: lock creation failed.\n"));
+ return(PS_EXCLUDE);
+ }
/*
* Query all hosts. If there's only one, the error return will
diff --git a/upload b/upload
index b576f6f2..0b672d55 100755
--- a/upload
+++ b/upload
@@ -7,7 +7,7 @@ if [ $* ]
then
../upload $*
else
- lftp <<EOF
+ lftp -d <<EOF
# First, copy to primary website
open ${WWWHOST}
cd ${WWWDIR}/fetchmail