[Pkg-cyrus-sasl2-commits] r401 - in /cyrus-sasl-2.1/trunk/debian: changelog patches/0021_no_mutex_changes_after_init.dpatch patches/00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Sun Jan 18 09:07:59 2009
New Revision: 401

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=401
Log:
Add patch to disallow mutex function changes once sasl_cliennnt_init and/or sasl_server_init is called.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/patches/00list

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=401&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sun Jan 18 09:07:59 2009
@@ -1,8 +1,12 @@
 cyrus-sasl2 (2.1.22.dfsg1-24) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Mon, 01 Sep 2008 13:25:32 -0400
+  [ Fabian Fagerholm ]
+  * debian/patches/0021_no_mutex_changes_after_init.dpatch: Added patch to
+    disallow mutex function changes once sasl_client_init and/or
+    sasl_server_init have been called. Hand-picked and applied from upstream
+    CVS revision 1.117, thanks to Eric Leblond. (Closes: #499770)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Sun, 18 Jan 2009 11:03:42 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-23) unstable; urgency=low
 

Added: cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch?rev=401&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch Sun Jan 18 09:07:59 2009
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0021_no_mutex_changes_after_init.dpatch by  <fabbe at paniq.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disallow mutex function changes once sasl_client_init and/or
+## DP: sasl_server_init is called. Hand-picked and applied change
+## DP: from upstream CVS revision 1.117.
+
+ at DPATCH@
+diff -urNad trunk~/lib/common.c trunk/lib/common.c
+--- trunk~/lib/common.c	2006-06-04 12:26:18.000000000 +0300
++++ trunk/lib/common.c	2009-01-18 10:59:24.000000000 +0200
+@@ -152,6 +152,12 @@
+ void sasl_set_mutex(sasl_mutex_alloc_t *n, sasl_mutex_lock_t *l,
+ 		    sasl_mutex_unlock_t *u, sasl_mutex_free_t *d)
+ {
++	/* Disallow mutex function changes once sasl_client_init
++	   and/or sasl_server_init is called */
++	if (_sasl_server_cleanup_hook || _sasl_client_cleanup_hook) {
++		return;
++	}
++
+   _sasl_mutex_utils.alloc=n;
+   _sasl_mutex_utils.lock=l;
+   _sasl_mutex_utils.unlock=u;

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0021_no_mutex_changes_after_init.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=401&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Sun Jan 18 09:07:59 2009
@@ -19,3 +19,4 @@
 0018_auth_rimap_quotes
 0019_ldap_deprecated
 0020_saslauthd_manpage
+0021_no_mutex_changes_after_init