[Pkg-samba-maint] r1059 - in trunk: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-05-25 06:12:09 +0000 (Thu, 25 May 2006)
New Revision: 1059

Added:
   trunk/patches/py_tdb-3.0.23pre1_fix.patch
Modified:
   trunk/changelog
   trunk/patches/series
Log:
Add a temporary patch to allow compiling 3.0.23pre1
Should be removed for the final version


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-05-24 22:55:49 UTC (rev 1058)
+++ trunk/changelog	2006-05-25 06:12:09 UTC (rev 1059)
@@ -17,6 +17,8 @@
       Closes: #367472
   * Add dependency on procps for samba, as ps is used in init scripts.
     Thanks to Bastian Blank for reporting. Closes: #365618
+  * py_tdb-3.0.23pre1_fix.patch added to allow compiling 3.0.23pre1
+    (unneeded for 3.0.23final)
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 25 Apr 2006 11:27:23 +0200
 

Added: trunk/patches/py_tdb-3.0.23pre1_fix.patch
===================================================================
--- trunk/patches/py_tdb-3.0.23pre1_fix.patch	2006-05-24 22:55:49 UTC (rev 1058)
+++ trunk/patches/py_tdb-3.0.23pre1_fix.patch	2006-05-25 06:12:09 UTC (rev 1059)
@@ -0,0 +1,13 @@
+Index: samba-3.0.23pre1/source/python/py_tdb.c
+===================================================================
+--- samba-3.0.23pre1.orig/source/python/py_tdb.c	2006-05-24 20:31:14.368997592 +0200
++++ samba-3.0.23pre1/source/python/py_tdb.c	2006-05-24 20:32:02.528676208 +0200
+@@ -494,7 +494,7 @@
+ 	if (!PyArg_ParseTuple(args, "s|i", &s, &timeout))
+ 		return NULL;
+ 
+-	/*	result = tdb_lock_bystring(obj->tdb, s, timeout); */
++		result = tdb_lock_bystring_with_timeout(obj->tdb, s, timeout); 
+ 
+ 	return PyInt_FromLong(result != -1);
+ }

Modified: trunk/patches/series
===================================================================
--- trunk/patches/series	2006-05-24 22:55:49 UTC (rev 1058)
+++ trunk/patches/series	2006-05-25 06:12:09 UTC (rev 1059)
@@ -18,3 +18,4 @@
 VERSION.patch
 adapt_machine_creation_script.patch
 autoconf.patch
+py_tdb-3.0.23pre1_fix.patch