enable IPv6-ready build on USE_INET6.

commit approved by maintainer.

5 files changed, 74 insertions, 18 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index f05ee62aeaf..7a9cfb9c102 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 1999/07/02 15:20:23 frueauf Exp $
+# $NetBSD: Makefile,v 1.46 1999/07/07 23:28:12 itojun Exp $
 #
 
 DISTNAME=       fetchmail-5.0.5
@@ -21,6 +21,9 @@ CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 CONFIGURE_ARGS+=--with-kerberos=yes
 RESTRICTED=	uses Kerberos encryption code
 .endif
+.if defined(USE_INET6)
+CONFIGURE_ARGS+=--enable-inet6
+.endif
 
 FDOC=	${PREFIX}/share/doc/fetchmail
 
diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac
index 15145e60bfc..0fa655e97f5 100644
--- a/mail/fetchmail/patches/patch-ac
+++ b/mail/fetchmail/patches/patch-ac
@@ -1,8 +1,22 @@
-$NetBSD: patch-ac,v 1.4 1999/02/02 14:12:26 frueauf Exp $
+$NetBSD: patch-ac,v 1.5 1999/07/07 23:28:13 itojun Exp $
 
---- configure.in.orig	Sun Jan 31 01:17:37 1999
-+++ configure.in	Tue Feb  2 14:40:01 1999
-@@ -398,7 +398,7 @@
+--- configure.in.orig	Sat Jun 12 15:57:57 1999
++++ configure.in	Wed Jul  7 08:46:29 1999
+@@ -276,10 +276,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,
++		[AC_DEFINE(INET6, 1)],
++		[echo 'configure: cannot find getaddrinfo which is required for inet6 support.'; exit 1]) ])
+ 
+ AC_ARG_ENABLE(netsec,
+ 	[  --enable-netsec         support network security (requires inet6-apps library)],
+@@ -403,7 +402,7 @@
      LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
      LIBS="$LIBS -lhesiod"
  else
diff --git a/mail/fetchmail/patches/patch-ad b/mail/fetchmail/patches/patch-ad
deleted file mode 100644
index c4f7eba3e31..00000000000
--- a/mail/fetchmail/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 1999/06/12 16:48:11 frueauf Exp $
-
---- configure-orig	Fri Jun 11 08:13:10 1999
-+++ configure	Sat Jun 12 13:04:40 1999
-@@ -5409,7 +5409,7 @@
-     LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
-     LIBS="$LIBS -lhesiod"
- else
--    for dir in /usr/athena /usr /usr/local
-+    for dir in /usr/athena /usr/local
-     do
-       if test -f "$dir/include/hesiod.h"
-       then
diff --git a/mail/fetchmail/patches/patch-ba b/mail/fetchmail/patches/patch-ba
new file mode 100644
index 00000000000..b14d0feec38
--- /dev/null
+++ b/mail/fetchmail/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.7 1999/07/07 23:28:13 itojun Exp $
+
+--- socket.c.orig	Tue Feb  2 18:33:38 1999
++++ socket.c	Mon Jun  7 23:12:27 1999
+@@ -96,6 +96,7 @@
+     void *request = NULL;
+     int requestlen;
+ #endif /* NET_SECURITY */
++    int i;
+ 
+ #ifdef HAVE_SOCKETPAIR
+     if (plugin)
+@@ -122,7 +123,17 @@
+ 
+  ret:
+ #else /* NET_SECURITY */
++#if 0
+     i = inner_connect(ai, NULL, 0, NULL, NULL, "fetchmail", NULL);
++#else
++    i = socket(ai->ai_family, ai->ai_socktype, 0);
++    if (i < 0)
++	return -1;
++    if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) {
++	close(i);
++	return -1;
++    }
++#endif
+ #endif /* NET_SECURITY */
+ 
+     freeaddrinfo(ai);
diff --git a/mail/fetchmail/patches/patch-bb b/mail/fetchmail/patches/patch-bb
new file mode 100644
index 00000000000..d0c2bbfb092
--- /dev/null
+++ b/mail/fetchmail/patches/patch-bb
@@ -0,0 +1,22 @@
+$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);