summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/qpopper/Makefile26
-rw-r--r--mail/qpopper/files/md55
-rw-r--r--mail/qpopper/files/patch-sum13
-rw-r--r--mail/qpopper/patches/patch-aa28
-rw-r--r--mail/qpopper/patches/patch-ab46
-rw-r--r--mail/qpopper/patches/patch-ac1229
-rw-r--r--mail/qpopper/patches/patch-ad184
-rw-r--r--mail/qpopper/patches/patch-ae39
-rw-r--r--mail/qpopper/patches/patch-af13
-rw-r--r--mail/qpopper/patches/patch-ag106
-rw-r--r--mail/qpopper/patches/patch-ah62
-rw-r--r--mail/qpopper/patches/patch-ai23
-rw-r--r--mail/qpopper/patches/patch-aj22
-rw-r--r--mail/qpopper/patches/patch-ak48
14 files changed, 15 insertions, 1829 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index fa2766293e7..d5a3023b30e 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.23 2000/09/09 19:40:19 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2000/12/11 17:23:01 itojun Exp $
#
-DISTNAME= qpopper2.53
-PKGNAME= qpopper-2.53
+DISTNAME= qpopper3.1.2
+PKGNAME= qpopper-3.1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
-EXTRACT_SUFX= .tar.Z
+
+PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/
+PATCHFILES= qpopper3.1.2-ipv6-20001210.diff.gz
+PATCH_DIST_STRIP= -p1
MAINTAINER= mellon@fugue.com
HOMEPAGE= http://eudora.qualcomm.com/freeware/qpop.html
@@ -17,11 +20,6 @@ CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec \
.include "../../mk/bsd.prefs.mk"
-.if defined(USE_KERBEROS4)
-CONFIGURE_ARGS+=--enable-kerberos
-CRYPTO= yes
-.endif
-
BUILD_DEFS+= QPOPPER_SERVERMODE USE_INET6
.include "../../mk/bsd.prefs.mk"
@@ -36,12 +34,12 @@ CONFIGURE_ENV+= O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
# popper makefile doesn't have an install target...
do-install:
(cd ${WRKSRC}; \
- ${INSTALL_PROGRAM} popper ${PREFIX}/libexec/qpopper; \
- ${INSTALL} -o root -c -g ${BINGRP} -m 4755 popauth \
+ ${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec/qpopper; \
+ ${INSTALL} -o root -c -g ${BINGRP} -m 4755 popper/popauth \
${PREFIX}/bin/qpopauth; \
- ${INSTALL_MAN} popper.8 ${PREFIX}/man/man8/qpopper.8; \
- ${INSTALL_MAN} popauth.8 ${PREFIX}/man/man8/qpopauth.8 ; \
- ${INSTALL_MAN} License ${PREFIX}/share/doc/qpopper.License \
+ ${INSTALL_MAN} man/popper.8 ${PREFIX}/man/man8/qpopper.8; \
+ ${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/qpopauth.8 ; \
+ ${INSTALL_MAN} License.txt ${PREFIX}/share/doc/qpopper.License \
)
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/files/md5 b/mail/qpopper/files/md5
index 12066b7da1a..e60dbe70260 100644
--- a/mail/qpopper/files/md5
+++ b/mail/qpopper/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.6 1999/07/09 15:58:34 itojun Exp $
+$NetBSD: md5,v 1.7 2000/12/11 17:23:02 itojun Exp $
-MD5 (qpopper2.53.tar.Z) = fc8ef705510369692ca514808423b723
+MD5 (qpopper3.1.2.tar.gz) = b7776c45b94bd1b937ae8ad3559da45d
+MD5 (qpopper3.1.2-ipv6-20001210.diff.gz) = 952e9998461a51adb03a29539dbdd117
diff --git a/mail/qpopper/files/patch-sum b/mail/qpopper/files/patch-sum
deleted file mode 100644
index 45e708b2cfe..00000000000
--- a/mail/qpopper/files/patch-sum
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-sum,v 1.10 2000/06/03 20:30:26 tron Exp $
-
-MD5 (patch-aa) = 84e82919959c11bc713d467b238286b2
-MD5 (patch-ab) = 49bd44f8866a35504dd4017d0ac3f546
-MD5 (patch-ac) = 6fe9ac8f096217824be9adf7a9b10a80
-MD5 (patch-ad) = caa8837a2df9af1b8c56a73992906a9a
-MD5 (patch-ae) = 226b6c8a515d37f631a1983f68eab2a3
-MD5 (patch-af) = 4fc4ebc25499f90fd92274a76b7df5e3
-MD5 (patch-ag) = a5f017474ee6242dc87c8773255070af
-MD5 (patch-ah) = 69ace9a7b4e0be37596fd77e592bb3c1
-MD5 (patch-ai) = c5a6a595f51f68999e1e4e6d7c05d9e9
-MD5 (patch-aj) = b88fbeb3afc4eb785c0d036e5c96fa5a
-MD5 (patch-ak) = 88ea2e8b0677857e0cd39f8cf722a573
diff --git a/mail/qpopper/patches/patch-aa b/mail/qpopper/patches/patch-aa
deleted file mode 100644
index 8a8862efdb2..00000000000
--- a/mail/qpopper/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/09/15 21:30:59 tron Exp $
-
---- config.h.in.orig Fri Jul 10 01:44:06 1998
-+++ config.h.in Wed Sep 15 23:28:17 1999
-@@ -39,6 +39,7 @@
- #undef DEBUG
- #undef APOP
- #undef POPUID
-+#undef KERBEROS
- #undef GDBM
- /*
- * Define this macro if your system supports special authorization
-@@ -166,6 +167,15 @@
-
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-+
-+/* Define if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-
- /* Define if you have the cposix library (-lcposix). */
- #undef HAVE_LIBCPOSIX
diff --git a/mail/qpopper/patches/patch-ab b/mail/qpopper/patches/patch-ab
deleted file mode 100644
index 4eb34aa7937..00000000000
--- a/mail/qpopper/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/09/15 21:30:59 tron Exp $
-
---- configure.in.orig Fri Jul 10 01:44:06 1998
-+++ configure.in Wed Sep 15 23:28:17 1999
-@@ -13,7 +13,7 @@
- fi
- if test "$GCC" = yes
- then
-- CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
-+ CFLAGS="$CFLAGS -fstrength-reduce "
- fi
- AC_SUBST(CC)
- AC_SUBST(CFLAGS)
-@@ -195,10 +195,12 @@
- syslog.h \
- net/errno.h \
- unistd.h \
-+stdlib.h \
-+string.h \
-+time.h \
- netinet/in.h \
- maillock.h \
- ndbm.h \
--gdbm.h \
- dbm.h \
- shadow.h \
- )
-@@ -209,10 +211,17 @@
- AC_CHECK_LIB(socket, socket, NETWORK_LIBS="$NETWORK_LIBS -lsocket")
- AC_CHECK_LIB(resolv, res_init, NETWORK_LIBS="$NETWORK_LIBS -lresolv")
- AC_CHECK_LIB(mail, maillock, NETWORK_LIBS="$NETWORK_LIBS -lmail"; AC_DEFINE(MAILOCK))
-+AC_ARG_ENABLE(kerberos,
-+ [ --enable-kerberos compile in Kerberos authentification support],
-+ [with_kerberos=$enableval],
-+ [with_kerberos=no])
-+if test "$with_kerberos" = "yes" ;then
- AC_CHECK_LIB(krb, krb_recvauth, KERBEROS_LIBS="$KERBEROS_LIBS -lkrb")
-+AC_CHECK_LIB(des, des_set_key, KERBEROS_LIBS="$KERBEROS_LIBS -ldes")
-+AC_DEFINE(KERBEROS)
-+fi
- AC_CHECK_LIB(ndbm, dbm_open, DBM_LIBS="-lndbm")
- AC_CHECK_LIB(dbm, dbm_open, DBM_LIBS="-ldbm")
--AC_CHECK_LIB(gdbm, gdbm_open, DBM_LIBS="-lgdbm"; AC_DEFINE(GDBM))
- AC_CHECK_LIB(security, set_auth_parameters, LIBS="$LIBS -lsecurity")
- AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
- AC_CHECK_LIB(shadow, pw_encrypt, LIBS="$LIBS -lshadow")
diff --git a/mail/qpopper/patches/patch-ac b/mail/qpopper/patches/patch-ac
deleted file mode 100644
index 483c18a9622..00000000000
--- a/mail/qpopper/patches/patch-ac
+++ /dev/null
@@ -1,1229 +0,0 @@
-$NetBSD: patch-ac,v 1.9 1999/09/15 21:30:59 tron Exp $
-
---- configure.orig Fri Jul 10 01:44:06 1998
-+++ configure Wed Sep 15 23:28:18 1999
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -23,6 +23,8 @@
- --enable-apop=path Set the pop.auth file path [/etc/pop.auth]"
- ac_help="$ac_help
- --with-apopuid=pop Set the user who would own the pop.auth file. [pop]"
-+ac_help="$ac_help
-+ --enable-kerberos compile in Kerberos authentification support"
-
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -61,6 +63,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -344,7 +347,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -514,9 +517,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -533,7 +538,7 @@
-
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:542: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -562,15 +567,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:566: checking for $ac_word" >&5
-+echo "configure:571: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
-@@ -591,16 +597,17 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:595: checking for $ac_word" >&5
-+echo "configure:601: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- for ac_dir in $PATH; do
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -635,25 +642,61 @@
- echo "$ac_t""no" 1>&6
- fi
-
-+ if test -z "$CC"; then
-+ case "`uname -s`" in
-+ *win32* | *WIN32*)
-+ # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:652: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="cl"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+ esac
-+ fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:643: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:684: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
--cat > conftest.$ac_ext <<EOF
--#line 653 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 695 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -667,18 +710,24 @@
- ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:677: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:726: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:682: checking whether we are using GNU C" >&5
-+echo "configure:731: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -687,7 +736,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -698,11 +747,15 @@
-
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-- ac_test_CFLAGS="${CFLAGS+set}"
-- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS=
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:706: checking whether ${CC-cc} accepts -g" >&5
-+else
-+ GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:759: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -717,20 +770,24 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-- elif test $ac_cv_prog_cc_g = yes; then
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
-- CFLAGS="-O2"
-+ CFLAGS="-g"
- fi
- else
-- GCC=
-- test "${CFLAGS+set}" = set || CFLAGS="-g"
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
-
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:734: checking for POSIXized ISC" >&5
-+echo "configure:791: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -753,7 +810,7 @@
- if test "$ISC" = yes
- then
- echo $ac_n "checking for main in -lcposix""... $ac_c" 1>&6
--echo "configure:757: checking for main in -lcposix" >&5
-+echo "configure:814: checking for main in -lcposix" >&5
- ac_lib_var=`echo cposix'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -761,14 +818,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcposix $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 765 "configure"
-+#line 822 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:829: \"$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
-@@ -796,7 +853,7 @@
- fi
-
- echo $ac_n "checking for bzero in -linet""... $ac_c" 1>&6
--echo "configure:800: checking for bzero in -linet" >&5
-+echo "configure:857: checking for bzero in -linet" >&5
- ac_lib_var=`echo inet'_'bzero | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -804,7 +861,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-linet $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 808 "configure"
-+#line 865 "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
-@@ -815,7 +872,7 @@
- bzero()
- ; return 0; }
- EOF
--if { (eval echo configure:819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:876: \"$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
-@@ -838,7 +895,7 @@
- fi
- if test "$GCC" = yes
- then
-- CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
-+ CFLAGS="$CFLAGS -fstrength-reduce "
- fi
-
-
-@@ -1014,7 +1071,7 @@
-
-
- echo $ac_n "checking size of unsigned long int""... $ac_c" 1>&6
--echo "configure:1018: checking size of unsigned long int" >&5
-+echo "configure:1075: checking size of unsigned long int" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1022,7 +1079,7 @@
- ac_cv_sizeof_unsigned_long_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 1026 "configure"
-+#line 1083 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- main()
-@@ -1033,7 +1090,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:1037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_sizeof_unsigned_long_int=`cat conftestval`
- else
-@@ -1054,7 +1111,7 @@
-
-
- echo $ac_n "checking for sendmail program""... $ac_c" 1>&6
--echo "configure:1058: checking for sendmail program" >&5
-+echo "configure:1115: checking for sendmail program" >&5
- if test -x /usr/sbin/sendmail
- then
- cat >> confdefs.h <<\EOF
-@@ -1081,7 +1138,7 @@
- exit 1
- fi
- echo $ac_n "checking for mail spool directory""... $ac_c" 1>&6
--echo "configure:1085: checking for mail spool directory" >&5
-+echo "configure:1142: checking for mail spool directory" >&5
- if test -d /usr/mail
- then
- cat >> confdefs.h <<\EOF
-@@ -1164,7 +1221,7 @@
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1168: checking how to run the C preprocessor" >&5
-+echo "configure:1225: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -1179,14 +1236,14 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 1183 "configure"
-+#line 1240 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1246: \"$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
- :
- else
-@@ -1196,14 +1253,31 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 1200 "configure"
-+#line 1257 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1263: \"$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
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -nologo -E"
-+ cat > conftest.$ac_ext <<EOF
-+#line 1274 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1280: \"$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
- :
- else
-@@ -1216,6 +1290,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
- ac_cv_prog_CPP="$CPP"
- fi
- CPP="$ac_cv_prog_CPP"
-@@ -1225,12 +1301,12 @@
- echo "$ac_t""$CPP" 1>&6
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1229: checking for ANSI C header files" >&5
-+echo "configure:1305: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1234 "configure"
-+#line 1310 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1238,8 +1314,8 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1318: \"$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*
- ac_cv_header_stdc=yes
-@@ -1255,7 +1331,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1259 "configure"
-+#line 1335 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1273,7 +1349,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1277 "configure"
-+#line 1353 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1294,7 +1370,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1298 "configure"
-+#line 1374 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1305,7 +1381,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1333,12 +1409,12 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1337: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:1413: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1342 "configure"
-+#line 1418 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -1346,7 +1422,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:1350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -1371,7 +1447,7 @@
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
- echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1375: checking for opendir in -ldir" >&5
-+echo "configure:1451: checking for opendir in -ldir" >&5
- ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1379,7 +1455,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldir $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1383 "configure"
-+#line 1459 "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
-@@ -1390,7 +1466,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1470: \"$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
-@@ -1412,7 +1488,7 @@
-
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1416: checking for opendir in -lx" >&5
-+echo "configure:1492: checking for opendir in -lx" >&5
- ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1420,7 +1496,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lx $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1424 "configure"
-+#line 1500 "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
-@@ -1431,7 +1507,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1511: \"$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
-@@ -1454,12 +1530,12 @@
- fi
-
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:1458: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo "configure:1534: checking for sys/wait.h that is POSIX.1 compatible" >&5
- if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1463 "configure"
-+#line 1539 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -1475,7 +1551,7 @@
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_sys_wait_h=yes
- else
-@@ -1511,28 +1587,30 @@
- syslog.h \
- net/errno.h \
- unistd.h \
-+stdlib.h \
-+string.h \
-+time.h \
- netinet/in.h \
- maillock.h \
- ndbm.h \
--gdbm.h \
- dbm.h \
- shadow.h \
-
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1525: checking for $ac_hdr" >&5
-+echo "configure:1603: checking for $ac_hdr" >&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 1530 "configure"
-+#line 1608 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1613: \"$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"
-@@ -1560,7 +1638,7 @@
-
-
- echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
--echo "configure:1564: checking for t_accept in -lnsl" >&5
-+echo "configure:1642: checking for t_accept in -lnsl" >&5
- ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1568,7 +1646,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1572 "configure"
-+#line 1650 "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
-@@ -1579,7 +1657,7 @@
- t_accept()
- ; return 0; }
- EOF
--if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1661: \"$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
-@@ -1600,7 +1678,7 @@
- fi
-
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:1604: checking for socket in -lsocket" >&5
-+echo "configure:1682: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1608,7 +1686,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1612 "configure"
-+#line 1690 "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
-@@ -1619,7 +1697,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1701: \"$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
-@@ -1640,7 +1718,7 @@
- fi
-
- echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6
--echo "configure:1644: checking for res_init in -lresolv" >&5
-+echo "configure:1722: checking for res_init in -lresolv" >&5
- ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1648,7 +1726,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1652 "configure"
-+#line 1730 "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
-@@ -1659,7 +1737,7 @@
- res_init()
- ; return 0; }
- EOF
--if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1741: \"$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
-@@ -1680,7 +1758,7 @@
- fi
-
- echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
--echo "configure:1684: checking for maillock in -lmail" >&5
-+echo "configure:1762: checking for maillock in -lmail" >&5
- ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1688,7 +1766,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lmail $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1692 "configure"
-+#line 1770 "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
-@@ -1699,7 +1777,7 @@
- maillock()
- ; return 0; }
- EOF
--if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1781: \"$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
-@@ -1722,8 +1800,17 @@
- echo "$ac_t""no" 1>&6
- fi
-
-+# Check whether --enable-kerberos or --disable-kerberos was given.
-+if test "${enable_kerberos+set}" = set; then
-+ enableval="$enable_kerberos"
-+ with_kerberos=$enableval
-+else
-+ with_kerberos=no
-+fi
-+
-+if test "$with_kerberos" = "yes" ;then
- echo $ac_n "checking for krb_recvauth in -lkrb""... $ac_c" 1>&6
--echo "configure:1727: checking for krb_recvauth in -lkrb" >&5
-+echo "configure:1814: checking for krb_recvauth in -lkrb" >&5
- ac_lib_var=`echo krb'_'krb_recvauth | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1731,7 +1818,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lkrb $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1735 "configure"
-+#line 1822 "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
-@@ -1742,7 +1829,7 @@
- krb_recvauth()
- ; return 0; }
- EOF
--if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1833: \"$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
-@@ -1762,27 +1849,27 @@
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
--echo "configure:1767: checking for dbm_open in -lndbm" >&5
--ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for des_set_key in -ldes""... $ac_c" 1>&6
-+echo "configure:1854: checking for des_set_key in -ldes" >&5
-+ac_lib_var=`echo des'_'des_set_key | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lndbm $LIBS"
-+LIBS="-ldes $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1775 "configure"
-+#line 1862 "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
- builtin and then its argument prototype would still apply. */
--char dbm_open();
-+char des_set_key();
-
- int main() {
--dbm_open()
-+des_set_key()
- ; return 0; }
- EOF
--if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1873: \"$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
-@@ -1797,21 +1884,26 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- DBM_LIBS="-lndbm"
-+ KERBEROS_LIBS="$KERBEROS_LIBS -ldes"
- else
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
--echo "configure:1807: checking for dbm_open in -ldbm" >&5
--ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
-+cat >> confdefs.h <<\EOF
-+#define KERBEROS 1
-+EOF
-+
-+fi
-+echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
-+echo "configure:1899: checking for dbm_open in -lndbm" >&5
-+ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-ldbm $LIBS"
-+LIBS="-lndbm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1815 "configure"
-+#line 1907 "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
-@@ -1822,7 +1914,7 @@
- dbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1918: \"$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
-@@ -1837,32 +1929,32 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- DBM_LIBS="-ldbm"
-+ DBM_LIBS="-lndbm"
- else
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
--echo "configure:1847: checking for gdbm_open in -lgdbm" >&5
--ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-+echo "configure:1939: checking for dbm_open in -ldbm" >&5
-+ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lgdbm $LIBS"
-+LIBS="-ldbm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1855 "configure"
-+#line 1947 "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
- builtin and then its argument prototype would still apply. */
--char gdbm_open();
-+char dbm_open();
-
- int main() {
--gdbm_open()
-+dbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1958: \"$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
-@@ -1877,16 +1969,13 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- DBM_LIBS="-lgdbm"; cat >> confdefs.h <<\EOF
--#define GDBM 1
--EOF
--
-+ DBM_LIBS="-ldbm"
- else
- echo "$ac_t""no" 1>&6
- fi
-
- echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
--echo "configure:1890: checking for set_auth_parameters in -lsecurity" >&5
-+echo "configure:1979: checking for set_auth_parameters in -lsecurity" >&5
- ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1894,7 +1983,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsecurity $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1898 "configure"
-+#line 1987 "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
-@@ -1905,7 +1994,7 @@
- set_auth_parameters()
- ; return 0; }
- EOF
--if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1998: \"$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
-@@ -1926,7 +2015,7 @@
- fi
-
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:1930: checking for crypt in -lcrypt" >&5
-+echo "configure:2019: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1934,7 +2023,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1938 "configure"
-+#line 2027 "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
-@@ -1945,7 +2034,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2038: \"$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
-@@ -1966,7 +2055,7 @@
- fi
-
- echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
--echo "configure:1970: checking for pw_encrypt in -lshadow" >&5
-+echo "configure:2059: checking for pw_encrypt in -lshadow" >&5
- ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1974,7 +2063,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lshadow $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1978 "configure"
-+#line 2067 "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
-@@ -1985,7 +2074,7 @@
- pw_encrypt()
- ; return 0; }
- EOF
--if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2078: \"$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
-@@ -2013,12 +2102,12 @@
-
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:2017: checking for working const" >&5
-+echo "configure:2106: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2022 "configure"
-+#line 2111 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -2067,7 +2156,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -2088,12 +2177,12 @@
- fi
-
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:2092: checking for uid_t in sys/types.h" >&5
-+echo "configure:2181: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2097 "configure"
-+#line 2186 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -2122,12 +2211,12 @@
- fi
-
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:2126: checking for off_t" >&5
-+echo "configure:2215: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2131 "configure"
-+#line 2220 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -2136,7 +2225,7 @@
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_off_t=yes
- else
-@@ -2155,12 +2244,12 @@
- fi
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:2159: checking for size_t" >&5
-+echo "configure:2248: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2164 "configure"
-+#line 2253 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -2169,7 +2258,7 @@
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_size_t=yes
- else
-@@ -2188,12 +2277,12 @@
- fi
-
- echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
--echo "configure:2192: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-+echo "configure:2281: checking for sys_siglist declaration in signal.h or unistd.h" >&5
- if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2197 "configure"
-+#line 2286 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -2205,7 +2294,7 @@
- char *msg = *(sys_siglist + 1);
- ; return 0; }
- EOF
--if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_decl_sys_siglist=yes
- else
-@@ -2227,12 +2316,12 @@
-
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:2231: checking return type of signal handlers" >&5
-+echo "configure:2320: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2236 "configure"
-+#line 2325 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -2249,7 +2338,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -2268,12 +2357,12 @@
-
-
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:2272: checking for vprintf" >&5
-+echo "configure:2361: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2277 "configure"
-+#line 2366 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
-@@ -2296,7 +2385,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_vprintf=yes"
- else
-@@ -2320,12 +2409,12 @@
-
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:2324: checking for _doprnt" >&5
-+echo "configure:2413: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2329 "configure"
-+#line 2418 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); below. */
-@@ -2348,7 +2437,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func__doprnt=yes"
- else
-@@ -2386,12 +2475,12 @@
-
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2390: checking for $ac_func" >&5
-+echo "configure:2479: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2395 "configure"
-+#line 2484 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2414,7 +2503,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2463,7 +2552,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 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -2530,7 +2619,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)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2549,9 +2638,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
diff --git a/mail/qpopper/patches/patch-ad b/mail/qpopper/patches/patch-ad
deleted file mode 100644
index 65f99fb3581..00000000000
--- a/mail/qpopper/patches/patch-ad
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/09/15 21:30:59 tron Exp $
-
---- pop_init.c.orig Fri Jul 10 01:44:07 1998
-+++ pop_init.c Wed Sep 15 23:28:18 1999
-@@ -44,6 +44,8 @@
-
- #include <popper.h>
-
-+#include "sockunion.h"
-+
- /* CNS Kerberos IV */
- #ifdef KERBEROS
- AUTH_DAT kdata;
-@@ -75,9 +77,37 @@
- }
- #endif
-
-+char *
-+sock_ntop(p)
-+ struct sockaddr *p;
-+{
-+#ifdef INET6
-+ static char ntop_buf[INET6_ADDRSTRLEN];
-+#else
-+ static char ntop_buf[INET_ADDRSTRLEN];
-+#endif
-+ union sockunion *su;
-+
-+ su = (union sockunion *)p;
-+ switch (su->su_family) {
-+ case AF_INET:
-+ inet_ntop(su->su_family, &su->su_sin.sin_addr, ntop_buf,
-+ sizeof(ntop_buf));
-+ return ntop_buf;
-+#ifdef INET6
-+ case AF_INET6:
-+ inet_ntop(su->su_family, &su->su_sin6.sin6_addr, ntop_buf,
-+ sizeof(ntop_buf));
-+ return ntop_buf;
-+#endif
-+ default:
-+ return "(unsupported AF)";
-+ }
-+}
-+
- authenticate(p, addr)
- POP *p;
-- struct sockaddr_in *addr;
-+ union sockunion *addr;
- {
-
- #ifdef KERBEROS
-@@ -87,10 +117,10 @@
- char version[9];
- int auth;
-
-- if (p->kerberos) {
-+ if (p->kerberos && addr->su_family == AF_INET) { /*XXX*/
- strcpy(instance, "*");
- auth = krb_recvauth(0L, 0, &ticket, KERBEROS_SERVICE, instance,
-- addr, (struct sockaddr_in *) NULL,
-+ (struct sockaddr_in *)addr, (struct sockaddr_in *) NULL,
- &kdata, "", schedule, version);
-
- if (auth != KSUCCESS) {
-@@ -105,7 +135,7 @@
- # ifdef DEBUG
- if (p->debug)
- pop_log(p, POP_DEBUG, "%s.%s@%s (%s): ok", kdata.pname,
-- kdata.pinst, kdata.prealm, inet_ntoa(addr->sin_addr));
-+ kdata.pinst, kdata.prealm, sock_ntop(addr));
- # endif /* DEBUG */
-
- strncpy(p->user, kdata.pname, sizeof(p->user));
-@@ -126,7 +156,7 @@
- char ** argmessage;
- {
-
-- struct sockaddr_in cs; /* Communication parameters */
-+ union sockunion cs; /* Communication parameters */
- struct hostent * ch; /* Client host information */
- int errflag = 0;
- int c;
-@@ -272,13 +302,25 @@
-
- /* Save the dotted decimal form of the client's IP address
- in the POP parameter block */
-- p->ipaddr = (char *)strdup(inet_ntoa(cs.sin_addr));
-+ p->ipaddr = (char *)strdup(sock_ntop(&cs));
-
- /* Save the client's port */
-- p->ipport = ntohs(cs.sin_port);
-+ p->ipport = ntohs(cs.su_port);
-
- /* Get the canonical name of the host to whom I am speaking */
-- ch = gethostbyaddr((char *) &cs.sin_addr, sizeof(cs.sin_addr), AF_INET);
-+ switch (cs.su_family) {
-+ case AF_INET:
-+ ch = gethostbyaddr((char *) &cs.su_sin.sin_addr, sizeof(cs.su_sin.sin_addr), AF_INET);
-+ break;
-+#ifdef INET6
-+ case AF_INET6:
-+ ch = gethostbyaddr((char *) &cs.su_sin6.sin6_addr, sizeof(cs.su_sin6.sin6_addr), AF_INET6);
-+ break;
-+#endif
-+ default:
-+ ch = NULL;
-+ break;
-+ }
- if (ch == NULL){
- pop_log(p,POP_PRIORITY,
- "(v%s) Unable to get canonical name of client, err = %d",
-@@ -320,6 +362,7 @@
-
- strncpy(h_name, ch->h_name, sizeof(h_name));
-
-+#ifndef INET6
- /* See if the name obtained for the client's IP
- address returns an address */
- if ((ch_again = gethostbyname(h_name)) == NULL) {
-@@ -336,7 +379,7 @@
- /* Look for the client's IP address in the list returned
- for its name */
- for (addrp=ch_again->h_addr_list; *addrp; ++addrp)
-- if (bcmp(*addrp,&(cs.sin_addr),sizeof(cs.sin_addr)) == 0) break;
-+ if (bcmp(*addrp,&(cs.su_sin.sin_addr),sizeof(cs.su_sin.sin_addr)) == 0) break;
-
- if (!*addrp) {
- pop_log (p,POP_PRIORITY,
-@@ -345,6 +388,54 @@
- p->client = p->ipaddr;
- }
- }
-+#else
-+ {
-+ struct addrinfo hints, *res;
-+ int error;
-+
-+ p->client = (char *)strdup(ch->h_name);
-+
-+ /*
-+ * See if the name obtained for the client's IP
-+ * address returns an address
-+ */
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_flags = AI_CANONNAME;
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ error = getaddrinfo(h_name, NULL, &hints, &res);
-+ if (error) {
-+ pop_log(p,POP_PRIORITY,
-+ "Client at \"%s\" resolves to an unknown host name \"%s\"",
-+ p->ipaddr, h_name);
-+ p->client = p->ipaddr;
-+ } else {
-+ for ( ; res; res = res->ai_next) {
-+ if (res->ai_addr->sa_family == AF_INET) {
-+ if (!memcmp(&((struct sockaddr_in *)res->ai_addr)->sin_addr,
-+ &(cs.su_sin.sin_addr), sizeof(cs.su_sin.sin_addr))) {
-+ break;
-+ }
-+ } else if (res->ai_addr->sa_family == AF_INET6) {
-+ if (!memcmp(&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
-+ &(cs.su_sin6.sin6_addr), sizeof(cs.su_sin6.sin6_addr))) {
-+ break;
-+ }
-+ } else {
-+ break;
-+ }
-+ }
-+
-+ if (!res) {
-+ pop_log (p,POP_PRIORITY,
-+ "Client address \"%s\" not listed for its host name \"%s\"",
-+ p->ipaddr,h_name);
-+ p->client = p->ipaddr;
-+ }
-+ }
-+ }
-+#endif
-
- #ifdef RES_DEFNAMES
- /*
diff --git a/mail/qpopper/patches/patch-ae b/mail/qpopper/patches/patch-ae
deleted file mode 100644
index fd43efb4fa1..00000000000
--- a/mail/qpopper/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.9 1999/09/15 21:36:35 tron Exp $
-
---- popauth.8.orig Fri Jul 10 01:44:08 1998
-+++ popauth.8 Wed Sep 15 23:28:17 1999
-@@ -5,22 +5,22 @@
--.TH POPAUTH 8
-+.TH QPOPAUTH 8
- .SH NAME
--popauth - manipulate POP authorization DB
-+qpopauth - manipulate POP authorization DB
- .SH SYNOPSIS
--popauth
-+qpopauth
- \%[\-init] \%[\-list] \%[\-delete\ name] \%[\-user\ name]
- \%[\-help]
- .SH DESCRIPTION
--The \fIpopauth\fR program allows a POP-subscriber to change the secret
-+The \fIqpopauth\fR program allows a POP-subscriber to change the secret
- value used to generate their authentication credentials.
- In addition,
- the super\-user or master POP user may use this program to either
- add or remove a user, or to print public information from it. Only the
--super\-user may initialize the database. \fIpopauth\fR is useful only when
-+super\-user may initialize the database. \fIqpopauth\fR is useful only when
- the APOP configuration option is defined. (This configuration option defines
- the name of the POP authorization DB.)
-
- Under normal usage,
--\fIpopauth\fR prompts for a new secret,
-+\fIqpopauth\fR prompts for a new secret,
- just like the \fIpasswd\fR program.
- It then updates the POP authorization DB accordingly.
-
-@@ -38,4 +38,4 @@
- .SH ACKNOWLEDGEMENTS
- This program was derived from MH 6.8.3
- .SH SEE ALSO
--popper(8)
-+qpopper(8)
diff --git a/mail/qpopper/patches/patch-af b/mail/qpopper/patches/patch-af
deleted file mode 100644
index dc6ca2e0544..00000000000
--- a/mail/qpopper/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 1999/09/15 21:30:59 tron Exp $
-
---- popauth.c.orig Fri Jul 10 01:44:08 1998
-+++ popauth.c Wed Sep 15 23:28:17 1999
-@@ -47,7 +47,7 @@
- #include <sys/file.h>
- #endif
-
--#ifdef BSDI
-+#if defined (BSDI) || defined (__NetBSD__)
- #define BSD44_DBM
- #endif
-
diff --git a/mail/qpopper/patches/patch-ag b/mail/qpopper/patches/patch-ag
deleted file mode 100644
index 7fdd567272e..00000000000
--- a/mail/qpopper/patches/patch-ag
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-ag,v 1.6 1999/09/15 21:30:59 tron Exp $
-
---- popper.8.orig Fri Jul 10 01:44:08 1998
-+++ popper.8 Wed Sep 15 23:28:17 1999
-@@ -10,11 +10,11 @@
- .\"
- .\" @(#)@(#)popper.8 2.3 2.3 (CCS) 4/2/91 Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n
- .\"
--.TH popper 8 "August 1990"
-+.TH qpopper 8 "August 1990"
- .UC 6
- .ad
- .SH NAME
--popper \- pop 3 server
-+qpopper \- Qualcomm pop 3 server
- .SH SYNOPSIS
- .B /usr/etc/popper
- [ -d ]
-@@ -24,7 +24,7 @@
- [ -T timeout]
- [ -b bulldir]
- .SH DESCRIPTION
--.I Popper
-+.I Qpopper
- is an implementation of the Post Office Protocol server that runs on a
- variety of Unix computers to manage electronic mail for Macintosh
- and MS-DOS computers. The server was developed at the University of
-@@ -42,12 +42,12 @@
- .PP
- The
- .B \-k
--flag enables kerberos authentication when popper has been compiled with
-+flag enables kerberos authentication when qpopper has been compiled with
- the KERBEROS define. You must already have libraries that support Kerberos.
- .PP
- The
- .B \-s
--flag turns on statistics logging using syslog(8). At the end of each popper
-+flag turns on statistics logging using syslog(8). At the end of each qpopper
- session, the following information is logged: username, number of
- messages deleted, number of bytes deleted, number of message left on server,
- number of bytes left on server.
-@@ -58,7 +58,7 @@
- session with a pop client.
- When the server is waiting for a command to arrive from the client, it
- times out after the specified number of seconds and terminates the session.
--This avoids having popper processes hang forever waiting for command input
-+This avoids having qpopper processes hang forever waiting for command input
- from clients which have terminated abnormally.
- A small value is ok for small to medium nets where
- the network delay is within a few seconds. In this case 15-30 seconds is
-@@ -99,19 +99,19 @@
- is replaced by "To: username@thishost", and any "Status:" header lines are
- deleted. Otherwise, the bulletin is copied as is.
- .PP
--When a new user checks for mail the first time, popper creates the .popbull
-+When a new user checks for mail the first time, qpopper creates the .popbull
- file in the user's home directory and seeds it with the current maximum
- bulletin number. Thus new users do not get old bulletins.
- .SH THE POP TRANSACTION CYCLE
- .PP
--The Berkeley POP server is a single program (called popper) that is
-+The Qualcomm POP server is a single program (called qpopper) that is
- launched by inetd when it gets a service request on the POP TCP port.
- (The official port number specified in RFC 1081 for POP version 3 is
- port 110. However, some POP3 clients attempt to contact the server at
- port 109, the POP version 2 port. Unless you are running both POP2 and
- POP3 servers, you can simply define both ports for use by the POP3
- server. This is explained in the installation instructions later on.)
--The popper program initializes and verifies that the peer IP address is
-+The qpopper program initializes and verifies that the peer IP address is
- registered in the local domain, logging a warning message when a
- connection is made to a client whose IP address does not have a
- canonical name. For systems using BSD 4.3 bind, it also checks to see
-@@ -122,7 +122,7 @@
- server's host machine. No other exchanges are allowed during this
- state (other than a request to quit.) If authentication fails, a
- warning message is logged and the session ends. Once the user is
--identified, popper changes its user and group ids to match that of the
-+identified, qpopper changes its user and group ids to match that of the
- user and enters the transaction state. The server makes a temporary
- copy of the user's maildrop which is
- used for all subsequent transactions. These include the bulk of POP
-@@ -141,18 +141,18 @@
- file, usually /usr/spool/mqueue/syslog.
- .SH DEBUGGING
- .PP
--The popper program will log debugging information when the -d parameter
-+The qpopper program will log debugging information when the -d parameter
- is specified after its invocation in the inetd.conf file. Care should
- be exercised in using this option since it generates considerable
- output in the syslog file. Alternatively, the "-t <file-name>" option
- will place debugging information into file "<file-name>" using fprintf
- instead of syslog.
- .PP
--For SunOS version 3.5, the popper program is launched by inetd from
-+For SunOS version 3.5, the qpopper program is launched by inetd from
- /etc/servers. This file does not allow you to specify command line
- arguments. Therefore, if you want to enable debugging, you can specify
--a shell script in /etc/servers to be launched instead of popper and in
--this script call popper with the desired arguments.
-+a shell script in /etc/servers to be launched instead of qpopper and in
-+this script call qpopper with the desired arguments.
- .PP
- You can confirm that the POP server is running on Unix by telneting to
- port 110 (or 109 if you set it up that way). For example:
diff --git a/mail/qpopper/patches/patch-ah b/mail/qpopper/patches/patch-ah
deleted file mode 100644
index 2b9a47eba18..00000000000
--- a/mail/qpopper/patches/patch-ah
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2000/04/24 11:04:18 itojun Exp $
---- popper.h.orig Fri Jul 10 08:44:08 1998
-+++ popper.h Mon Apr 24 19:56:38 2000
-@@ -33,3 +33,3 @@
- #include <sys/param.h>
--# if (defined(BSD) && (BSD >= 199103))
-+# if (defined(BSD) && (BSD >= 199103)) && 0 /* shouldn't be necessary anymore */
- # define HAVE_UNISTD_H
-@@ -40,3 +40,15 @@
-
--#ifdef BSDI
-+#ifdef HAVE_STDLIB_H
-+# include <stdlib.h>
-+#endif
-+
-+#ifdef HAVE_STRING_H
-+# include <string.h>
-+#endif
-+
-+#ifdef HAVE_TIME_H
-+# include <time.h>
-+#endif
-+
-+#if defined (BSDI) || defined (__NetBSD__)
- #define BSD44_DBM
-@@ -62,3 +74,8 @@
- #define MAXDROPLEN 64
--#define MAXLINELEN 1024
-+/*
-+ * This program always assume that fgets return whole line,
-+ * so the buffer must be at least one char bigger than sendmail
-+ * use, because of >From
-+ */
-+#define MAXLINELEN (2048 + 1)
- #define MAXMSGLINELEN MAXLINELEN
-@@ -66,11 +83,11 @@
- #define MAXPARMCOUNT 5
--#define MAXPARMLEN 10
-+#define MAXPARMLEN 32 /* Large enough for 32-byte APOP parm */
- #define ALLOC_MSGS 20
-
--#ifndef OSF1
--# define POP_FACILITY LOG_LOCAL0
--#else
-+#if defined(OSF1) || defined(__NetBSD__)
- # define POP_FACILITY LOG_MAIL
-+#else
-+# define POP_FACILITY LOG_LOCAL0
- #endif
--#define POP_PRIORITY LOG_NOTICE
-+#define POP_PRIORITY LOG_INFO
- #define POP_DEBUG LOG_DEBUG
-@@ -294,3 +311,3 @@
- #ifndef KERBEROS_SERVICE
--# define KERBEROS_SERVICE "rcmd"
-+# define KERBEROS_SERVICE "pop"
- #endif
-@@ -300,3 +317,3 @@
- #else
--# ifdef BSDI
-+# if defined (BSDI) || defined (__NetBSD__)
- # include <kerberosIV/des.h>
diff --git a/mail/qpopper/patches/patch-ai b/mail/qpopper/patches/patch-ai
deleted file mode 100644
index 15b7907383d..00000000000
--- a/mail/qpopper/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ai,v 1.4 1999/09/15 21:30:59 tron Exp $
-
---- sockunion.h.orig Wed Sep 15 23:28:18 1999
-+++ sockunion.h Wed Sep 15 23:28:18 1999
-@@ -0,0 +1,18 @@
-+#ifndef INET_ADDRSTR
-+#define INET_ADDRSTRLEN 16
-+#endif
-+
-+union sockunion {
-+ struct sockinet {
-+ u_char si_len;
-+ u_char si_family;
-+ u_short si_port;
-+ } su_si;
-+ struct sockaddr_in su_sin;
-+#ifdef INET6
-+ struct sockaddr_in6 su_sin6;
-+#endif
-+};
-+#define su_len su_si.si_len
-+#define su_family su_si.si_family
-+#define su_port su_si.si_port
diff --git a/mail/qpopper/patches/patch-aj b/mail/qpopper/patches/patch-aj
deleted file mode 100644
index 29779b15b5a..00000000000
--- a/mail/qpopper/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/09/15 21:38:45 tron Exp $
-
---- pop_apop.c.orig Fri Jul 10 08:44:07 1998
-+++ pop_apop.c Sat Sep 11 09:09:30 1999
-@@ -178,6 +178,8 @@
- dbm_close (db);
- #endif
- return(pop_auth_fail(p, POP_FAILURE, "not authorized"));
-+ } else {
-+ ddatum.dptr = obscure(ddatum.dptr);
- }
-
- #ifdef GDBM
-@@ -189,7 +191,7 @@
-
- MD5Init(&mdContext);
- MD5Update(&mdContext, (unsigned char *)p->md5str, strlen(p->md5str));
-- MD5Update(&mdContext, (unsigned char *)obscure(ddatum.dptr), (ddatum.dsize - 1));
-+ MD5Update(&mdContext, (unsigned char *)ddatum.dptr, (ddatum.dsize - 1));
- MD5Final(digest, &mdContext);
-
- cp = buffer;
diff --git a/mail/qpopper/patches/patch-ak b/mail/qpopper/patches/patch-ak
deleted file mode 100644
index 77b7584072b..00000000000
--- a/mail/qpopper/patches/patch-ak
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/06/03 20:30:28 tron Exp $
-
---- pop_uidl.c.orig Fri Jul 10 01:44:08 1998
-+++ pop_uidl.c Sat Jun 3 22:13:46 2000
-@@ -59,7 +59,7 @@
-
- sprintf(buffer, "%d %s", msg_id, mp->uidl_str);
- if (nl = index(buffer, NEWLINE)) *nl = 0;
-- return (pop_msg (p,POP_SUCCESS, buffer));
-+ return (pop_msg (p,POP_SUCCESS, "%s", buffer));
- }
- } else {
- /* yes, we can do this */
-@@ -98,6 +98,7 @@
- {
- static char buf[MAXLINELEN];
- char *cp;
-+ char *bp;
-
- fseek(p->drop, mp->offset, 0);
- while (fgets(buf, sizeof(buf), p->drop) != NULL) {
-@@ -105,6 +106,8 @@
- if (!strncasecmp("From:", buf, 5)) {
- cp = index(buf, ':');
- while (*++cp && (*cp == ' ' || *cp == '\t'));
-+ if ((bp = index(cp, NEWLINE)) != NULL)
-+ *bp = 0;
- return(cp);
- }
- }
-@@ -149,7 +152,7 @@
- sprintf(buffer, "%d %s", msg_id, mp->uidl_str);
- if (nl = index(buffer, NEWLINE)) *nl = 0;
- sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp));
-- return (pop_msg (p,POP_SUCCESS, buffer));
-+ return (pop_msg (p,POP_SUCCESS, "%s", buffer));
- }
- } else {
- /* yes, we can do this */
-@@ -165,7 +168,7 @@
-
- sprintf(buffer, "%d %s", x, mp->uidl_str);
- if (nl = index(buffer, NEWLINE)) *nl = 0;
-- sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp));
-+ sprintf(buffer, "%s %d %.128s\n", buffer, mp->length, from_hdr(p, mp));
- pop_sendline(p, buffer);
- }
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 13:17:13 +0000