← Back to branch summary

~ubuntu-branches/ubuntu/raring/maradns/raring

« back to all changes in this revision

Viewing changes to update/1.3.07.06/maradns-1.3.07.05-aix.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kai Hendry
  • Date: 2010-01-24 12:17:40 UTC
  • mfrom: (1.1.13 upstream) (10.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100124121740-a4e1fjobwaouz443
Tags: 1.4.02-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
update/1.3.07.06/maradns-1.3.07.05-aix.patch
1
 
--- maradns-1.3.07.05/configure 2006-05-15 18:28:36.000000000 -0500
2
 
+++ maradns-1.3.07.06/configure 2007-10-01 07:54:43.000000000 -0500
3
 
@@ -105,6 +105,11 @@
4
 
        echo It looks like you are using Cygwin\; this should compile fine
5
 
        echo by typing in \'make\'.
6
 
        EXITCODE=0
7
 
+elif echo $UNAME | grep -i AIX > /dev/null ; then
8
 
+       cat $BUILDDIR/Makefile.AIX >> Makefile
9
 
+       echo It looks like you are using AIX\; this should compile fine
10
 
+       echo by typing in \'make\'.
11
 
+       EXITCODE=0
12
 
 elif echo $UNAME | grep -i darwin > /dev/null ; then
13
 
        cat $BUILDDIR/Makefile.darwin >> Makefile
14
 
        cp $BUILDDIR/install.darwin $BUILDDIR/install.locations
15
 
--- maradns-1.3.07.06/build/Makefile.AIX.orig   2007-10-01 08:02:34.000000000 -0500
16
 
+++ maradns-1.3.07.06/build/Makefile.AIX        2007-10-01 07:59:33.000000000 -0500
17
 
@@ -23,7 +23,7 @@
18
 
 # LDFLAGS=-L/usr/ucblib -lucb -lxnet
19
 
 # end the Solaris section
20
 
 # Non-Solaris version of "M"
21
 
-M="CC=$(CC) -O2 -Wall" DEBUG=-DNO_FLOCK 
22
 
+M="CC=$(CC) -O2 -Wall -DNO_FLOCK" DEBUG=-DNO_FLOCK 
23
 
 V="VERSION=$(VERSION)"
24
 
 
25
 
 # Debug
26
 
--- maradns-1.3.07.06/qual/qual_timestamp.c.orig        2007-10-01 08:05:10.000000000 -0500
27
 
+++ maradns-1.3.07.06/qual/qual_timestamp.c     2007-10-01 08:00:42.000000000 -0500
28
 
@@ -1,4 +1,4 @@
29
 
-/* Copyright (c) 2002-2005 Sam Trenholme
30
 
+/* Copyright (c) 2002-2007 Sam Trenholme
31
 
  *
32
 
  * TERMS
33
 
  *
34
 
@@ -35,7 +35,7 @@
35
 
                       when the 32-bit time() call gives us -1 in 2106 */
36
 
 
37
 
 #ifndef AUTHONLY
38
 
-pthread_mutex_t time_lock = PTHREAD_MUTEX_INITIALIZER;
39
 
+pthread_mutex_t qtime_lock = PTHREAD_MUTEX_INITIALIZER;
40
 
 #endif
41
 
 
42
 
 /* Give an application a timestamp in a non-blocking manner */
43
 
@@ -43,11 +43,11 @@
44
 
 qual_timestamp qual_get_time() {
45
 
     qual_timestamp ttime;
46
 
 #ifndef AUTHONLY
47
 
-    pthread_mutex_lock(&time_lock);
48
 
+    pthread_mutex_lock(&qtime_lock);
49
 
 #endif
50
 
     ttime = the_time;
51
 
 #ifndef AUTHONLY
52
 
-    pthread_mutex_unlock(&time_lock);
53
 
+    pthread_mutex_unlock(&qtime_lock);
54
 
 #endif
55
 
     return ttime;
56
 
     }
57
 
@@ -100,11 +100,11 @@
58
 
              }
59
 
          }
60
 
 #ifndef AUTHONLY
61
 
-    pthread_mutex_lock(&time_lock);
62
 
+    pthread_mutex_lock(&qtime_lock);
63
 
 #endif
64
 
      the_time = ttime;
65
 
 #ifndef AUTHONLY
66
 
-    pthread_mutex_unlock(&time_lock);
67
 
+    pthread_mutex_unlock(&qtime_lock);
68
 
 #endif
69
 
      return JS_SUCCESS;
70
 
      }