From 8a1a698052bb345c41a1b1c5153080d0dcd22cc7 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 19 Dec 1999 20:15:47 +0000 Subject: IPv6 patches. svn path=/trunk/; revision=2666 --- INSTALL | 11 ++++++----- Makefile.in | 4 ++-- NEWS | 2 ++ configure.in | 13 +++++++------ design-notes.html | 10 ++-------- fetchmail-FAQ.html | 6 +++--- fetchmail-features.html | 8 +++++--- socket.c | 1 + 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/INSTALL b/INSTALL index 79ff0486..0db142c4 100644 --- a/INSTALL +++ b/INSTALL @@ -26,11 +26,12 @@ you should install OPIE. You need version 2.32 or better. The OPIE library sources are available at ftp://ftp.inner.net/pub/opie. You can also find OPIE and IPV6-capable servers there. -Building in IPv6 support or the IPsec patches *requires* - that Craig -Metz's inet6-apps kit be installed; the IPsec patches require that the -kit be built with network security API support enabled. The kit can be -gotten from ftp.ipv6.inner.net:/pub/ipv6 (via IPv6) or ftp.inner.net +Building in IPv6 support *requires* glibc 2.1.1 (or newer) or +that Craig Metz's inet6-apps kit be installed. +The IPsec patches *requires* inet6-apps kit.; +the IPsec patches require that the kit be built with network +security API support enabled. The kit can be gotten from +ftp.ipv6.inner.net:/pub/ipv6 (via IPv6) or ftp.inner.net /pub/ipv6 (via IPv4). 2. CONFIGURE diff --git a/Makefile.in b/Makefile.in index 25ced5d6..2527d3c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,7 +86,7 @@ protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \ etrn.o fetchmail.o env.o options.o daemon.o driver.o sink.o \ rfc822.o smtp.o xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o \ interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o \ - smbdes.o smbencrypt.o smbmd4.o smbutil.o + smbdes.o smbencrypt.o smbmd4.o smbutil.o ipv6-connect.o objs = $(protobjs) $(extras) $(EXTRAOBJ) @@ -100,7 +100,7 @@ srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c \ $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c \ $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c \ $(srcdir)/checkalias.c $(srcdir)/smbdes.c $(srcdir)/smbencrypt.c \ - $(srcdir)/smbmd4.c $(srcdir)/smbutil.c + $(srcdir)/smbmd4.c $(srcdir)/smbutil.c $(srcdir)/ipv6-connect.c .SUFFIXES: .SUFFIXES: .o .c .h .y .l .ps .dvi .info .texi diff --git a/NEWS b/NEWS index c80e81b4..221e1537 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ a Certifying Authority we recognize?). * Added FAQ item R10 on timeouts during messages. * Fixed indentation problem in fetchmailconf. * Federico Schwindt's patch to fix broken SSL configuration. +* Fixes to use fetchmail with IPv6 enabled on glibc without inet6-apps + installed; thanks to Arkadiusz Mi¶kiewicz. fetchmail-5.2.0 (Tue Nov 30 14:24:25 EST 1999), 18302 lines: * fetchmailconf now complains and exits gracefully when not run under X. diff --git a/configure.in b/configure.in index ca4addea..f1e32923 100644 --- a/configure.in +++ b/configure.in @@ -287,12 +287,13 @@ test "$with_opie" = "yes" && AC_DEFINE(OPIE_ENABLE) 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_CHECK_FUNC(getaddrinfo, [with_inet6=yes], + [ LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; + AC_CHECK_LIB(inet6, getaddrinfo, [with_inet6=yes], + [ echo 'configure: cannot find proper glibc version or libinet6,'; + echo ' which is required for IPv6 support.'; + exit 1]) ] )], [with_inet6=no]) test "$with_inet6" = "yes" && AC_DEFINE(INET6_ENABLE) diff --git a/design-notes.html b/design-notes.html index 2204d56f..567c5be6 100644 --- a/design-notes.html +++ b/design-notes.html @@ -10,7 +10,7 @@
Back to Fetchmail Home Page To Site Map -$Date: 1999/09/26 20:37:39 $ +$Date: 1999/12/19 20:15:47 $

Design Notes On Fetchmail

@@ -293,12 +293,6 @@ not too distant future, we'll zap the ifdefs and just let autoconf check for getaddrinfo. IPv6 support comes pretty much automatically once you have protocol family independence.

-Craig Metz used his inner_connect() function to handle most of the -connect work. This is a nonstandard function not likely to ever exist -in a system's libc, but we can just include that source file if the -day comes when we want to support IPv6 without the inet6-apps -library. It just makes life easier.

-

Internationalization

Internationalization is handled using GNU gettext (see the file @@ -541,7 +535,7 @@ all shaped the design in one way or another.

Back to Fetchmail Home Page To Site Map -$Date: 1999/09/26 20:37:39 $ +$Date: 1999/12/19 20:15:47 $

Eric S. Raymond <esr@snark.thyrsus.com>
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html index 543a4b93..8ac81bd0 100644 --- a/fetchmail-FAQ.html +++ b/fetchmail-FAQ.html @@ -10,7 +10,7 @@
Back to Fetchmail Home Page To Site Map -$Date: 1999/12/19 18:22:47 $ +$Date: 1999/12/19 20:11:48 $

Frequently Asked Questions About Fetchmail

@@ -1536,7 +1536,7 @@ Geocities are lame, you should boycott them anyway.

K2. How can I use fetchmail with IPv6 and IPsec?

To use fetchmail with IPv6, you need a system that supports IPv6, the "Basic -Socket Interface Extensions for IPv6" (RFC 2133), and the inet6-apps kit. +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 @@ -2508,7 +2508,7 @@ inactivity timeout.

Back to Fetchmail Home Page To Site Map -$Date: 1999/12/19 18:22:47 $ +$Date: 1999/12/19 20:11:48 $

Eric S. Raymond <esr@snark.thyrsus.com>
diff --git a/fetchmail-features.html b/fetchmail-features.html index 81d8ac19..68d745f8 100644 --- a/fetchmail-features.html +++ b/fetchmail-features.html @@ -10,7 +10,7 @@
Back to Fetchmail Home Page To Site Map -$Date: 1999/10/27 00:15:09 $ +$Date: 1999/12/19 20:11:48 $
@@ -65,7 +65,9 @@ suppressed).
  • Support for IMAP-OTP authentication using Craig Metz's patches for UW IMAP. -
  • Support for IPv6 and IPSEC (using Craig Metz's inet6-apps library). +
  • Support for IPv6 (using glibc or Craig Metz's inet6-apps library). + +
  • Support for IPSEC (using Craig Metz's inet6-apps library).
  • Support for IMAP with RFC1731-conformant GSSAPI authentication. @@ -182,7 +184,7 @@ get-mail, gwpop, pimp-1.0, pop-perl5-1.2, popc, popmail-1.6 and upop.

    Back to Fetchmail Home Page To Site Map -$Date: 1999/10/27 00:15:09 $ +$Date: 1999/12/19 20:11:48 $

    Eric S. Raymond <esr@snark.thyrsus.com>
    diff --git a/socket.c b/socket.c index 09237d2f..9dfa5587 100644 --- a/socket.c +++ b/socket.c @@ -122,6 +122,7 @@ int SockOpen(const char *host, const char *service, const char *options, const char *plugin) { struct addrinfo *ai, req; + int i; #if NET_SECURITY void *request = NULL; int requestlen; -- cgit v1.2.3