Date: Mon, 27 Dec 1999 21:37:21 -0600 (CST) From: hetzels@westbend.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15732: Upgrade: Cyrus-SASL Message-ID: <199912280337.VAA00454@spare.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 15732
>Category: ports
>Synopsis: Upgrade Cyrus-SASL to use OpenSSL for RC4 routines
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 27 19:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 3.3-STABLE i386
>Organization:
West Bend Internet
>Environment:
>Description:
The Cyrus-SASL port no longer depends on the librc4 port. Starting with
Cyrus-SASL 1.5.13, the SASL library can use either the OpenSSL crypto library
or the RC4 library. Since, the RC4 library can't be exported outside the
US/Canada this leaves the RC4 routines out of the International version of
the library.
Since, the OpenSSL port can be used internationally the Cyrus-SASL port has
been changed to use it instead. This will also benefit the Cyrus-IMAP server
as StartTLS support is being added to the server.
Also, include changes from Garrett Wollman's version of the Cyrus-SASL port.
>How-To-Repeat:
>Fix:
Note to commiter, please remove patch-ac after applying the attached diff:
diff -ruN cyrus-sasl.orig/Makefile cyrus-sasl/Makefile
--- cyrus-sasl.orig/Makefile Sun Dec 26 19:52:20 1999
+++ cyrus-sasl/Makefile Mon Dec 27 21:16:48 1999
@@ -16,6 +16,11 @@
SASL_VER= 1.5.13
+BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl
+LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl
+
+RESTRICTED= "Contains cryptography"
+
Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html
MAN1= sasl_client.1 sasl_server.1
@@ -25,18 +30,19 @@
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
--sysconfdir=${PREFIX}/etc \
- --includedir=${PREFIX}/include/sasl \
--with-plugindir=${PREFIX}/lib/sasl \
- --enable-static \
--with-dbpath=${PREFIX}/etc/sasldb \
- --with-sample \
- --with-rc4
+ --includedir=${PREFIX}/include/sasl \
+ --enable-static \
+ --with-rc4=openssl
+
+.if defined(KRB5_HOME) && exists(${KRB5_HOME})
+CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME}
+.endif
-# --disable-cram
-# Currently, pwcheck doesn't compile
-#CONFIGURE_ARGS+= \
-# --with-pwcheck=/var/pwcheck
+CONFIGURE_ARGS+= \
+ --with-pwcheck=/var/pwcheck
# --with-dbpath=PATH set the DB path to use [/etc/sasldb]
# --with-pam=DIR use PAM (rooted in DIR) [yes]
@@ -50,10 +56,6 @@
# --enable-plain enable PLAIN authentication [yes]
# --with-rc4=DIR use rc4 (look in DIR) [yes]
-# Sample SASL Client/Server
-SAMPLES= sample-client sample-server
-INSTALL_PROG= ${INSTALL} -c -o root -g wheel -m 555
-
DOCS= README README.Y2K TODO INSTALL ChangeLog NEWS
DOC2= draft-newman-auth-scram-03.txt \
@@ -63,17 +65,7 @@
HTDOCS= index programming sysadmin
-# Build the SASL library with RC4 support
-.if defined(USA_RESIDENT) && (${USA_RESIDENT} == YES)
-LIB_DEPENDS= rc4.0:${PORTSDIR}/security/librc4
-CONFIGURE_ARGS+= --with-rc4
-#CONFIGURE_ARGS+= --with-rc4=${PREFIX}
-.endif
-
post-install:
-.for file in ${SAMPLES}
- ${INSTALL_PROG} ${WRKSRC}/sample/${file} ${PREFIX}/sbin
-.endfor
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
# ${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
.if !defined(NOPORTDOCS)
@@ -92,6 +84,18 @@
.endfor
@${ECHO} "@dirrm share/doc/SASL/html" >>${TMPPLIST}
@${ECHO} "@dirrm share/doc/SASL" >>${TMPPLIST}
+.endif
+.if defined(KRB5_HOME) && exists(${KRB5_HOME})
+
+.else
+ cat ${TMPPLIST} | grep -v libgssapiv2 > ${WRKDIR}/tmp.plist
+ mv ${WRKDIR}/tmp.plist ${TMPPLIST}
+.endif
+.if defined(MAKE_EBONES) && exists(/usr/lib/libkrb.a)
+
+.else
+ cat ${TMPPLIST} | grep -v libkerberos4 > ${WRKDIR}/tmp.plist
+ mv ${WRKDIR}/tmp.plist ${TMPPLIST}
.endif
.include <bsd.port.mk>
diff -ruN cyrus-sasl.orig/patches/patch-aa cyrus-sasl/patches/patch-aa
--- cyrus-sasl.orig/patches/patch-aa Sun Dec 26 19:52:22 1999
+++ cyrus-sasl/patches/patch-aa Mon Dec 27 20:48:50 1999
@@ -1,27 +1,1042 @@
--- configure.orig Thu Dec 2 14:10:46 1999
-+++ configure Sun Dec 26 16:47:46 1999
-@@ -617,6 +617,7 @@
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-
-+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -m 755'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -1251,7 +1252,7 @@
++++ configure Sat Dec 4 17:59:43 1999
+@@ -2822,14 +2822,15 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
++
+ LIB_SOCKET=""
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:2828: checking for connect" >&5
++echo "configure:2829: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2833 "configure"
++#line 2834 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -2852,7 +2853,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+ else
+@@ -2870,7 +2871,7 @@
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2874: checking for gethostbyname in -lnsl" >&5
++echo "configure:2875: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2878,7 +2879,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2882 "configure"
++#line 2883 "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
+@@ -2889,7 +2890,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2894: \"$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
+@@ -2910,7 +2911,7 @@
+ fi
+
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:2914: checking for connect in -lsocket" >&5
++echo "configure:2915: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2918,7 +2919,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2922 "configure"
++#line 2923 "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
+@@ -2929,7 +2930,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2934: \"$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
+@@ -2970,7 +2971,7 @@
+ fi
+ cmu_save_LIBS="$LIBS"
+ echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
+-echo "configure:2974: checking for pam_start in -lpam" >&5
++echo "configure:2975: checking for pam_start in -lpam" >&5
+ ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2978,7 +2979,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lpam $SASL_DL_LIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2982 "configure"
++#line 2983 "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
+@@ -2989,7 +2990,7 @@
+ pam_start()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2994: \"$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
+@@ -3006,17 +3007,17 @@
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6
+-echo "configure:3010: checking for security/pam_appl.h" >&5
++echo "configure:3011: checking for security/pam_appl.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 3015 "configure"
++#line 3016 "configure"
+ #include "confdefs.h"
+ #include <security/pam_appl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3021: \"$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*
+@@ -3047,7 +3048,7 @@
+ fi
+
+ echo $ac_n "checking PAM support""... $ac_c" 1>&6
+-echo "configure:3051: checking PAM support" >&5
++echo "configure:3052: checking PAM support" >&5
+ echo "$ac_t""$with_pam" 1>&6
+ LIB_PAM=""
+ if test "$with_pam" != no; then
+@@ -3081,12 +3082,12 @@
+
+ DIRS="$DIRS pwcheck"
+ echo $ac_n "checking for getspnam""... $ac_c" 1>&6
+-echo "configure:3085: checking for getspnam" >&5
++echo "configure:3086: checking for getspnam" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getspnam'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3090 "configure"
++#line 3091 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getspnam(); below. */
+@@ -3109,7 +3110,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getspnam=yes"
+ else
+@@ -3142,7 +3143,7 @@
+
+
+ echo $ac_n "checking CRAM-MD5""... $ac_c" 1>&6
+-echo "configure:3146: checking CRAM-MD5" >&5
++echo "configure:3147: checking CRAM-MD5" >&5
+ if test "$cram" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libcrammd5.la"
+@@ -3161,7 +3162,7 @@
+
+
+ echo $ac_n "checking SCRAM-MD5""... $ac_c" 1>&6
+-echo "configure:3165: checking SCRAM-MD5" >&5
++echo "configure:3166: checking SCRAM-MD5" >&5
+ if test "$scram" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libscrammd5.la"
+@@ -3180,7 +3181,7 @@
+
+
+ echo $ac_n "checking for des_pcbc_encrypt in -ldes""... $ac_c" 1>&6
+-echo "configure:3184: checking for des_pcbc_encrypt in -ldes" >&5
++echo "configure:3185: checking for des_pcbc_encrypt in -ldes" >&5
+ ac_lib_var=`echo des'_'des_pcbc_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
+@@ -3188,7 +3189,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldes $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3192 "configure"
++#line 3193 "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
+@@ -3199,7 +3200,7 @@
+ des_pcbc_encrypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3204: \"$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
+@@ -3239,7 +3240,7 @@
+ fi
+
+ echo $ac_n "checking DIGEST-MD5""... $ac_c" 1>&6
+-echo "configure:3243: checking DIGEST-MD5" >&5
++echo "configure:3244: checking DIGEST-MD5" >&5
+ if test "$digest" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libdigestmd5.la"
+@@ -3260,7 +3261,7 @@
+ if test "$krb4" != no; then
+
+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
+-echo "configure:3264: checking for res_search in -lresolv" >&5
++echo "configure:3265: checking for res_search in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3268,7 +3269,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lresolv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3272 "configure"
++#line 3273 "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
+@@ -3279,7 +3280,7 @@
+ res_search()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3284: \"$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
+@@ -3309,7 +3310,7 @@
+
+ if test -d ${krb4}; then
+ echo $ac_n "checking for Kerberos includes""... $ac_c" 1>&6
+-echo "configure:3313: checking for Kerberos includes" >&5
++echo "configure:3314: checking for Kerberos includes" >&5
+ if eval "test \"`echo '$''{'cyrus_krbinclude'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3335,17 +3336,17 @@
+ if test "$des" != no; then
+ ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for krb.h""... $ac_c" 1>&6
+-echo "configure:3339: checking for krb.h" >&5
++echo "configure:3340: checking for krb.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 3344 "configure"
++#line 3345 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3350: \"$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*
+@@ -3362,7 +3363,7 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ echo $ac_n "checking for krb_mk_priv in -lkrb""... $ac_c" 1>&6
+-echo "configure:3366: checking for krb_mk_priv in -lkrb" >&5
++echo "configure:3367: checking for krb_mk_priv in -lkrb" >&5
+ ac_lib_var=`echo krb'_'krb_mk_priv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3370,7 +3371,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lkrb -ldes $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3374 "configure"
++#line 3375 "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
+@@ -3381,7 +3382,7 @@
+ krb_mk_priv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3386: \"$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
+@@ -3411,7 +3412,7 @@
+ fi
+
+ echo $ac_n "checking KERBEROS_V4""... $ac_c" 1>&6
+-echo "configure:3415: checking KERBEROS_V4" >&5
++echo "configure:3416: checking KERBEROS_V4" >&5
+ if test "$krb4" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libkerberos4.la"
+@@ -3441,17 +3442,17 @@
+ fi
+ ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for gssapi.h""... $ac_c" 1>&6
+-echo "configure:3445: checking for gssapi.h" >&5
++echo "configure:3446: checking for gssapi.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 3450 "configure"
++#line 3451 "configure"
+ #include "confdefs.h"
+ #include <gssapi.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3456: \"$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*
+@@ -3475,17 +3476,17 @@
+ echo "$ac_t""no" 1>&6
+ ac_safe=`echo "gssapi/gssapi.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for gssapi/gssapi.h""... $ac_c" 1>&6
+-echo "configure:3479: checking for gssapi/gssapi.h" >&5
++echo "configure:3480: checking for gssapi/gssapi.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 3484 "configure"
++#line 3485 "configure"
+ #include "confdefs.h"
+ #include <gssapi/gssapi.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3490: \"$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*
+@@ -3513,7 +3514,7 @@
+
+ if test "$gssapi" != no; then
+ echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6
+-echo "configure:3517: checking for db_open in -ldb" >&5
++echo "configure:3518: checking for db_open in -ldb" >&5
+ ac_lib_var=`echo db'_'db_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
+@@ -3521,7 +3522,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldb $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3525 "configure"
++#line 3526 "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
+@@ -3532,7 +3533,7 @@
+ db_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3537: \"$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
+@@ -3562,7 +3563,7 @@
+
+ gss_impl="mit";
+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
+-echo "configure:3566: checking for res_search in -lresolv" >&5
++echo "configure:3567: checking for res_search in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3570,7 +3571,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lresolv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3574 "configure"
++#line 3575 "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
+@@ -3581,7 +3582,7 @@
+ res_search()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3586: \"$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
+@@ -3614,7 +3615,7 @@
+ fi
+
+ echo $ac_n "checking for base64_decode in -lroken""... $ac_c" 1>&6
+-echo "configure:3618: checking for base64_decode in -lroken" >&5
++echo "configure:3619: checking for base64_decode in -lroken" >&5
+ ac_lib_var=`echo roken'_'base64_decode | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3622,7 +3623,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lroken $LIB_CRYPT $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3626 "configure"
++#line 3627 "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
+@@ -3633,7 +3634,7 @@
+ base64_decode()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3638: \"$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
+@@ -3671,7 +3672,7 @@
+
+ if test "$ac_cv_header_gssapi_h" = "yes"; then
+ cat > conftest.$ac_ext <<EOF
+-#line 3675 "configure"
++#line 3676 "configure"
+ #include "confdefs.h"
+ #include <gssapi.h>
+ EOF
+@@ -3687,7 +3688,7 @@
+
+ elif test "$ac_cv_header_gssapi_gssapi_h"; then
+ cat > conftest.$ac_ext <<EOF
+-#line 3691 "configure"
++#line 3692 "configure"
+ #include "confdefs.h"
+ #include <gssapi/gssapi.h>
+ EOF
+@@ -3705,11 +3706,11 @@
+
+ GSSAPI_LIBS=""
+ echo $ac_n "checking GSSAPI""... $ac_c" 1>&6
+-echo "configure:3709: checking GSSAPI" >&5
++echo "configure:3710: checking GSSAPI" >&5
+ if test "$gssapi" != no; then
+ echo "$ac_t""with implementation ${gss_impl}" 1>&6
+ echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
+-echo "configure:3713: checking for dbm_open in -lndbm" >&5
++echo "configure:3714: 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
+@@ -3717,7 +3718,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lndbm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3721 "configure"
++#line 3722 "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
+@@ -3728,7 +3729,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3733: \"$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
+@@ -3749,7 +3750,7 @@
+ fi
+
+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
+-echo "configure:3753: checking for res_search in -lresolv" >&5
++echo "configure:3754: checking for res_search in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3757,7 +3758,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lresolv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3761 "configure"
++#line 3762 "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
+@@ -3768,7 +3769,7 @@
+ res_search()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3773: \"$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
+@@ -3805,7 +3806,7 @@
+
+
+ echo $ac_n "checking ANONYMOUS""... $ac_c" 1>&6
+-echo "configure:3809: checking ANONYMOUS" >&5
++echo "configure:3810: checking ANONYMOUS" >&5
+ if test "$anon" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libanonymous.la"
+@@ -3838,7 +3839,7 @@
+
+
+ echo $ac_n "checking PLAIN""... $ac_c" 1>&6
+-echo "configure:3842: checking PLAIN" >&5
++echo "configure:3843: checking PLAIN" >&5
+ if test "$plain" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS libplain.la"
+@@ -3880,7 +3881,7 @@
+ fi
+ cmu_save_LIBS="$LIBS"
+ echo $ac_n "checking for rc4_init in -lrc4""... $ac_c" 1>&6
+-echo "configure:3884: checking for rc4_init in -lrc4" >&5
++echo "configure:3885: checking for rc4_init in -lrc4" >&5
+ ac_lib_var=`echo rc4'_'rc4_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
+@@ -3888,7 +3889,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lrc4 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3892 "configure"
++#line 3893 "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
+@@ -3899,7 +3900,7 @@
+ rc4_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3904: \"$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
+@@ -3916,17 +3917,17 @@
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "rc4.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for rc4.h""... $ac_c" 1>&6
+-echo "configure:3920: checking for rc4.h" >&5
++echo "configure:3921: checking for rc4.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 3925 "configure"
++#line 3926 "configure"
+ #include "confdefs.h"
+ #include <rc4.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3931: \"$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*
+@@ -3959,16 +3960,60 @@
+
+
+ if test "$with_rc4" = no; then
++
++ LIB_RSAREF=""
++ echo $ac_n "checking for RSAPublicEncrypt in -lrsaref""... $ac_c" 1>&6
++echo "configure:3967: checking for RSAPublicEncrypt in -lrsaref" >&5
++ac_lib_var=`echo rsaref'_'RSAPublicEncrypt | 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="-lrsaref $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 3975 "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 RSAPublicEncrypt();
++
++int main() {
++RSAPublicEncrypt()
++; return 0; }
++EOF
++if { (eval echo configure:3986: \"$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
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
++else
++ echo "$ac_t""no" 1>&6
++cmu_have_rsaref=no
++fi
++
++
+ echo $ac_n "checking for RC4_set_key in -lcrypto""... $ac_c" 1>&6
+-echo "configure:3964: checking for RC4_set_key in -lcrypto" >&5
++echo "configure:4009: checking for RC4_set_key in -lcrypto" >&5
+ ac_lib_var=`echo crypto'_'RC4_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="-lcrypto $LIBS"
++LIBS="-lcrypto $LIB_RSAREF $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3972 "configure"
++#line 4017 "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
+@@ -3979,7 +4024,7 @@
+ RC4_set_key()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4028: \"$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
+@@ -3996,17 +4041,17 @@
+ echo "$ac_t""yes" 1>&6
+ ac_safe=`echo "openssl/rc4.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for openssl/rc4.h""... $ac_c" 1>&6
+-echo "configure:4000: checking for openssl/rc4.h" >&5
++echo "configure:4045: checking for openssl/rc4.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 4005 "configure"
++#line 4050 "configure"
+ #include "confdefs.h"
+ #include <openssl/rc4.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4055: \"$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*
+@@ -4040,12 +4085,11 @@
+ fi
+
+ fi
-
-+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -m 755'
+ LIBS="$cmu_save_LIBS"
+ fi
+
+ echo $ac_n "checking rc4 support""... $ac_c" 1>&6
+-echo "configure:4049: checking rc4 support" >&5
++echo "configure:4093: checking rc4 support" >&5
+ echo "$ac_t""$with_rc4" 1>&6
+
+
+@@ -4054,12 +4098,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:4058: checking for $ac_hdr that defines DIR" >&5
++echo "configure:4102: 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 4063 "configure"
++#line 4107 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -4067,7 +4111,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -4092,7 +4136,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:4096: checking for opendir in -ldir" >&5
++echo "configure:4140: 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
+@@ -4100,7 +4144,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldir $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4104 "configure"
++#line 4148 "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
+@@ -4111,7 +4155,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4159: \"$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
+@@ -4133,7 +4177,7 @@
+
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:4137: checking for opendir in -lx" >&5
++echo "configure:4181: 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
+@@ -4141,7 +4185,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lx $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4145 "configure"
++#line 4189 "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
+@@ -4152,7 +4196,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4200: \"$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
+@@ -4175,12 +4219,12 @@
+ fi
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:4179: checking for ANSI C header files" >&5
++echo "configure:4223: 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 4184 "configure"
++#line 4228 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -4188,7 +4232,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4236: \"$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*
+@@ -4205,7 +4249,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 4209 "configure"
++#line 4253 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -4223,7 +4267,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 4227 "configure"
++#line 4271 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -4244,7 +4288,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 4248 "configure"
++#line 4292 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -4255,7 +4299,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:4259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -4281,12 +4325,12 @@
+ for ac_func in strchr memcpy getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4285: checking for $ac_func" >&5
++echo "configure:4329: 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 4290 "configure"
++#line 4334 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4309,7 +4353,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4357: \"$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
+@@ -4336,12 +4380,12 @@
+
+ sasl_cv_getsubopt=no
+ echo $ac_n "checking for getsubopt""... $ac_c" 1>&6
+-echo "configure:4340: checking for getsubopt" >&5
++echo "configure:4384: checking for getsubopt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getsubopt'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 4345 "configure"
++#line 4389 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getsubopt(); below. */
+@@ -4364,7 +4408,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getsubopt=yes"
+ else
+@@ -4396,12 +4440,12 @@
+ sasl_cv_snprintf=no
+ SNPRINTFOBJS=""
+ echo $ac_n "checking for snprintf""... $ac_c" 1>&6
+-echo "configure:4400: checking for snprintf" >&5
++echo "configure:4444: checking for snprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 4405 "configure"
++#line 4449 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char snprintf(); below. */
+@@ -4424,7 +4468,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_snprintf=yes"
+ else
+@@ -4448,12 +4492,12 @@
+ fi
+
+ echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
+-echo "configure:4452: checking for vsnprintf" >&5
++echo "configure:4496: checking for vsnprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 4457 "configure"
++#line 4501 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vsnprintf(); below. */
+@@ -4476,7 +4520,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_vsnprintf=yes"
+ else
+@@ -4512,17 +4556,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4516: checking for $ac_hdr" >&5
++echo "configure:4560: 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 4521 "configure"
++#line 4565 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4570: \"$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*
+@@ -4549,12 +4593,12 @@
+ done
+
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:4553: checking for working const" >&5
++echo "configure:4597: 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 4558 "configure"
++#line 4602 "configure"
+ #include "confdefs.h"
+
+ int main() {
+@@ -4603,7 +4647,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+@@ -4624,21 +4668,21 @@
+ fi
+
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:4628: checking for inline" >&5
++echo "configure:4672: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat > conftest.$ac_ext <<EOF
+-#line 4635 "configure"
++#line 4679 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -4666,17 +4710,17 @@
+
+ ac_safe=`echo "sfio.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sfio.h""... $ac_c" 1>&6
+-echo "configure:4670: checking for sfio.h" >&5
++echo "configure:4714: checking for sfio.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 4675 "configure"
++#line 4719 "configure"
+ #include "confdefs.h"
+ #include <sfio.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4724: \"$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*
+@@ -4706,12 +4750,12 @@
+ for ac_func in getdomainname getpassphrase
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4710: checking for $ac_func" >&5
++echo "configure:4754: 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 4715 "configure"
++#line 4759 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4734,7 +4778,7 @@
- # CMU GUESS RUNPATH SWITCH
- echo $ac_n "checking for runpath switch""... $ac_c" 1>&6
-@@ -4914,6 +4915,7 @@
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@INSTALL_LIB@%$INSTALL_LIB%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
- s%@ACLOCAL@%$ACLOCAL%g
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4782: \"$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
+@@ -4943,6 +4987,7 @@
+ s%@SASL_DB_BACKEND@%$SASL_DB_BACKEND%g
+ s%@SASL_DB_LIB@%$SASL_DB_LIB%g
+ s%@SASL_DL_LIB@%$SASL_DL_LIB%g
++s%@LIB_CRYPT@%$LIB_CRYPT%g
+ s%@LIB_SOCKET@%$LIB_SOCKET%g
+ s%@LIB_PAM@%$LIB_PAM%g
+ s%@PWCHECKMETH@%$PWCHECKMETH%g
diff -ruN cyrus-sasl.orig/patches/patch-ab cyrus-sasl/patches/patch-ab
--- cyrus-sasl.orig/patches/patch-ab Sun Dec 26 19:52:22 1999
+++ cyrus-sasl/patches/patch-ab Mon Dec 27 20:48:50 1999
@@ -1,21 +1,35 @@
---- lib/Makefile.in.orig Thu Dec 2 14:11:14 1999
-+++ lib/Makefile.in Sun Dec 26 16:54:42 1999
-@@ -75,6 +75,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_LIB = @INSTALL_LIB@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
+--- configure.in.orig Thu Dec 2 14:10:30 1999
++++ configure.in Sat Dec 4 17:59:13 1999
+@@ -213,6 +213,7 @@
+ AC_CHECK_LIB(crypt, crypt,
+ LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
+ cmu_have_crypt=no))
++AC_SUBST(LIB_CRYPT)
-@@ -190,8 +191,8 @@
- $(mkinstalldirs) $(DESTDIR)$(libdir)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+ echo "$(LIBTOOL) --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(LIBTOOL) --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(libdir)/$$p; \
- else :; fi; \
- done
+ CMU_SOCKETS
+
+@@ -503,15 +504,22 @@
+ with_rc4=no)
+
+ if test "$with_rc4" = no; then
++
++ dnl if openssl has been compiled with the rsaref2 libraries,
++ dnl we need to include the rsaref libraries in the crypto check
++ LIB_RSAREF=""
++ AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
++ LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
++ cmu_have_rsaref=no)
++
+ AC_CHECK_LIB(crypto, RC4_set_key,
+ AC_CHECK_HEADER(openssl/rc4.h, [AC_DEFINE(WITH_SSL_RC4)
+ LIB_RC4="-lcrypto";
+ with_rc4="openssl"],
+ AC_WARN([SSL: Disabling rc4 support]);
+ with_rc4=no),
+- AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no)
++ AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no, $LIB_RSAREF)
+ fi
+-
+ LIBS="$cmu_save_LIBS"
+ fi
diff -ruN cyrus-sasl.orig/patches/patch-ac cyrus-sasl/patches/patch-ac
--- cyrus-sasl.orig/patches/patch-ac Sun Dec 26 19:52:23 1999
+++ cyrus-sasl/patches/patch-ac Wed Dec 31 18:00:00 1969
@@ -1,21 +0,0 @@
---- plugins/Makefile.in.orig Sun Dec 26 16:57:02 1999
-+++ plugins/Makefile.in Sun Dec 26 16:57:30 1999
-@@ -76,6 +76,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_LIB = @INSTALL_LIB@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
-
-@@ -230,8 +231,8 @@
- $(mkinstalldirs) $(DESTDIR)$(sasldir)
- @list='$(sasl_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(sasldir)/$$p"; \
-- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(sasldir)/$$p; \
-+ echo "$(LIBTOOL) --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(sasldir)/$$p"; \
-+ $(LIBTOOL) --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(sasldir)/$$p; \
- else :; fi; \
- done
-
diff -ruN cyrus-sasl.orig/patches/patch-ae cyrus-sasl/patches/patch-ae
--- cyrus-sasl.orig/patches/patch-ae Wed Dec 31 18:00:00 1969
+++ cyrus-sasl/patches/patch-ae Mon Dec 27 20:48:50 1999
@@ -0,0 +1,15 @@
+--- pwcheck/Makefile.in.orig Thu Dec 2 13:16:24 1999
++++ pwcheck/Makefile.in Sat Dec 4 18:02:38 1999
+@@ -136,9 +136,9 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-pwcheck_SOURCES = pwcheck.c
+-pwcheck_OBJECTS = pwcheck.o
++LIBS = @LIB_CRYPT@ @LIBS@
++pwcheck_SOURCES = pwcheck.c pwcheck_@PWCHECKMETH@.c
++pwcheck_OBJECTS = pwcheck.o pwcheck_@PWCHECKMETH@.o
+ pwcheck_LDADD = $(LDADD)
+ pwcheck_DEPENDENCIES =
+ pwcheck_LDFLAGS =
diff -ruN cyrus-sasl.orig/pkg/DESCR cyrus-sasl/pkg/DESCR
--- cyrus-sasl.orig/pkg/DESCR Sun Dec 26 19:52:24 1999
+++ cyrus-sasl/pkg/DESCR Mon Dec 27 20:48:51 1999
@@ -8,4 +8,29 @@
negotiated, a security layer is inserted between the protocol
and the connection.
+FEATURES
+--------
+The following mechanisms are included in this distribution:
+ANONYMOUS
+CRAM-MD5
+DIGEST-MD5
+GSSAPI (MIT Kerberos 5 or Heimdal Kerberos 5)
+KERBEROS_V4
+PLAIN
+
+The library can use a Berkeley DB, gdbm or ndbm file on the server
+side to store per-user authentication secrets. The utility saslpasswd
+has been included for adding authentication secrets to the file.
+
+PLAIN can either check /etc/passwd, Kerberos V4, use PAM, or the sasl
+secrets database. By default PAM is used if PAM is found, then
+Kerberos, finally /etc/passwd (non-shadow). This is tweakable in the
+configuration file. Please see
+"${PREFIX}/share/doc/sasl/sysadmin.html".
+
+The sample directory contains two programs which provide a reference
+for using the library, as well as making it easy to test a mechanism
+on the command line. See "${PREFIX}/share/doc/sasl/programming.html"
+for more information.
+
WWW: http://asg.web.cmu.edu/sasl/
diff -ruN cyrus-sasl.orig/pkg/PLIST cyrus-sasl/pkg/PLIST
--- cyrus-sasl.orig/pkg/PLIST Sun Dec 26 19:52:25 1999
+++ cyrus-sasl/pkg/PLIST Mon Dec 27 20:48:51 1999
@@ -5,24 +5,28 @@
include/sasl/saslplug.h
include/sasl/saslutil.h
@dirrm include/sasl
-lib/libsasl.a
-lib/libsasl.so
lib/libsasl.so.7
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+lib/libsasl.so
+lib/libsasl.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-lib/sasl/libanonymous.a
-lib/sasl/libanonymous.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
lib/sasl/libanonymous.so.1
-lib/sasl/libcrammd5.a
-lib/sasl/libcrammd5.so
+lib/sasl/libanonymous.so
+lib/sasl/libanonymous.a
lib/sasl/libcrammd5.so.1
-lib/sasl/libdigestmd5.a
-lib/sasl/libdigestmd5.so
+lib/sasl/libcrammd5.so
+lib/sasl/libcrammd5.a
lib/sasl/libdigestmd5.so.0
-lib/sasl/libplain.a
-lib/sasl/libplain.so
+lib/sasl/libdigestmd5.so
+lib/sasl/libdigestmd5.a
+lib/sasl/libgssapiv2.so.1
+lib/sasl/libgssapiv2.so
+lib/sasl/libgssapiv2.a
+lib/sasl/libkerberos4.so.1
+lib/sasl/libkerberos4.so
+lib/sasl/libkerberos4.a
lib/sasl/libplain.so.1
+lib/sasl/libplain.so
+lib/sasl/libplain.a
@dirrm lib/sasl
sbin/saslpasswd
-sbin/sample-client
-sbin/sample-server
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912280337.VAA00454>