Date: Fri, 14 Jan 2000 23:16:50 -0600 (CST) From: hetzels@westbend.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16130: New port of libsasl Message-ID: <200001150516.XAA24630@spare.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 16130
>Category: ports
>Synopsis: Update: cyrus-sasl to 1.5.15
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 14 21:20:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 3.2-RELEASE i386
>Organization:
West Bend Internet
>Environment:
>Description:
The attached diff upgrades cyrus-sasl to v1.5.15.
cyrus-sasl 1.5.15 includes the configure fixes for the rsaref library,
and corrects the FALSE detection of KERBEROS V4, when the DES library is
not installed. The pwcheck program now saves its process id tor
/var/run/pwcheck.pid - we were patching pwcheck to get this functionality.
Hopefully by the time v1.5.17 is available we'll be left with one/no patches.
>How-To-Repeat:
>Fix:
NOTE FOR COMMITER
After applying the attached diff, remove patch-ad and patch-ae.
Thanks
Scot W. Hetzel
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/Makefile cyrus-sasl/Makefile
--- cyrus-sasl.orig/Makefile Wed Dec 29 01:06:17 1999
+++ cyrus-sasl/Makefile Fri Jan 14 22:33:25 2000
@@ -17,7 +17,7 @@
BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl
LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl
-SASL_VER= 1.5.13
+SASL_VER= 1.5.15
RESTRICTED= "Contains cryptography"
@@ -35,27 +35,14 @@
--with-dbpath=${PREFIX}/etc/sasldb \
--includedir=${PREFIX}/include/sasl \
--enable-static \
+ --enable-login \
+ --with-pwcheck=/var/pwcheck \
--with-rc4=openssl
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME}
.endif
-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]
-# --with-pwcheck=DIR enable use of the pwcheck daemonusing statedir DIR
-# --enable-cram enable CRAM-MD5 authentication [yes]
-# --enable-scram enable SCRAM-MD5 authentication [no]
-# --enable-digest enable DIGEST-MD5 authentication [yes]
-# --enable-krb4 enable KERBEROS_V4 authentication [yes]
-# --enable-gssapi enable GSSAPI authentication [yes]
-# --enable-anon enable ANONYMOUS authentication [yes]
-# --enable-plain enable PLAIN authentication [yes]
-# --with-rc4=DIR use rc4 (look in DIR) [yes]
-
DOCS= README README.Y2K TODO INSTALL ChangeLog NEWS
DOC2= draft-newman-auth-scram-03.txt \
@@ -65,11 +52,18 @@
HTDOCS= index programming sysadmin
+# Create Cyrus user and group
+pre-install:
+ @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-# ${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
+ @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/pwcheck.sh \
+ > ${PREFIX}/etc/rc.d/pwcheck.sh
+ @${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
+ ${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/SASL/html
+ @${MKDIR} ${PREFIX}/share/doc/SASL/html
.for file in ${DOCS}
@${ECHO} share/doc/SASL/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL
@@ -79,19 +73,19 @@
@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL
.endfor
.for file in ${HTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
+ @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
@${ECHO} share/doc/SASL/html/${file}.html >>${TMPPLIST}
.endfor
@${ECHO} "@dirrm share/doc/SASL/html" >>${TMPPLIST}
@${ECHO} "@dirrm share/doc/SASL" >>${TMPPLIST}
.endif
.if !defined(KRB5_HOME) || !exists(${KRB5_HOME})
- ${GREP} -v libgssapiv2 ${TMPPLIST} > ${WRKDIR}/tmp.plist
- ${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
+ @${GREP} -v libgssapiv2 ${TMPPLIST} > ${WRKDIR}/tmp.plist
+ @${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
.endif
.if !defined(MAKE_EBONES) || exists(/usr/lib/libkrb.a)
- ${GREP} -v libkerberos4 ${TMPPLIST} > ${WRKDIR}/tmp.plist
- ${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
+ @${GREP} -v libkerberos4 ${TMPPLIST} > ${WRKDIR}/tmp.plist
+ @${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
.endif
.include <bsd.port.mk>
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/files/md5 cyrus-sasl/files/md5
--- cyrus-sasl.orig/files/md5 Sun Dec 26 19:52:20 1999
+++ cyrus-sasl/files/md5 Fri Jan 14 17:53:12 2000
@@ -1 +1 @@
-MD5 (cyrus-sasl-1.5.13.tar.gz) = 6bfa1ac9f34d30e36cc827667f657521
+MD5 (cyrus-sasl-1.5.15.tar.gz) = a1c0f6ef22f34b0a2366e7ec70bdf705
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/files/pwcheck.sh cyrus-sasl/files/pwcheck.sh
--- cyrus-sasl.orig/files/pwcheck.sh Sun Dec 26 19:52:21 1999
+++ cyrus-sasl/files/pwcheck.sh Fri Jan 14 22:46:42 2000
@@ -1,7 +1,9 @@
#!/bin/sh
#
+# $FreeBSD$
+#
-PREFIX=/usr/local
+PREFIX=%%PREFIX%%
case "$1" in
@@ -16,6 +18,7 @@
if [ -r /var/run/pwcheck.pid ]
then
kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
+ rm /var/run/pwcheck.pid
fi
;;
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/patches/patch-aa cyrus-sasl/patches/patch-aa
--- cyrus-sasl.orig/patches/patch-aa Wed Dec 29 01:06:23 1999
+++ cyrus-sasl/patches/patch-aa Fri Jan 14 18:11:42 2000
@@ -1,1038 +1,1023 @@
---- configure.orig Thu Dec 2 14:10:46 1999
-+++ configure Sat Dec 4 17:59:43 1999
-@@ -2822,14 +2822,15 @@
+--- configure.orig Thu Jan 13 23:01:00 2000
++++ configure Fri Jan 14 18:03:53 2000
+@@ -2915,14 +2915,15 @@
+
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
+-echo "configure:2921: checking for connect" >&5
++echo "configure:2922: 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"
+-#line 2926 "configure"
++#line 2927 "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 @@
+@@ -2945,7 +2946,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
+-if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2950: \"$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 @@
+@@ -2963,7 +2964,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
+-echo "configure:2967: checking for gethostbyname in -lnsl" >&5
++echo "configure:2968: 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 @@
+@@ -2971,7 +2972,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 2882 "configure"
-+#line 2883 "configure"
+-#line 2975 "configure"
++#line 2976 "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 @@
+@@ -2982,7 +2983,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
+-if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2987: \"$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 @@
+@@ -3003,7 +3004,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
+-echo "configure:3007: checking for connect in -lsocket" >&5
++echo "configure:3008: 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 @@
+@@ -3011,7 +3012,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 2922 "configure"
-+#line 2923 "configure"
+-#line 3015 "configure"
++#line 3016 "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 @@
+@@ -3022,7 +3023,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
+-if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3027: \"$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 @@
+@@ -3063,7 +3064,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
+-echo "configure:3067: checking for pam_start in -lpam" >&5
++echo "configure:3068: 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 @@
+@@ -3071,7 +3072,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $SASL_DL_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 2982 "configure"
-+#line 2983 "configure"
+-#line 3075 "configure"
++#line 3076 "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 @@
+@@ -3082,7 +3083,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
+-if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3087: \"$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 @@
+@@ -3099,17 +3100,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
+-echo "configure:3103: checking for security/pam_appl.h" >&5
++echo "configure:3104: 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"
+-#line 3108 "configure"
++#line 3109 "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; }
+-{ (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3114: \"$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 @@
+@@ -3140,7 +3141,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 "configure:3144: checking PAM support" >&5
++echo "configure:3145: checking PAM support" >&5
echo "$ac_t""$with_pam" 1>&6
LIB_PAM=""
if test "$with_pam" != no; then
-@@ -3081,12 +3082,12 @@
+@@ -3174,12 +3175,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
+-echo "configure:3178: checking for getspnam" >&5
++echo "configure:3179: 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"
+-#line 3183 "configure"
++#line 3184 "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 @@
+@@ -3202,7 +3203,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
+-if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3207: \"$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 @@
+@@ -3235,7 +3236,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
+-echo "configure:3239: checking CRAM-MD5" >&5
++echo "configure:3240: 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 @@
+@@ -3254,7 +3255,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
+-echo "configure:3258: checking SCRAM-MD5" >&5
++echo "configure:3259: 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
+@@ -3287,7 +3288,7 @@
+ LDFLAGS="$LDFLAGS -I${with_rc4}/lib"
+ fi
+ echo $ac_n "checking for des_pcbc_encrypt in -ldes""... $ac_c" 1>&6
+-echo "configure:3291: checking for des_pcbc_encrypt in -ldes" >&5
++echo "configure:3292: 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 @@
+@@ -3295,7 +3296,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldes $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3192 "configure"
-+#line 3193 "configure"
+-#line 3299 "configure"
++#line 3300 "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 @@
+@@ -3306,7 +3307,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
+-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3311: \"$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 @@
+@@ -3347,7 +3348,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
+-echo "configure:3351: checking DIGEST-MD5" >&5
++echo "configure:3352: 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 @@
+@@ -3368,7 +3369,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
+-echo "configure:3372: checking for res_search in -lresolv" >&5
++echo "configure:3373: 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 @@
+@@ -3376,7 +3377,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3272 "configure"
-+#line 3273 "configure"
+-#line 3380 "configure"
++#line 3381 "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 @@
+@@ -3387,7 +3388,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
+-if { (eval echo configure:3391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3392: \"$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 @@
+@@ -3417,7 +3418,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
+-echo "configure:3421: checking for Kerberos includes" >&5
++echo "configure:3422: 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
+@@ -3443,17 +3444,17 @@
+ if test "$with_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
+-echo "configure:3447: checking for krb.h" >&5
++echo "configure:3448: 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"
+-#line 3452 "configure"
++#line 3453 "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; }
+-{ (eval echo configure:3457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3458: \"$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 @@
+@@ -3470,7 +3471,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
+-echo "configure:3474: checking for krb_mk_priv in -lkrb" >&5
++echo "configure:3475: 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 @@
+@@ -3478,7 +3479,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lkrb -ldes $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3374 "configure"
-+#line 3375 "configure"
+-#line 3482 "configure"
++#line 3483 "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 @@
+@@ -3489,7 +3490,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
+-if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3494: \"$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 @@
+@@ -3522,7 +3523,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
+-echo "configure:3526: checking KERBEROS_V4" >&5
++echo "configure:3527: 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 @@
+@@ -3552,17 +3553,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
+-echo "configure:3556: checking for gssapi.h" >&5
++echo "configure:3557: 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"
+-#line 3561 "configure"
++#line 3562 "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; }
+-{ (eval echo configure:3566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3567: \"$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 @@
+@@ -3586,17 +3587,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
+-echo "configure:3590: checking for gssapi/gssapi.h" >&5
++echo "configure:3591: 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"
+-#line 3595 "configure"
++#line 3596 "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; }
+-{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3601: \"$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 @@
+@@ -3624,7 +3625,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
+-echo "configure:3628: checking for db_open in -ldb" >&5
++echo "configure:3629: 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 @@
+@@ -3632,7 +3633,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldb $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3525 "configure"
-+#line 3526 "configure"
+-#line 3636 "configure"
++#line 3637 "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 @@
+@@ -3643,7 +3644,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
+-if { (eval echo configure:3647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3648: \"$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 @@
+@@ -3673,7 +3674,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
+-echo "configure:3677: checking for res_search in -lresolv" >&5
++echo "configure:3678: 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 @@
+@@ -3681,7 +3682,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3574 "configure"
-+#line 3575 "configure"
+-#line 3685 "configure"
++#line 3686 "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 @@
+@@ -3692,7 +3693,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
+-if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3697: \"$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 @@
+@@ -3725,7 +3726,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
+-echo "configure:3729: checking for base64_decode in -lroken" >&5
++echo "configure:3730: 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 @@
+@@ -3733,7 +3734,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lroken $LIB_CRYPT $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3626 "configure"
-+#line 3627 "configure"
+-#line 3737 "configure"
++#line 3738 "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 @@
+@@ -3744,7 +3745,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
+-if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3749: \"$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 @@
+@@ -3782,7 +3783,7 @@
if test "$ac_cv_header_gssapi_h" = "yes"; then
cat > conftest.$ac_ext <<EOF
--#line 3675 "configure"
-+#line 3676 "configure"
+-#line 3786 "configure"
++#line 3787 "configure"
#include "confdefs.h"
#include <gssapi.h>
EOF
-@@ -3687,7 +3688,7 @@
+@@ -3798,7 +3799,7 @@
elif test "$ac_cv_header_gssapi_gssapi_h"; then
cat > conftest.$ac_ext <<EOF
--#line 3691 "configure"
-+#line 3692 "configure"
+-#line 3802 "configure"
++#line 3803 "configure"
#include "confdefs.h"
#include <gssapi/gssapi.h>
EOF
-@@ -3705,11 +3706,11 @@
+@@ -3816,11 +3817,11 @@
GSSAPI_LIBS=""
echo $ac_n "checking GSSAPI""... $ac_c" 1>&6
--echo "configure:3709: checking GSSAPI" >&5
-+echo "configure:3710: checking GSSAPI" >&5
+-echo "configure:3820: checking GSSAPI" >&5
++echo "configure:3821: 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
+-echo "configure:3824: checking for dbm_open in -lndbm" >&5
++echo "configure:3825: 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 @@
+@@ -3828,7 +3829,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lndbm $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3721 "configure"
-+#line 3722 "configure"
+-#line 3832 "configure"
++#line 3833 "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 @@
+@@ -3839,7 +3840,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
+-if { (eval echo configure:3843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3844: \"$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 @@
+@@ -3860,7 +3861,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
+-echo "configure:3864: checking for res_search in -lresolv" >&5
++echo "configure:3865: 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 @@
+@@ -3868,7 +3869,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3761 "configure"
-+#line 3762 "configure"
+-#line 3872 "configure"
++#line 3873 "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 @@
+@@ -3879,7 +3880,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
+-if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3884: \"$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 @@
+@@ -3916,7 +3917,7 @@
echo $ac_n "checking ANONYMOUS""... $ac_c" 1>&6
--echo "configure:3809: checking ANONYMOUS" >&5
-+echo "configure:3810: checking ANONYMOUS" >&5
+-echo "configure:3920: checking ANONYMOUS" >&5
++echo "configure:3921: checking ANONYMOUS" >&5
if test "$anon" != no; then
echo "$ac_t""enabled" 1>&6
SASL_MECHS="$SASL_MECHS libanonymous.la"
-@@ -3838,7 +3839,7 @@
+@@ -3949,7 +3950,7 @@
echo $ac_n "checking PLAIN""... $ac_c" 1>&6
--echo "configure:3842: checking PLAIN" >&5
-+echo "configure:3843: checking PLAIN" >&5
+-echo "configure:3953: checking PLAIN" >&5
++echo "configure:3954: checking PLAIN" >&5
if test "$plain" != no; then
echo "$ac_t""enabled" 1>&6
SASL_MECHS="$SASL_MECHS libplain.la"
-@@ -3880,7 +3881,7 @@
+@@ -3967,7 +3968,7 @@
+
+
+ echo $ac_n "checking LOGIN""... $ac_c" 1>&6
+-echo "configure:3971: checking LOGIN" >&5
++echo "configure:3972: checking LOGIN" >&5
+ if test "$login" != no; then
+ echo "$ac_t""enabled" 1>&6
+ SASL_MECHS="$SASL_MECHS liblogin.la"
+@@ -4009,7 +4010,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
+-echo "configure:4013: checking for rc4_init in -lrc4" >&5
++echo "configure:4014: 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 @@
+@@ -4017,7 +4018,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lrc4 $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3892 "configure"
-+#line 3893 "configure"
+-#line 4021 "configure"
++#line 4022 "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 @@
+@@ -4028,7 +4029,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
+-if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4033: \"$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 @@
+@@ -4045,17 +4046,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
+-echo "configure:4049: checking for rc4.h" >&5
++echo "configure:4050: 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"
+-#line 4054 "configure"
++#line 4055 "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; }
+-{ (eval echo configure:4059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4060: \"$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 @@
+@@ -4090,7 +4091,7 @@
+ if test "$with_rc4" = no; then
+ LIB_RSAREF=""
+ echo $ac_n "checking for RSAPublicEncrypt in -lrsaref""... $ac_c" 1>&6
+-echo "configure:4094: checking for RSAPublicEncrypt in -lrsaref" >&5
++echo "configure:4095: 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
+@@ -4098,7 +4099,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lrsaref $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4102 "configure"
++#line 4103 "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
+@@ -4109,7 +4110,7 @@
+ RSAPublicEncrypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4114: \"$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
+@@ -4132,7 +4133,7 @@
- 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
+-echo "configure:4136: checking for RC4_set_key in -lcrypto" >&5
++echo "configure:4137: 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
+@@ -4140,7 +4141,7 @@
ac_save_LIBS="$LIBS"
--LIBS="-lcrypto $LIBS"
-+LIBS="-lcrypto $LIB_RSAREF $LIBS"
+ LIBS="-lcrypto $LIB_RSAREF $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 3972 "configure"
-+#line 4017 "configure"
+-#line 4144 "configure"
++#line 4145 "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 @@
+@@ -4151,7 +4152,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
+-if { (eval echo configure:4155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4156: \"$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 @@
+@@ -4168,17 +4169,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
+-echo "configure:4172: checking for openssl/rc4.h" >&5
++echo "configure:4173: 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"
+-#line 4177 "configure"
++#line 4178 "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; }
+-{ (eval echo configure:4182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4183: \"$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
--
- LIBS="$cmu_save_LIBS"
+@@ -4217,7 +4218,7 @@
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 "configure:4221: checking rc4 support" >&5
++echo "configure:4222: checking rc4 support" >&5
echo "$ac_t""$with_rc4" 1>&6
-@@ -4054,12 +4098,12 @@
+@@ -4226,12 +4227,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
+-echo "configure:4230: checking for $ac_hdr that defines DIR" >&5
++echo "configure:4231: 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"
+-#line 4235 "configure"
++#line 4236 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
-@@ -4067,7 +4111,7 @@
+@@ -4239,7 +4240,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
+-if { (eval echo configure:4243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4244: \"$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 @@
+@@ -4264,7 +4265,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
+-echo "configure:4268: checking for opendir in -ldir" >&5
++echo "configure:4269: 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 @@
+@@ -4272,7 +4273,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 4104 "configure"
-+#line 4148 "configure"
+-#line 4276 "configure"
++#line 4277 "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 @@
+@@ -4283,7 +4284,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
+-if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4288: \"$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 @@
+@@ -4305,7 +4306,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
+-echo "configure:4309: checking for opendir in -lx" >&5
++echo "configure:4310: 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 @@
+@@ -4313,7 +4314,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 4145 "configure"
-+#line 4189 "configure"
+-#line 4317 "configure"
++#line 4318 "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 @@
+@@ -4324,7 +4325,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
+-if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4329: \"$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 @@
+@@ -4347,12 +4348,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
+-echo "configure:4351: checking for ANSI C header files" >&5
++echo "configure:4352: 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"
+-#line 4356 "configure"
++#line 4357 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
-@@ -4188,7 +4232,7 @@
+@@ -4360,7 +4361,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; }
+-{ (eval echo configure:4364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4365: \"$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 @@
+@@ -4377,7 +4378,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"
+-#line 4381 "configure"
++#line 4382 "configure"
#include "confdefs.h"
#include <string.h>
EOF
-@@ -4223,7 +4267,7 @@
+@@ -4395,7 +4396,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"
+-#line 4399 "configure"
++#line 4400 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
-@@ -4244,7 +4288,7 @@
+@@ -4416,7 +4417,7 @@
:
else
cat > conftest.$ac_ext <<EOF
--#line 4248 "configure"
-+#line 4292 "configure"
+-#line 4420 "configure"
++#line 4421 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -4255,7 +4299,7 @@
+@@ -4427,7 +4428,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
+-if { (eval echo configure:4431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4432: \"$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 @@
+@@ -4453,12 +4454,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
+-echo "configure:4457: checking for $ac_func" >&5
++echo "configure:4458: 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"
+-#line 4462 "configure"
++#line 4463 "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 @@
+@@ -4481,7 +4482,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
+-if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4486: \"$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 @@
+@@ -4508,12 +4509,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
+-echo "configure:4512: checking for getsubopt" >&5
++echo "configure:4513: 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"
+-#line 4517 "configure"
++#line 4518 "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 @@
+@@ -4536,7 +4537,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
+-if { (eval echo configure:4540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4541: \"$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 @@
+@@ -4568,12 +4569,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
+-echo "configure:4572: checking for snprintf" >&5
++echo "configure:4573: 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"
+-#line 4577 "configure"
++#line 4578 "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 @@
+@@ -4596,7 +4597,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
+-if { (eval echo configure:4600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4601: \"$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 @@
+@@ -4620,12 +4621,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
+-echo "configure:4624: checking for vsnprintf" >&5
++echo "configure:4625: 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"
+-#line 4629 "configure"
++#line 4630 "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 @@
+@@ -4648,7 +4649,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
+-if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4653: \"$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 @@
+@@ -4684,17 +4685,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
+-echo "configure:4688: checking for $ac_hdr" >&5
++echo "configure:4689: 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"
+-#line 4693 "configure"
++#line 4694 "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; }
+-{ (eval echo configure:4698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4699: \"$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 @@
+@@ -4721,12 +4722,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
+-echo "configure:4725: checking for working const" >&5
++echo "configure:4726: 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"
+-#line 4730 "configure"
++#line 4731 "configure"
#include "confdefs.h"
int main() {
-@@ -4603,7 +4647,7 @@
+@@ -4775,7 +4776,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
+-if { (eval echo configure:4779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
-@@ -4624,21 +4668,21 @@
+@@ -4796,21 +4797,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
+-echo "configure:4800: checking for inline" >&5
++echo "configure:4801: 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"
+-#line 4807 "configure"
++#line 4808 "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
+-if { (eval echo configure:4814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4815: \"$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 @@
+@@ -4838,17 +4839,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
+-echo "configure:4842: checking for sfio.h" >&5
++echo "configure:4843: 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"
+-#line 4847 "configure"
++#line 4848 "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; }
+-{ (eval echo configure:4852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4853: \"$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 @@
+@@ -4878,12 +4879,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
+-echo "configure:4882: checking for $ac_func" >&5
++echo "configure:4883: 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"
+-#line 4887 "configure"
++#line 4888 "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 @@
+@@ -4906,7 +4907,7 @@
; 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
+-if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4911: \"$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 @@
+@@ -5113,6 +5114,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
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/patches/patch-ab cyrus-sasl/patches/patch-ab
--- cyrus-sasl.orig/patches/patch-ab Wed Dec 29 01:06:24 1999
+++ cyrus-sasl/patches/patch-ab Fri Jan 14 18:11:42 2000
@@ -1,35 +1,10 @@
---- configure.in.orig Thu Dec 2 14:10:30 1999
-+++ configure.in Sat Dec 4 17:59:13 1999
-@@ -213,6 +213,7 @@
+--- configure.in.orig Thu Jan 13 23:00:16 2000
++++ configure.in Fri Jan 14 17:56:41 2000
+@@ -222,6 +222,7 @@
AC_CHECK_LIB(crypt, crypt,
LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
cmu_have_crypt=no))
+AC_SUBST(LIB_CRYPT)
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 --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/pkg/INSTALL cyrus-sasl/pkg/INSTALL
--- cyrus-sasl.orig/pkg/INSTALL Wed Dec 31 18:00:00 1969
+++ cyrus-sasl/pkg/INSTALL Thu Jan 13 00:38:45 2000
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Created by: stb@FreeBSD.org for the cyrus imap server
+# Added to the cyrus-sasl port by hetzel@westbend.net
+
+#set -vx
+
+#
+# create 'cyrus' user and group before installing
+#
+
+create() {
+ if [ ! -x /usr/sbin/pw ]; then
+ echo "*** Please add a user and a group named \`cyrus' before installing this package."
+ exit 69
+ fi
+
+ if ! pw show group cyrus -q >/dev/null; then
+ gid=60
+ while pw show group -g ${gid} -q >/dev/null; do
+ gid=`expr ${gid} + 1`
+ done
+ if ! pw add group cyrus -g ${gid}; then
+ e=$?
+ echo "*** Failed to add group \`cyrus'. Please add it manually."
+ exit ${e}
+ fi
+ echo "*** Added group \`cyrus' (id ${gid})"
+ else
+ gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
+ fi
+
+ if [ -x /sbin/nologin ]; then
+ shell=/sbin/nologin
+ else
+ shell=/nonexistent
+ fi
+ if ! pw show user cyrus -q >/dev/null; then
+ uid=60
+ while pw show user -u ${uid} -q >/dev/null; do
+ uid=`expr ${uid} + 1`
+ done
+ if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
+ -c "the cyrus mail server" -s "${shell}" -p "*" \
+ ; then
+ e=$?
+ echo "*** Failed to add user \`cyrus'. Please add it manually."
+ exit ${e}
+ fi
+ echo "*** Added user \`cyrus' (id ${uid})"
+ else
+ if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
+ -c "the cyrus mail server" -s "${shell}" -p "*" \
+ ; then
+ e=$?
+ echo "*** Failed to update user \`cyrus'."
+ exit ${e}
+ fi
+ echo "*** Updated user \`cyrus'."
+ fi
+ if ! pw group mod cyrus -m daemon; then
+ echo "*** can't add user \`daemon' to group \`cyrus'"
+ fi
+}
+
+case $2 in
+ PRE-INSTALL)
+ create
+ ;;
+
+esac
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/pkg/MESSAGE cyrus-sasl/pkg/MESSAGE
--- cyrus-sasl.orig/pkg/MESSAGE Wed Dec 31 18:00:00 1969
+++ cyrus-sasl/pkg/MESSAGE Fri Jan 14 22:50:44 2000
@@ -0,0 +1,4 @@
+Start the pwcheck program to have clients use the SASL libraries
+as a non-root user:
+
+ /usr/local/etc/rc.d/pwcheck.sh [start|stop]
diff -ruN --exclude=patch-ad --exclude=patch-ae cyrus-sasl.orig/pkg/PLIST cyrus-sasl/pkg/PLIST
--- cyrus-sasl.orig/pkg/PLIST Wed Dec 29 01:06:27 1999
+++ cyrus-sasl/pkg/PLIST Fri Jan 14 23:10:16 2000
@@ -1,3 +1,5 @@
+@unexec %D/etc/rc.d/pwcheck.sh stop ; echo " stopped."
+etc/rc.d/pwcheck.sh
include/sasl/hmac-md5.h
include/sasl/md5.h
include/sasl/md5global.h
@@ -25,8 +27,19 @@
lib/sasl/libkerberos4.a
lib/sasl/libkerberos4.so
lib/sasl/libkerberos4.so.1
+lib/sasl/liblogin.a
+lib/sasl/liblogin.so
+lib/sasl/liblogin.so.0
lib/sasl/libplain.a
lib/sasl/libplain.so
lib/sasl/libplain.so.1
@dirrm lib/sasl
sbin/saslpasswd
+sbin/pwcheck
+@mode u=rwx,go=
+@exec mkdir /var/pwcheck
+@exec chown cyrus:cyrus /var/pwcheck
+@exec chmod go= /var/pwcheck
+@comment This file gets create by the pwcheck program
+@unexec rm /var/pwcheck/pwcheck
+@unexec rmdir /var/pwcheck
>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?200001150516.XAA24630>