[continued from previous message]

+ (based on a patch by Simon Wilkinson <[email protected]>)
+
+Members:
+ configure.in:1.195->1.196
+
+Index: cyrus-sasl-2.1.19/configure.in +===================================================================
+RCS file: /cvs/src/sasl/configure.in,v
+retrieving revision 1.195
+retrieving revision 1.196
+diff -u -r1.195 -r1.196
+--- cyrus-sasl-2.1.19/configure.in 2 Jul 2004 19:39:34 -0000 1.195 ++++ cyrus-sasl-2.1.19/configure.in 15 Jul 2004 18:01:57 -0000 1.196 +@@ -1,7 +1,7 @@
+ dnl configure.in for the SASL library
+ dnl Rob Siemborski
+ dnl Rob Earhart
+-dnl $Id: configure.in,v 1.195 2004/07/02 19:39:34 rjs3 Exp $
++dnl $Id: configure.in,v 1.196 2004/07/15 18:01:57 rjs3 Exp $
+ dnl
+ dnl Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
+ dnl
+@@ -481,13 +481,28 @@
+ AC_MSG_RESULT(disabled)
+ fi
+
++dnl Kerberos based Mechanisms
+ SASL_KERBEROS_V4_CHK
+ SASL_GSSAPI_CHK
+-SASL_PLAIN_CHK
+
+ if test "$gssapi" != "no"; then
+ AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])
++ mutex_default="no"
++ if test "$gss_impl" = "mit"; then
++ mutex_default="yes"
++ fi
++ AC_MSG_CHECKING(to use mutexes aroung GSS calls)
++ AC_ARG_ENABLE(gss_mutexes, [ --enable-gss_mutexes use mutexes around calls to the GSS library],
++ use_gss_mutexes=$enableval,
++ use_gss_mutexes=$mutex_default)
++ if test $use_gss_mutexes = "yes"; then
++ AC_DEFINE(GSS_USE_MUTEXES, [], [should we mutex-wrap calls into the GSS library?])
++ fi
++ AC_MSG_RESULT($use_gss_mutexes)
+ fi
++
++dnl PLAIN
++SASL_PLAIN_CHK
+
+ dnl ANONYMOUS
+ AC_ARG_ENABLE(anon, [ --enable-anon enable ANONYMOUS authentication [yes] ],
diff -urN cyrus-sasl2-2.1.19/debian/patches/20_2369_sasl_upstream_cvs.diff nmu-work/debian/patches/20_2369_sasl_upstream_cvs.diff
--- cyrus-sasl2-2.1.19/debian/patches/20_2369_sasl_upstream_cvs.diff 1969-12-31 21:00:00.000000000 -0300
+++ nmu-work/debian/patches/20_2369_sasl_upstream_cvs.diff 2004-08-14 11:29:05.000000000 -0300
@@ -0,0 +1,923 @@
+---------------------
+PatchSet 2369
+Date: 2004/07/15 18:01:57
+Author: rjs3
+Branch: HEAD
+Tag: (none)
+Log:
+ * configure.in, plugins/gssapi.c: Wrap all GSS calls
+ in mutexes when required by the implementation.
+ (based on a patch by Simon Wilkinson <[email protected]>)
+
+Members:
+ ChangeLog:1.686->1.687
+ plugins/gssapi.c:1.90->1.91
+
+Index: cyrus-sasl-2.1.19/ChangeLog +===================================================================
+RCS file: /cvs/src/sasl/ChangeLog,v
+retrieving revision 1.686
+retrieving revision 1.687
+diff -u -r1.686 -r1.687
+--- cyrus-sasl-2.1.19/ChangeLog 6 Jul 2004 14:06:24 -0000 1.686 ++++ cyrus-sasl-2.1.19/ChangeLog 15 Jul 2004 18:01:57 -0000 1.687 +@@ -1,3 +1,8 @@
++2004-07-15 Rob Siemborski <rjs3@andre