← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ctdb/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/99-fix-broken-readdir-test.diff

  • Committer: Package Import Robot
  • Author(s): Mathieu Parent
  • Date: 2011-11-06 15:18:59 UTC
  • mfrom: (1.2.14)
  • Revision ID: package-import@ubuntu.com-20111106151859-41lblk8ml4es7ra3
Tags: 1.11+git20111102-1
http://bugs.debian.org/644907
* New upstream release
  - removed 92-apache-service-enable.diff: integrated 
  - removed 99-fix-broken-readdir-test.diff: integrated
* d/rules, d/control, d/compat:
  - converted to dh (% target and dh_auto_*)
  - moved to compat level 9 (buildeps upgraded)
  - dh9 enabled hardening build flags
  - added hardening=+bindnow
  - dh9 enabled multiarch
    + Don't use /use/lib64 on ppc64 (Closes: #644907)
    + libctdb-dev is Multi-Arch: same
    + removed 10_no-lib64.diff: not needed with multiarch
* ctdb.init:
  - removed gettext support
  - synced with upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99-fix-broken-readdir-test.diff
1
 
Goal: Fix broken readdir
2
 
 
3
 
See http://bugs.debian.org/603155
4
 
 
5
 
Author: Lorenzo De Liso <blackz@ubuntu.com>?
6
 
 
7
 
Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=7032
8
 
 
9
 
diff -Naurp ctdb-1.0.108.orig/configure ctdb-1.0.108/configure
10
 
--- ctdb-1.0.108.orig/configure 2009-12-10 09:31:44.000000000 -0500
11
 
+++ ctdb-1.0.108/configure      2010-01-12 09:30:45.991761240 -0500
12
 
@@ -8139,7 +8139,7 @@ else
13
 
 /* end confdefs.h.  */
14
 
 
15
 
 #define test_readdir_os2_delete main
16
 
-#include "$libreplacedir/test/os2_delete.c"
17
 
+#include "$libreplacedir/tests/os2_delete.c"
18
 
 _ACEOF
19
 
 if ac_fn_c_try_run "$LINENO"; then :
20
 
   libreplace_cv_READDIR_NEEDED=no
21
 
@@ -8273,7 +8273,7 @@ else
22
 
 #define _LIBREPLACE_REPLACE_H
23
 
 #include "$libreplacedir/repdir_getdirentries.c"
24
 
 #define test_readdir_os2_delete main
25
 
-#include "$libreplacedir/test/os2_delete.c"
26
 
+#include "$libreplacedir/tests/os2_delete.c"
27
 
 _ACEOF
28
 
 if ac_fn_c_try_run "$LINENO"; then :
29
 
   libreplace_cv_READDIR_GETDIRENTRIES=yes
30
 
@@ -8334,7 +8334,7 @@ else
31
 
 #error _donot_use_getdents_replacement_anymore
32
 
 #include "$libreplacedir/repdir_getdents.c"
33
 
 #define test_readdir_os2_delete main
34
 
-#include "$libreplacedir/test/os2_delete.c"
35
 
+#include "$libreplacedir/tests/os2_delete.c"
36
 
 _ACEOF
37
 
 if ac_fn_c_try_run "$LINENO"; then :
38
 
   libreplace_cv_READDIR_GETDENTS=yes
39
 
diff -Naurp ctdb-1.0.108.orig/lib/replace/repdir.m4 ctdb-1.0.108/lib/replace/repdir.m4
40
 
--- ctdb-1.0.108.orig/lib/replace/repdir.m4     2009-12-10 09:31:41.000000000 -0500
41
 
+++ ctdb-1.0.108/lib/replace/repdir.m4  2010-01-12 09:31:17.261761034 -0500
42
 
@@ -1,7 +1,7 @@
43
 
 AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
44
 
        AC_TRY_RUN([
45
 
 #define test_readdir_os2_delete main
46
 
-#include "$libreplacedir/test/os2_delete.c"],
47
 
+#include "$libreplacedir/tests/os2_delete.c"],
48
 
        [libreplace_cv_READDIR_NEEDED=no],
49
 
        [libreplace_cv_READDIR_NEEDED=yes],
50
 
        [libreplace_cv_READDIR_NEEDED="assuming not"])
51
 
@@ -34,7 +34,7 @@ AC_CACHE_CHECK([for replacing readdir us
52
 
 #define _LIBREPLACE_REPLACE_H
53
 
 #include "$libreplacedir/repdir_getdirentries.c"
54
 
 #define test_readdir_os2_delete main
55
 
-#include "$libreplacedir/test/os2_delete.c"],
56
 
+#include "$libreplacedir/tests/os2_delete.c"],
57
 
        [libreplace_cv_READDIR_GETDIRENTRIES=yes],
58
 
        [libreplace_cv_READDIR_GETDIRENTRIES=no])
59
 
 ])
60
 
@@ -57,7 +57,7 @@ AC_CACHE_CHECK([for replacing readdir us
61
 
 #error _donot_use_getdents_replacement_anymore
62
 
 #include "$libreplacedir/repdir_getdents.c"
63
 
 #define test_readdir_os2_delete main
64
 
-#include "$libreplacedir/test/os2_delete.c"],
65
 
+#include "$libreplacedir/tests/os2_delete.c"],
66
 
        [libreplace_cv_READDIR_GETDENTS=yes],
67
 
        [libreplace_cv_READDIR_GETDENTS=no])
68
 
 ])