Port nfs-server to -ng
[openwrt/svn-archive/archive.git] / net / nfs-server / patches / cross-compile-fix.patch
1 diff -urN nfs-server-2.2beta47.old/configure nfs-server-2.2beta47/configure
2 --- nfs-server-2.2beta47.old/configure 1999-06-11 12:06:04.000000000 +0200
3 +++ nfs-server-2.2beta47/configure 2005-03-24 22:24:39.000000000 +0100
4 @@ -1960,7 +1960,7 @@
5 echo $ac_n "(cached) $ac_c" 1>&6
6 else
7 if test "$cross_compiling" = yes; then
8 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
9 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
10 else
11 cat > conftest.$ac_ext <<EOF
12 #line 1967 "configure"
13 @@ -1996,7 +1996,7 @@
14 echo $ac_n "(cached) $ac_c" 1>&6
15 else
16 if test "$cross_compiling" = yes; then
17 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
18 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
19 else
20 cat > conftest.$ac_ext <<EOF
21 #line 2003 "configure"
22 @@ -2032,7 +2032,7 @@
23 echo $ac_n "(cached) $ac_c" 1>&6
24 else
25 if test "$cross_compiling" = yes; then
26 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
27 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
28 else
29 cat > conftest.$ac_ext <<EOF
30 #line 2039 "configure"
31 @@ -2130,7 +2130,7 @@
32 echo $ac_n "(cached) $ac_c" 1>&6
33 else
34 if test "$cross_compiling" = yes; then
35 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
36 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
37 else
38 cat > conftest.$ac_ext <<EOF
39 #line 2137 "configure"
40 @@ -2166,7 +2166,7 @@
41 echo $ac_n "(cached) $ac_c" 1>&6
42 else
43 if test "$cross_compiling" = yes; then
44 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
45 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
46 else
47 cat > conftest.$ac_ext <<EOF
48 #line 2173 "configure"
49 @@ -2202,7 +2202,7 @@
50 echo $ac_n "(cached) $ac_c" 1>&6
51 else
52 if test "$cross_compiling" = yes; then
53 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
54 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
55 else
56 cat > conftest.$ac_ext <<EOF
57 #line 2209 "configure"
58 @@ -2238,7 +2238,7 @@
59 echo $ac_n "(cached) $ac_c" 1>&6
60 else
61 if test "$cross_compiling" = yes; then
62 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
63 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
64 else
65 cat > conftest.$ac_ext <<EOF
66 #line 2245 "configure"
67 @@ -2862,7 +2862,7 @@
68 echo $ac_n "(cached) $ac_c" 1>&6
69 else
70 if test "$cross_compiling" = yes; then
71 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
72 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
73 else
74 cat > conftest.$ac_ext <<EOF
75 #line 2869 "configure"
76 @@ -3089,7 +3089,7 @@
77
78 # DEC Alpha running OSF/1
79 if test "$cross_compiling" = yes; then
80 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
81 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
82 else
83 cat > conftest.$ac_ext <<EOF
84 #line 3096 "configure"
85 @@ -3149,7 +3149,7 @@
86 # SVR3
87 if test -z "$space"; then
88 if test "$cross_compiling" = yes; then
89 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
90 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
91 else
92 cat > conftest.$ac_ext <<EOF
93 #line 3156 "configure"
94 @@ -3348,7 +3348,7 @@
95 echo $ac_n "(cached) $ac_c" 1>&6
96 else
97 if test "$cross_compiling" = yes; then
98 - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
99 + { echo "configure: error: can not run test program while cross compiling" 1>&2; }
100 else
101 cat > conftest.$ac_ext <<EOF
102 #line 3355 "configure"
103 --- nfs-server-2.2beta47.old/logging.c 1998-10-30 17:11:22.000000000 +0100
104 +++ nfs-server-2.2beta47/logging.c 2005-03-24 22:47:44.000000000 +0100
105 @@ -14,6 +14,7 @@
106 */
107
108 #include "nfsd.h"
109 +#include <time.h>
110
111 #ifdef HAVE_SYSLOG_H
112 #include <syslog.h>
113 --- nfs-server-2.2beta47.old/fh.c 1999-11-10 10:41:14.000000000 +0100
114 +++ nfs-server-2.2beta47/fh.c 2005-03-24 22:50:50.000000000 +0100
115 @@ -50,6 +50,7 @@
116 */
117
118 #include <assert.h>
119 +#include <time.h>
120 #include "nfsd.h"
121 #include "rpcmisc.h"
122 #include "signals.h"
123 @@ -350,7 +351,7 @@
124 #ifndef ENABLE_DEVTAB
125 psi_t dmajor, dminor;
126
127 -#if SIZEOF_DEV_T == 4
128 +#if (SIZEOF_DEV_T == 4)
129 /* This folds the upper 16 bits into bits 8..15, and
130 * the lower 16 bits into bits 0..7
131 */
132 --- nfs-server-2.2beta47.old/ugid_map.c 2005-03-24 22:34:56.000000000 +0100
133 +++ nfs-server-2.2beta47/ugid_map.c 2005-03-24 22:54:00.000000000 +0100
134 @@ -34,14 +34,8 @@
135 #define UGID_CHUNK0_BYTES (UGID_CHUNK * sizeof(idmap_t))
136 #define UGID_EXPIRE 300 /* 5 minutes */
137
138 -/*
139 - * Make sure we get the right size for ugid_t
140 - */
141 -#if SIZEOF_UID_T != SIZEOF_GID_T
142 -#error Sorry, this code relies on sizeof(uid_t) == sizeof(gid_t)
143 -#endif
144
145 -#define UGID_BITS (SIZEOF_UID_T * BITSPERBYTE)
146 +#define UGID_BITS (sizeof(uid_t) * BITSPERBYTE)
147 #define BITSTOLEVEL(b) ((UGID_BITS - (b)) / UGID_CHUNK_BITS - 1)
148 #define UGID_LOWER(id, b) ((id) & ~((1 << (b)) - 1))
149 #define UGID_UPPER(id, b) (((id + (1 << (b))) & ~((1 << (b)) - 1))-1)