rpms/mutt/devel mutt-sasl-log.patch,NONE,1.1 mutt.spec,1.26,1.27

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/mutt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10049

Modified Files:
	mutt.spec 
Added Files:
	mutt-sasl-log.patch 
Log Message:
- add patch from 1.5 branch to fix SASL logging (#157251, #171528)


mutt-sasl-log.patch:
 mutt_sasl.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

--- NEW FILE mutt-sasl-log.patch ---
---------------------
PatchSet 3207 
Date: 2003/03/07 09:55:53
Author: roessler
Branch: HEAD
Tag: (none) 
Log:
From: Brendan Cully <brendan at kublai.com>

The global callbacks set up in sasl_client_init are not copied by
the SASL library, so they can't be allocated on the stack. This is
the case with both versions of the SASL library, and I frankly don't
understand why it hasn't caused problems before. Since it segfaults
reliably on OS X for me now, I thought a patch would be in order.

Members: 
	mutt_sasl.c:3.2->3.3 

Index: mutt/mutt_sasl.c
diff -u mutt/mutt_sasl.c:3.2 mutt/mutt_sasl.c:3.3
--- mutt/mutt_sasl.c:3.2	Tue Nov 12 09:20:08 2002
+++ mutt/mutt_sasl.c	Fri Mar  7 15:55:53 2003
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-1 Brendan Cully <brendan at kublai.com>
+ * Copyright (C) 2000-3 Brendan Cully <brendan at kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -85,23 +85,20 @@
 {
   static unsigned char sasl_init = 0;
 
-  sasl_callback_t* callback, callbacks[2];
+  static sasl_callback_t callbacks[2];
   int rc;
 
   if (sasl_init)
     return SASL_OK;
 
   /* set up default logging callback */
-  callback = callbacks;
-
-  callback->id = SASL_CB_LOG;
-  callback->proc = mutt_sasl_cb_log;
-  callback->context = NULL;
-  callback++;
-
-  callback->id = SASL_CB_LIST_END;
-  callback->proc = NULL;
-  callback->context = NULL;
+  callbacks[0].id = SASL_CB_LOG;
+  callbacks[0].proc = mutt_sasl_cb_log;
+  callbacks[0].context = NULL;
+
+  callbacks[1].id = SASL_CB_LIST_END;
+  callbacks[1].proc = NULL;
+  callbacks[1].context = NULL;
 
   rc = sasl_client_init (callbacks);
 


Index: mutt.spec
===================================================================
RCS file: /cvs/dist/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mutt.spec	26 Aug 2005 18:52:28 -0000	1.26
+++ mutt.spec	25 Oct 2005 02:21:01 -0000	1.27
@@ -2,7 +2,7 @@
 Name: mutt
 %define uversion 0.9
 Version: 1.4.2.1
-Release: 3
+Release: 4
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -152,6 +152,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Oct 24 2005 Bill Nottingham <notting at redhat.com> 5:1.4.2.1-4
+- add patch from 1.5 branch to fix SASL logging (#157251, #171528)
+
 * Fri Aug 26 2005 Bill Nottingham <notting at redhat.com> 5:1.4.2.1-3
 - add patch from 1.5 branch to fix base64 decoding (#166718)