[Pkg-cyrus-sasl2-commits] r27 - in /cyrus-sasl-2.1/trunk/debian/patches: 0006_library_mutexes.dpatch 00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Thu Jul 27 14:44:21 2006
New Revision: 27

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=27
Log:
Mutex-related patch, exact description unknown.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/patches/00list

Added: cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.dpatch?rev=27&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.dpatch Thu Jul 27 14:44:21 2006
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0006_library_mutexes.dpatch by  <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Exact description unknown; make sure mutex-related code works.
+
+ at DPATCH@
+diff -urNad trunk~/lib/common.c trunk/lib/common.c
+--- trunk~/lib/common.c	2006-05-29 22:52:46.000000000 +0300
++++ trunk/lib/common.c	2006-07-27 17:41:06.000000000 +0300
+@@ -771,7 +771,7 @@
+     result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init);
+     if(result != SASL_OK) return result;    
+ 
+-    if (!free_mutex)
++    if (!free_mutex || free_mutex == 0x1)
+ 	free_mutex = sasl_MUTEX_ALLOC();
+     if (!free_mutex) return SASL_FAIL;
+ 
+@@ -790,6 +790,11 @@
+ 
+   /* serialize disposes. this is necessary because we can't
+      dispose of conn->mutex if someone else is locked on it */
++
++  if (!free_mutex || free_mutex == 0x1)
++    free_mutex = sasl_MUTEX_ALLOC();
++  if (!free_mutex) return SASL_FAIL;
++
+   result = sasl_MUTEX_LOCK(free_mutex);
+   if (result!=SASL_OK) return;
+   

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0006_library_mutexes.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=27&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Thu Jul 27 14:44:21 2006
@@ -3,3 +3,4 @@
 0003_saslauthd_mdoc
 0004_missing_man_pages
 0005_dbconverter
+0006_library_mutexes