Update fetchmail to 4.7.6.

fetchmail-4.7.6 (Sat Jan 30 19:44:24 EST 1999):
* Henrik Storner's fix for mimedecode
* ' now works as a string quote in. fetchmailrc syntax, just like ".
* All bounce messages now use FQDN return paths.
* Check for background mode before generating oversized-message mail.  Duh!
* Paul Murphy's improvements for SDPS.
* Message deletion on miscellaneous 5xx SMTP errors is suppressed unless a
  bounce can be sent.

4 files changed, 153 insertions, 173 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index cfa9cdd4ab9..fcf2abf1ec7 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 1999/01/10 21:38:48 frueauf Exp $
+# $NetBSD: Makefile,v 1.36 1999/02/02 14:12:25 frueauf Exp $
 #
 
-DISTNAME=       fetchmail-4.7.5
+DISTNAME=       fetchmail-4.7.6
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 		http://www.tuxedo.org/~esr/fetchmail/ \
diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5
index 58f98072eb9..ca552b04d5e 100644
--- a/mail/fetchmail/files/md5
+++ b/mail/fetchmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.25 1999/01/10 21:38:48 frueauf Exp $
+$NetBSD: md5,v 1.26 1999/02/02 14:12:26 frueauf Exp $
 
-MD5 (fetchmail-4.7.5.tar.gz) = 90e641526281f7c26c194287b3d155d7
+MD5 (fetchmail-4.7.6.tar.gz) = 0179a1f124cac8c608a0cfaf5603de9b
diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac
index 974a52aebec..15145e60bfc 100644
--- a/mail/fetchmail/patches/patch-ac
+++ b/mail/fetchmail/patches/patch-ac
@@ -1,31 +1,13 @@
-$NetBSD: patch-ac,v 1.3 1998/12/28 22:00:16 marc Exp $
+$NetBSD: patch-ac,v 1.4 1999/02/02 14:12:26 frueauf Exp $
 
---- imap.c~	Fri Dec  4 10:26:39 1998
-+++ imap.c	Mon Dec 28 16:58:58 1998
-@@ -14,7 +14,6 @@
- #endif
- #include  "fetchmail.h"
- #include  "socket.h"
--#include  "i18n.h"
- 
- #ifdef KERBEROS_V4
- #ifdef KERBEROS_V5
-@@ -30,6 +29,9 @@
- #endif
- #include <krb.h>
- #endif
-+#ifdef _
-+#undef _
-+#endif
- #endif /* KERBEROS_V4 */
- 
- #ifdef GSSAPI
-@@ -40,6 +42,8 @@
- #if OPIE
- #include <opie.h>
- #endif /* OPIE */
-+
-+#include  "i18n.h"
- 
- #ifndef strstr		/* glibc-2.1 declares this as a macro */
- extern char *strstr();	/* needed on sysV68 R3V7.1. */
+--- configure.in.orig	Sun Jan 31 01:17:37 1999
++++ configure.in	Tue Feb  2 14:40:01 1999
+@@ -398,7 +398,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-ad
index 395430d2bd5..a34c6625d6b 100644
--- a/mail/fetchmail/patches/patch-ba
+++ b/mail/fetchmail/patches/patch-ad
@@ -1,18 +1,7 @@
-$NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
+$NetBSD: patch-ad,v 1.1 1999/02/02 14:12:26 frueauf Exp $
 
---- configure.in.orig	Thu Jan  7 12:11:52 1999
-+++ configure.in	Sun Jan 24 00:52:47 1999
-@@ -387,7 +387,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
---- configure.orig	Thu Jan  7 12:13:45 1999
-+++ configure	Sun Jan 24 00:52:52 1999
+--- configure.orig	Sun Jan 31 01:17:41 1999
++++ configure	Tue Feb  2 14:41:32 1999
 @@ -1,7 +1,7 @@
  #! /bin/sh
  
@@ -2191,319 +2180,328 @@ $NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define SYS_SIGLIST_DECLARED 1
-@@ -4527,7 +4634,7 @@
+@@ -4513,7 +4620,7 @@
+ rm -f conftest*
+ 
+ echo $ac_n "checking OS kernel major version""... $ac_c" 1>&6
+-echo "configure:4517: checking OS kernel major version" >&5
++echo "configure:4624: checking OS kernel major version" >&5
+ set -- `uname -r | tr '.' ' '`
+ release="${1}.${2}"
+ echo "$ac_t""$release" 1>&6
+@@ -4541,7 +4648,7 @@
  
  
  echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:4531: checking size of short" >&5
-+echo "configure:4638: checking size of short" >&5
+-echo "configure:4545: checking size of short" >&5
++echo "configure:4652: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4535,7 +4642,7 @@
+@@ -4549,7 +4656,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4539 "configure"
-+#line 4646 "configure"
+-#line 4553 "configure"
++#line 4660 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4546,7 +4653,7 @@
+@@ -4560,7 +4667,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
-@@ -4566,7 +4673,7 @@
+@@ -4580,7 +4687,7 @@
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:4570: checking size of int" >&5
-+echo "configure:4677: checking size of int" >&5
+-echo "configure:4584: checking size of int" >&5
++echo "configure:4691: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4574,7 +4681,7 @@
+@@ -4588,7 +4695,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4578 "configure"
-+#line 4685 "configure"
+-#line 4592 "configure"
++#line 4699 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4585,7 +4692,7 @@
+@@ -4599,7 +4706,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -4605,7 +4712,7 @@
+@@ -4619,7 +4726,7 @@
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:4609: checking size of long" >&5
-+echo "configure:4716: checking size of long" >&5
+-echo "configure:4623: checking size of long" >&5
++echo "configure:4730: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4613,7 +4720,7 @@
+@@ -4627,7 +4734,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4617 "configure"
-+#line 4724 "configure"
+-#line 4631 "configure"
++#line 4738 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4624,7 +4731,7 @@
+@@ -4638,7 +4745,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -4748,18 +4855,18 @@
+@@ -4762,18 +4869,18 @@
    enableval="$enable_opie"
     ac_safe=`echo "opie.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for opie.h""... $ac_c" 1>&6
--echo "configure:4752: checking for opie.h" >&5
-+echo "configure:4859: checking for opie.h" >&5
+-echo "configure:4766: checking for opie.h" >&5
++echo "configure:4873: checking for opie.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4757 "configure"
-+#line 4864 "configure"
+-#line 4771 "configure"
++#line 4878 "configure"
  #include "confdefs.h"
  #include <opie.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:4776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:4869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
-@@ -4781,7 +4888,7 @@
+@@ -4795,7 +4902,7 @@
  fi
  
            echo $ac_n "checking for opiegenerator in -lopie""... $ac_c" 1>&6
--echo "configure:4785: checking for opiegenerator in -lopie" >&5
-+echo "configure:4892: checking for opiegenerator in -lopie" >&5
+-echo "configure:4799: checking for opiegenerator in -lopie" >&5
++echo "configure:4906: checking for opiegenerator in -lopie" >&5
  ac_lib_var=`echo opie'_'opiegenerator | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4789,7 +4896,7 @@
+@@ -4803,7 +4910,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lopie  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4793 "configure"
-+#line 4900 "configure"
+-#line 4807 "configure"
++#line 4914 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4800,7 +4907,7 @@
+@@ -4814,7 +4921,7 @@
  opiegenerator()
  ; return 0; }
  EOF
--if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4841,7 +4948,7 @@
+@@ -4855,7 +4962,7 @@
  if test "${enable_inet6+set}" = set; then
    enableval="$enable_inet6"
     unset ac_cv_lib_inet6_getaddrinfo; echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
--echo "configure:4845: checking for getaddrinfo in -linet6" >&5
-+echo "configure:4952: checking for getaddrinfo in -linet6" >&5
+-echo "configure:4859: checking for getaddrinfo in -linet6" >&5
++echo "configure:4966: checking for getaddrinfo in -linet6" >&5
  ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4849,7 +4956,7 @@
+@@ -4863,7 +4970,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4853 "configure"
-+#line 4960 "configure"
+-#line 4867 "configure"
++#line 4974 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4860,7 +4967,7 @@
+@@ -4874,7 +4981,7 @@
  getaddrinfo()
  ; return 0; }
  EOF
--if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4886,7 +4993,7 @@
+@@ -4900,7 +5007,7 @@
  else
    echo "$ac_t""no" 1>&6
   unset ac_cv_lib_inet6_getaddrinfo; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
--echo "configure:4890: checking for getaddrinfo in -linet6" >&5
-+echo "configure:4997: checking for getaddrinfo in -linet6" >&5
+-echo "configure:4904: checking for getaddrinfo in -linet6" >&5
++echo "configure:5011: checking for getaddrinfo in -linet6" >&5
  ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4894,7 +5001,7 @@
+@@ -4908,7 +5015,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4898 "configure"
-+#line 5005 "configure"
+-#line 4912 "configure"
++#line 5019 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4905,7 +5012,7 @@
+@@ -4919,7 +5026,7 @@
  getaddrinfo()
  ; return 0; }
  EOF
--if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4946,7 +5053,7 @@
+@@ -4960,7 +5067,7 @@
  if test "${enable_netsec+set}" = set; then
    enableval="$enable_netsec"
     unset ac_cv_lib_inet6_net_security_strtorequest; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6
--echo "configure:4950: checking for net_security_strtorequest in -linet6" >&5
-+echo "configure:5057: checking for net_security_strtorequest in -linet6" >&5
+-echo "configure:4964: checking for net_security_strtorequest in -linet6" >&5
++echo "configure:5071: checking for net_security_strtorequest in -linet6" >&5
  ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4954,7 +5061,7 @@
+@@ -4968,7 +5075,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4958 "configure"
-+#line 5065 "configure"
+-#line 4972 "configure"
++#line 5079 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4965,7 +5072,7 @@
+@@ -4979,7 +5086,7 @@
  net_security_strtorequest()
  ; return 0; }
  EOF
--if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4991,7 +5098,7 @@
+@@ -5005,7 +5112,7 @@
  else
    echo "$ac_t""no" 1>&6
   unset ac_cv_lib_inet6_net_security_strtorequest; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6
--echo "configure:4995: checking for net_security_strtorequest in -linet6" >&5
-+echo "configure:5102: checking for net_security_strtorequest in -linet6" >&5
+-echo "configure:5009: checking for net_security_strtorequest in -linet6" >&5
++echo "configure:5116: checking for net_security_strtorequest in -linet6" >&5
  ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4999,7 +5106,7 @@
+@@ -5013,7 +5120,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5003 "configure"
-+#line 5110 "configure"
+-#line 5017 "configure"
++#line 5124 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5010,7 +5117,7 @@
+@@ -5024,7 +5131,7 @@
  net_security_strtorequest()
  ; return 0; }
  EOF
--if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5045,18 +5152,18 @@
+@@ -5059,18 +5166,18 @@
  
            unset ac_cv_header_net_security_h; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for net/security.h""... $ac_c" 1>&6
--echo "configure:5049: checking for net/security.h" >&5
-+echo "configure:5156: checking for net/security.h" >&5
+-echo "configure:5063: checking for net/security.h" >&5
++echo "configure:5170: checking for net/security.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5054 "configure"
-+#line 5161 "configure"
+-#line 5068 "configure"
++#line 5175 "configure"
  #include "confdefs.h"
  #include <net/security.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:5166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
-@@ -5076,18 +5183,18 @@
+@@ -5090,18 +5197,18 @@
    echo "$ac_t""no" 1>&6
   unset ac_cv_header_net_security_h; CPPFLAGS="$CPPFLAGS -I/usr/inet6/include"; CFLAGS="$CFLAGS -I/usr/inet6/include"; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for net/security.h""... $ac_c" 1>&6
--echo "configure:5080: checking for net/security.h" >&5
-+echo "configure:5187: checking for net/security.h" >&5
+-echo "configure:5094: checking for net/security.h" >&5
++echo "configure:5201: checking for net/security.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5085 "configure"
-+#line 5192 "configure"
+-#line 5099 "configure"
++#line 5206 "configure"
  #include "confdefs.h"
  #include <net/security.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:5197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
-@@ -5213,7 +5320,7 @@
+@@ -5227,7 +5334,7 @@
          LDEFLAGS="$LDEFLAGS -L$with_socks"
      else
          echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6
--echo "configure:5217: checking for Rconnect in -lsocks" >&5
-+echo "configure:5324: checking for Rconnect in -lsocks" >&5
+-echo "configure:5231: checking for Rconnect in -lsocks" >&5
++echo "configure:5338: checking for Rconnect in -lsocks" >&5
  ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5221,7 +5328,7 @@
+@@ -5235,7 +5342,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocks  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5225 "configure"
-+#line 5332 "configure"
+-#line 5239 "configure"
++#line 5346 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5232,7 +5339,7 @@
+@@ -5246,7 +5353,7 @@
  Rconnect()
  ; return 0; }
  EOF
--if { (eval echo configure:5236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5286,7 +5393,7 @@
+@@ -5300,7 +5407,7 @@
      LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
      LIBS="$LIBS -lhesiod"
  else
@@ -2512,61 +2510,61 @@ $NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
      do
        if test -f "$dir/include/hesiod.h"
        then
-@@ -5317,7 +5424,7 @@
+@@ -5331,7 +5438,7 @@
    fi
  
    echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6
--echo "configure:5321: checking for krb5_init_context in -lkrb5" >&5
-+echo "configure:5428: checking for krb5_init_context in -lkrb5" >&5
+-echo "configure:5335: checking for krb5_init_context in -lkrb5" >&5
++echo "configure:5442: checking for krb5_init_context in -lkrb5" >&5
  ac_lib_var=`echo krb5'_'krb5_init_context | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5325,7 +5432,7 @@
+@@ -5339,7 +5446,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lkrb5  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5329 "configure"
-+#line 5436 "configure"
+-#line 5343 "configure"
++#line 5450 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5336,7 +5443,7 @@
+@@ -5350,7 +5457,7 @@
  krb5_init_context()
  ; return 0; }
  EOF
--if { (eval echo configure:5340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5365,7 +5472,7 @@
+@@ -5379,7 +5486,7 @@
  fi
  
    echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
--echo "configure:5369: checking for gss_init_sec_context in -lgssapi_krb5" >&5
-+echo "configure:5476: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+-echo "configure:5383: checking for gss_init_sec_context in -lgssapi_krb5" >&5
++echo "configure:5490: checking for gss_init_sec_context in -lgssapi_krb5" >&5
  ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5373,7 +5480,7 @@
+@@ -5387,7 +5494,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lgssapi_krb5 -lkrb5 $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5377 "configure"
-+#line 5484 "configure"
+-#line 5391 "configure"
++#line 5498 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5384,7 +5491,7 @@
+@@ -5398,7 +5505,7 @@
  gss_init_sec_context()
  ; return 0; }
  EOF
--if { (eval echo configure:5388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5444,7 +5551,7 @@
+@@ -5458,7 +5565,7 @@
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
@@ -2575,7 +2573,7 @@ $NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
-@@ -5511,7 +5618,7 @@
+@@ -5525,7 +5632,7 @@
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
@@ -2584,7 +2582,7 @@ $NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
-@@ -5531,9 +5638,11 @@
+@@ -5545,9 +5652,11 @@
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
@@ -2596,7 +2594,7 @@ $NetBSD: patch-ba,v 1.5 1999/01/24 05:55:40 mycroft Exp $
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
-@@ -5559,6 +5668,7 @@
+@@ -5573,6 +5682,7 @@
  s%@host_os@%$host_os%g
  s%@CC@%$CC%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g