aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-09-18 04:45:47 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-09-18 04:45:47 +0000
commitdbb07f3478a29b76cb49752eeb29255c2546dba8 (patch)
tree9ab8487edb25a60ddae9649a5eb1e5c5261071d7
parentabf56645d3b47d6829ee648138b76f6525ad78ca (diff)
downloadfetchmail-dbb07f3478a29b76cb49752eeb29255c2546dba8.tar.gz
fetchmail-dbb07f3478a29b76cb49752eeb29255c2546dba8.tar.bz2
fetchmail-dbb07f3478a29b76cb49752eeb29255c2546dba8.zip
Deal with the license-incompatibility problem.
svn path=/trunk/; revision=3463
-rw-r--r--COPYING2
-rw-r--r--Makefile.in2
-rw-r--r--NEWS1
-rw-r--r--configure.in4
4 files changed, 3 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index e93e3f3f..4407773c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
The code in the fetchmail distribution is Copyright 1997 by Eric S. Raymond.
Portions are also copyrighted by Carl Harris, 1993 and 1995. Copyright
-retained for the purpose of protecting free redistribution of source.
+retained for the purpose of protecting open-source redistribution.
The MD5 support is copyright by RSA Data Security, Inc. See the header
comment of the md5.c module for license terms.
diff --git a/Makefile.in b/Makefile.in
index 02ee3d1e..128dcba9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ extras = @LIBOBJS@
# Extra sources/objects for library functions not provided on the host system.
EXTRASRC = @EXTRASRC@
-# EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/alloca.c # QNX
+# EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/alloca.c # QNX
EXTRAOBJ = @EXTRAOBJ@ @INTLOBJS@
# EXTRAOBJ = strcasecmp.o getopt.o getopt1.o alloca.o
diff --git a/NEWS b/NEWS
index 9ac542c6..8477020d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
* Make sure IMAP capability checks are caseblind.
* Make sure suffix checks on akalists are properly caseblinded.
* All warning mail now has a generated date stamp.
+* getopt.c and getopt1.c removed due to license incompatibility with OpenSSL.
fetchmail-5.9.0 (Sun Aug 12 23:52:16 EDT 2001), 21062 lines:
diff --git a/configure.in b/configure.in
index 43f2fbfb..e893585b 100644
--- a/configure.in
+++ b/configure.in
@@ -107,10 +107,6 @@ AC_CHECK_FUNC(memmove, AC_DEFINE(HAVE_MEMMOVE),
[EXTRASRC="$EXTRASRC \$(srcdir)/memmove.c"
EXTRAOBJ="$EXTRAOBJ memmove.o"])
-AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPTLONG),
- [EXTRASRC="$EXTRASRC \$(srcdir)/getopt.c \$(srcdir)/getopt1.c"
- EXTRAOBJ="$EXTRAOBJ getopt.o getopt1.o"])
-
AC_CHECK_FUNC(MD5Init, AC_DEFINE(HAVE_MD5),
[EXTRASRC="$EXTRASRC \$(srcdir)/md5c.c"
EXTRAOBJ="$EXTRAOBJ md5c.o"])