--- cyrus-sasl-2.1.13/configure Tue Apr 15 04:07:48 2003 +++ cyrus-sasl-2.1.13-patched/configure Sat Apr 19 08:16:09 2003 @@ -1516,7 +1516,7 @@ CFLAGS="-Wall ${CFLAGS}" GCC_VERSION=`$CC -v 2>&1 | sed -n -e '/version/s/.*version \([0-9]\)\..*/\1/p'` if test "$GCC_VERSION" != "3"; then - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" + CPPFLAGS="${CPPFLAGS}" fi else CPPFLAGS="${CPPFLAGS} -I/usr/local/include" @@ -1524,7 +1524,7 @@ # this is CMU ADD LIBPATH if test "$andrew_runpath_switch" = "none" ; then - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" + LDFLAGS="${LDFLAGS}" else LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" fi @@ -1949,6 +1949,7 @@ target=$save_target +ac_cv_can_build_shared="yes" if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes @@ -3676,16 +3677,16 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 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:3682: checking for security/pam_appl.h" >&5 + ac_safe=`echo "pam/pam_appl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for pam/pam_appl.h""... $ac_c" 1>&6 +echo "configure:3682: checking for pam/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 < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:3692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- cyrus-sasl-2.1.13/Makefile.in Tue Apr 15 04:07:49 2003 +++ cyrus-sasl-2.1.13-patched/Makefile.in Sat Apr 19 08:19:15 2003 @@ -196,7 +196,7 @@ @SAMPLE_FALSE@SAM = @JAVA_TRUE@JAV = java @JAVA_FALSE@JAV = -@MACOSX_TRUE@INSTALLOSX = install-exec-local-osx +#@MACOSX_TRUE@INSTALLOSX = install-exec-local-osx @MACOSX_FALSE@INSTALLOSX = SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) @@ -507,13 +507,6 @@ echo "* the library should use."; \ echo "********************************************************"; \ fi -install-exec-local-osx: - $(mkinstalldirs) $(framedir)/Versions/A/Headers - $(mkinstalldirs) $(framedir)/Versions/A/Resources - cd $(framedir)/Versions ; ln -fs A Current - cd $(framedir) ; ln -fs Versions/A/Headers . - cd $(framedir) ; ln -fs Versions/A/Resources . - $(INSTALL_DATA) $(srcdir)/config/Info.plist $(framedir)/Versions/A/Resources # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- cyrus-sasl-2.1.13/include/Makefile.in Tue Apr 15 04:07:49 2003 +++ cyrus-sasl-2.1.13-patched/include/Makefile.in Sat Apr 19 08:21:44 2003 @@ -198,9 +198,9 @@ makemd5_SOURCES = makemd5.c -@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework -@MACOSX_TRUE@frameheaderdir = $(framedir)/Versions/A/Headers -@MACOSX_TRUE@frameheader_DATA = $(saslinclude_HEADERS) +#@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework +#@MACOSX_TRUE@frameheaderdir = $(framedir)/Versions/A/Headers +#@MACOSX_TRUE@frameheader_DATA = $(saslinclude_HEADERS) mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = --- cyrus-sasl-2.1.13/lib/Makefile.in Tue Apr 15 04:07:49 2003 +++ cyrus-sasl-2.1.13-patched/lib/Makefile.in Sat Apr 19 08:26:26 2003 @@ -209,7 +209,7 @@ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) -@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework +#@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -464,10 +464,10 @@ rm -f plugin_common.o ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o @MACOSX_TRUE@install-exec-hook: -@MACOSX_TRUE@ $(mkinstalldirs) $(framedir)/Versions/A -@MACOSX_TRUE@ ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2 -@MACOSX_TRUE@ cd $(framedir) ; ln -fs Versions/A/SASL2 . -@MACOSX_FALSE@install-exec-hook: +#@MACOSX_TRUE@ $(mkinstalldirs) $(framedir)/Versions/A +#@MACOSX_TRUE@ ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2 +#@MACOSX_TRUE@ cd $(framedir) ; ln -fs Versions/A/SASL2 . +#@MACOSX_FALSE@install-exec-hook: libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) @echo adding static plugins and dependencies --- cyrus-sasl-2.1.13/saslauthd/configure Tue Apr 15 04:07:50 2003 +++ cyrus-sasl-2.1.13-patched/saslauthd/configure Sat Apr 19 08:44:52 2003 @@ -4268,16 +4268,16 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 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:4274: checking for security/pam_appl.h" >&5 + ac_safe=`echo "pam/pam_appl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for pam/pam_appl.h""... $ac_c" 1>&6 +echo "configure:4274: checking for pam/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 < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --- cyrus-sasl-2.1.13/saslauthd/auth_pam.c Tue Dec 4 13:06:54 2001 +++ cyrus-sasl-2.1.13-patched/saslauthd/auth_pam.c Sat Apr 19 08:45:28 2003 @@ -50,7 +50,7 @@ # include # include -# include +# include # include "auth_pam.h" /* END PUBLIC DEPENDENCIES */ --- cyrus-sasl-2.1.13/utils/Makefile.in Tue Apr 15 04:07:49 2003 +++ cyrus-sasl-2.1.13-patched/utils/Makefile.in Sat Apr 19 08:50:18 2003 @@ -200,9 +200,9 @@ man_MANS = @SASL_DB_MANS@ EXTRA_MANS = saslpasswd2.8 sasldblistusers2.8 -saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) +saslpasswd2_LDADD = $(all_sasl_libs) ../sasldb/libsasldb.la saslpasswd2_SOURCES = saslpasswd.c -sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) +sasldblistusers2_LDADD = $(all_sasl_libs) ../sasldb/libsasldb.la sasldblistusers2_SOURCES = sasldblistusers.c dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) --- cyrus-sasl-2.1.13/plugins/kerberos4.c Fri Feb 14 06:56:04 2003 +++ cyrus-sasl-2.1.13-patched/plugins/kerberos4.c Sat Apr 19 12:36:48 2003 @@ -48,13 +48,7 @@ #include #include -#ifdef WITH_DES -# ifdef WITH_SSL_DES -# include -# else -# include -# endif /* WITH_SSL_DES */ -#endif /* WITH_DES */ +#include #ifdef WIN32 # include --- cyrus-sasl-2.1.13/saslauthd/auth_krb4.h Tue Dec 4 13:06:54 2001 +++ cyrus-sasl-2.1.13-patched/saslauthd/auth_krb4.h Sat Apr 19 12:59:08 2003 @@ -27,3 +27,5 @@ char *auth_krb4(const char *, const char *, const char *, const char *); int auth_krb4_init(void); + +#define KRB_TICKET_GRANTING_TICKET "krbtgt" --- cyrus-sasl-2.1.13/saslauthd/auth_krb4.c Tue Feb 4 04:09:11 2003 +++ cyrus-sasl-2.1.13-patched/saslauthd/auth_krb4.c Tue Apr 22 10:00:48 2003 @@ -36,17 +36,8 @@ #include "mechanisms.h" #ifdef AUTH_KRB4 - -# include - -# ifdef WITH_DES -# ifdef WITH_SSL_DES -# include -# else -# include -# endif /* WITH_SSL_DES */ -# endif /* WITH_DES */ - +#include +#include #endif /* AUTH_KRB4 */ #include