[Pkg-samba-maint] r3718 - in trunk/ctdb/debian: . patches

[sathieu at alioth.debian.org]

tags 603155 pending
thanks

Author: sathieu
Date: 2011-03-23 22:07:08 +0000 (Wed, 23 Mar 2011)
New Revision: 3718

Added:
   trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/series
Log:
Added 99-fix-broken-readdir-test.diff (Closes: #603155)

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-03-23 21:50:45 UTC (rev 3717)
+++ trunk/ctdb/debian/changelog	2011-03-23 22:07:08 UTC (rev 3718)
@@ -11,8 +11,9 @@
   * debian/watch, debian/uupdate-wrapper: use new upstream git url
   * Switch to dpkg-source 3.0 (quilt) format
   * Bump Standards-Version to 3.9.1: no changes
+  * Added 99-fix-broken-readdir-test.diff (Closes: #603155)
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 23 Mar 2011 22:43:43 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 23 Mar 2011 23:03:42 +0100
 
 ctdb (1.0.112-12-1) unstable; urgency=low
 

Added: trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff
===================================================================
--- trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff	                        (rev 0)
+++ trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff	2011-03-23 22:07:08 UTC (rev 3718)
@@ -0,0 +1,68 @@
+Goal: Fix broken readdir
+
+See http://bugs.debian.org/603155
+
+Author: Lorenzo De Liso <blackz at ubuntu.com>?
+
+Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=7032
+
+diff -Naurp ctdb-1.0.108.orig/configure ctdb-1.0.108/configure
+--- ctdb-1.0.108.orig/configure	2009-12-10 09:31:44.000000000 -0500
++++ ctdb-1.0.108/configure	2010-01-12 09:30:45.991761240 -0500
+@@ -8139,7 +8139,7 @@ else
+ /* end confdefs.h.  */
+ 
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"
++#include "$libreplacedir/tests/os2_delete.c"
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   libreplace_cv_READDIR_NEEDED=no
+@@ -8273,7 +8273,7 @@ else
+ #define _LIBREPLACE_REPLACE_H
+ #include "$libreplacedir/repdir_getdirentries.c"
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"
++#include "$libreplacedir/tests/os2_delete.c"
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   libreplace_cv_READDIR_GETDIRENTRIES=yes
+@@ -8334,7 +8334,7 @@ else
+ #error _donot_use_getdents_replacement_anymore
+ #include "$libreplacedir/repdir_getdents.c"
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"
++#include "$libreplacedir/tests/os2_delete.c"
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   libreplace_cv_READDIR_GETDENTS=yes
+diff -Naurp ctdb-1.0.108.orig/lib/replace/repdir.m4 ctdb-1.0.108/lib/replace/repdir.m4
+--- ctdb-1.0.108.orig/lib/replace/repdir.m4	2009-12-10 09:31:41.000000000 -0500
++++ ctdb-1.0.108/lib/replace/repdir.m4	2010-01-12 09:31:17.261761034 -0500
+@@ -1,7 +1,7 @@
+ AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
+ 	AC_TRY_RUN([
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"],
++#include "$libreplacedir/tests/os2_delete.c"],
+ 	[libreplace_cv_READDIR_NEEDED=no],
+ 	[libreplace_cv_READDIR_NEEDED=yes],
+ 	[libreplace_cv_READDIR_NEEDED="assuming not"])
+@@ -34,7 +34,7 @@ AC_CACHE_CHECK([for replacing readdir us
+ #define _LIBREPLACE_REPLACE_H
+ #include "$libreplacedir/repdir_getdirentries.c"
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"],
++#include "$libreplacedir/tests/os2_delete.c"],
+ 	[libreplace_cv_READDIR_GETDIRENTRIES=yes],
+ 	[libreplace_cv_READDIR_GETDIRENTRIES=no])
+ ])
+@@ -57,7 +57,7 @@ AC_CACHE_CHECK([for replacing readdir us
+ #error _donot_use_getdents_replacement_anymore
+ #include "$libreplacedir/repdir_getdents.c"
+ #define test_readdir_os2_delete main
+-#include "$libreplacedir/test/os2_delete.c"],
++#include "$libreplacedir/tests/os2_delete.c"],
+ 	[libreplace_cv_READDIR_GETDENTS=yes],
+ 	[libreplace_cv_READDIR_GETDENTS=no])
+ ])

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2011-03-23 21:50:45 UTC (rev 3717)
+++ trunk/ctdb/debian/patches/series	2011-03-23 22:07:08 UTC (rev 3718)
@@ -2,3 +2,4 @@
 05-hurd.diff
 10_no-lib64.diff
 62-spelling-errors.diff
+99-fix-broken-readdir-test.diff